From df5d64d7ffc3c6c813fa9082cb8b9ad37deeda9c Mon Sep 17 00:00:00 2001
From: Gabriel Dufresne <gabrielduf@hotmail.com>
Date: Tue, 24 Mar 2026 13:19:14 -0400
Subject: [PATCH 1/8] Added sidebar expand/collapse

---
 .../ViewModels/MainWindowViewModel.cs         |   4 +
 .../ViewModels/SidebarViewModel.cs            |  34 +++++
 src/UniGetUI.Avalonia/Views/MainWindow.axaml  |  23 +++-
 src/UniGetUI.Avalonia/Views/SidebarView.axaml | 117 +++++++++++-------
 4 files changed, 134 insertions(+), 44 deletions(-)

diff --git a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
index 8c66fcde4..d62cb9f25 100644
--- a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
@@ -5,6 +5,7 @@
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Avalonia.ViewModels.Pages;
 using UniGetUI.Avalonia.Views;
@@ -120,6 +121,9 @@ private void OnPageViewModelPropertyChanged(object? sender, System.ComponentMode
     private bool _telemetryWarnerVisible;
 
     // ─── Constructor ─────────────────────────────────────────────────────────
+    [RelayCommand]
+    private void ToggleSidebar() => Sidebar.IsPaneOpen = !Sidebar.IsPaneOpen;
+
     public MainWindowViewModel()
     {
         DiscoverPage = new DiscoverSoftwarePage();
diff --git a/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs
index 57c0b37d4..11761d567 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs
@@ -1,5 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using UniGetUI.Avalonia.Views;
+using UniGetUI.Core.SettingsEngine;
 
 namespace UniGetUI.Avalonia.ViewModels;
 
@@ -19,6 +20,18 @@ public partial class SidebarViewModel : ViewModelBase
     partial void OnUpdatesBadgeCountChanged(int value) =>
         UpdatesBadgeVisible = value > 0;
 
+    partial void OnUpdatesBadgeVisibleChanged(bool _)
+    {
+        OnPropertyChanged(nameof(UpdatesBadgeExpandedVisible));
+        OnPropertyChanged(nameof(UpdatesBadgeCompactVisible));
+    }
+
+    partial void OnBundlesBadgeVisibleChanged(bool _)
+    {
+        OnPropertyChanged(nameof(BundlesBadgeExpandedVisible));
+        OnPropertyChanged(nameof(BundlesBadgeCompactVisible));
+    }
+
     // ─── Loading indicators ───────────────────────────────────────────────────
     [ObservableProperty]
     private bool _discoverIsLoading;
@@ -29,6 +42,27 @@ partial void OnUpdatesBadgeCountChanged(int value) =>
     [ObservableProperty]
     private bool _installedIsLoading;
 
+    // ─── Pane open/closed ─────────────────────────────────────────────────────
+    [ObservableProperty]
+    private bool _isPaneOpen = false;
+
+    partial void OnIsPaneOpenChanged(bool value)
+    {
+        Settings.Set(Settings.K.CollapseNavMenuOnWideScreen, value);
+        OnPropertyChanged(nameof(PaneWidth));
+        OnPropertyChanged(nameof(UpdatesBadgeExpandedVisible));
+        OnPropertyChanged(nameof(UpdatesBadgeCompactVisible));
+        OnPropertyChanged(nameof(BundlesBadgeExpandedVisible));
+        OnPropertyChanged(nameof(BundlesBadgeCompactVisible));
+    }
+
+    public double PaneWidth => IsPaneOpen ? 250 : 72;
+
+    public bool UpdatesBadgeExpandedVisible => UpdatesBadgeVisible && IsPaneOpen;
+    public bool UpdatesBadgeCompactVisible  => UpdatesBadgeVisible && !IsPaneOpen;
+    public bool BundlesBadgeExpandedVisible => BundlesBadgeVisible && IsPaneOpen;
+    public bool BundlesBadgeCompactVisible  => BundlesBadgeVisible && !IsPaneOpen;
+
     // ─── Selected page ────────────────────────────────────────────────────────
     [ObservableProperty]
     private PageType _selectedPageType = PageType.Null;
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
index a5ad9038d..5b6453906 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
@@ -25,7 +25,7 @@
 
             <!-- ── Sidebar (spans all rows) ── -->
             <ContentControl Grid.Column="0" Grid.RowSpan="3"
-                            Width="250"
+                            Width="{Binding Sidebar.PaneWidth}"
                             Content="{Binding Sidebar}"
                             HorizontalContentAlignment="Stretch"
                             VerticalContentAlignment="Stretch">
@@ -152,6 +152,27 @@
             <!-- Drag area fills the whole title bar -->
             <Border Background="{DynamicResource AppTitleBarBackground}"
                     PointerPressed="TitleBar_PointerPressed"/>
+            <!-- Hamburger toggle button + app name -->
+            <StackPanel HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal"
+                        Margin="65,0,0,0"
+                        Spacing="8">
+                <Button Width="32" Height="32"
+                        Padding="4"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        CornerRadius="4"
+                        ToolTip.Tip="Toggle navigation panel"
+                        Command="{Binding ToggleSidebarCommand}">
+                    <PathIcon Width="14" Height="14"
+                              Data="M1,1 H15 V3 H1 Z M1,7 H15 V9 H1 Z M1,13 H15 V15 H1 Z"/>
+                </Button>
+                <TextBlock Text="UniGetUI"
+                           FontSize="13"
+                           FontWeight="SemiBold"
+                           VerticalAlignment="Center"/>
+            </StackPanel>
             <StackPanel HorizontalAlignment="Right"
                         VerticalAlignment="Center"
                         Orientation="Horizontal"
diff --git a/src/UniGetUI.Avalonia/Views/SidebarView.axaml b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
index 219dc22a5..16e5ea364 100644
--- a/src/UniGetUI.Avalonia/Views/SidebarView.axaml
+++ b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
@@ -7,37 +7,30 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
              x:DataType="vm:SidebarViewModel"
-             MinWidth="64">
+             MinWidth="72">
 
-    <Grid RowDefinitions="Auto,*,Auto">
-
-        <!-- App branding -->
-        <StackPanel Grid.Row="0" Orientation="Horizontal" Spacing="8" Margin="16,16,16,12">
-            <Image Source="/Assets/icon_unsquare.png" Width="24" Height="24" VerticalAlignment="Center"/>
-            <TextBlock Text="UniGetUI"
-                       FontSize="14"
-                       FontWeight="SemiBold"
-                       VerticalAlignment="Center"/>
-        </StackPanel>
+    <Grid RowDefinitions="*,Auto">
 
         <!-- Main nav items -->
         <ListBox x:Name="NavListBox"
-                 Grid.Row="1"
+                 Grid.Row="0"
                  SelectionMode="Single"
                  SelectionChanged="NavListBox_SelectionChanged"
                  Background="Transparent"
                  BorderThickness="0"
-                 Padding="8,0">
+                 Padding="8,10,8,0">
 
             <!-- Discover Packages -->
-            <ListBoxItem x:Name="DiscoverNavBtn" Tag="Discover" Padding="4,2" CornerRadius="6">
+            <ListBoxItem x:Name="DiscoverNavBtn" Tag="Discover" Padding="4,2" CornerRadius="6"
+                         ToolTip.Tip="Discover Packages">
                 <Panel>
                     <StackPanel Orientation="Horizontal" Spacing="12" Margin="8,6">
-                        <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/ms_store.svg" Width="20" Height="20" VerticalAlignment="Center" />
+                        <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/ms_store.svg" Width="24" Height="24" VerticalAlignment="Center" />
                         <TextBlock Text="Discover Packages"
-                                   FontSize="14"
+                                   FontSize="16"
                                    FontWeight="SemiBold"
-                                   VerticalAlignment="Center"/>
+                                   VerticalAlignment="Center"
+                                   IsVisible="{Binding IsPaneOpen}"/>
                     </StackPanel>
                     <ProgressBar IsIndeterminate="True"
                                  IsVisible="{Binding DiscoverIsLoading}"
@@ -48,19 +41,21 @@
             </ListBoxItem>
 
             <!-- Software Updates -->
-            <ListBoxItem x:Name="UpdatesNavBtn" Tag="Updates" Padding="4,2" CornerRadius="6">
+            <ListBoxItem x:Name="UpdatesNavBtn" Tag="Updates" Padding="4,2" CornerRadius="6"
+                         ToolTip.Tip="Software Updates">
                 <Panel>
                     <StackPanel Orientation="Horizontal" Spacing="12" Margin="8,6">
-                        <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/update.svg" Width="20" Height="20" VerticalAlignment="Center"/>
+                        <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/update.svg" Width="24" Height="24" VerticalAlignment="Center"/>
                         <TextBlock Text="Software Updates"
-                                   FontSize="14"
+                                   FontSize="16"
                                    FontWeight="SemiBold"
-                                   VerticalAlignment="Center"/>
-                        <!-- Updates badge -->
+                                   VerticalAlignment="Center"
+                                   IsVisible="{Binding IsPaneOpen}"/>
+                        <!-- Updates badge (expanded) -->
                         <Border Background="{DynamicResource SystemAccentColor}"
                                 CornerRadius="10"
                                 Padding="6,1"
-                                IsVisible="{Binding UpdatesBadgeVisible}"
+                                IsVisible="{Binding UpdatesBadgeExpandedVisible}"
                                 VerticalAlignment="Center">
                             <TextBlock Text="{Binding UpdatesBadgeCount}"
                                        FontSize="11"
@@ -68,6 +63,23 @@
                                        Foreground="White"/>
                         </Border>
                     </StackPanel>
+                    <!-- Updates badge (compact overlay) -->
+                    <Border Background="{DynamicResource SystemAccentColor}"
+                            CornerRadius="8"
+                            Padding="3,1"
+                            MinWidth="16"
+                            Height="16"
+                            IsVisible="{Binding UpdatesBadgeCompactVisible}"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Margin="26,3,0,0">
+                        <TextBlock Text="{Binding UpdatesBadgeCount}"
+                                   FontSize="9"
+                                   FontWeight="Bold"
+                                   Foreground="White"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"/>
+                    </Border>
                     <ProgressBar IsIndeterminate="True"
                                  IsVisible="{Binding UpdatesIsLoading}"
                                  Height="2"
@@ -77,14 +89,16 @@
             </ListBoxItem>
 
             <!-- Installed Packages -->
-            <ListBoxItem x:Name="InstalledNavBtn" Tag="Installed" Padding="4,2" CornerRadius="6">
+            <ListBoxItem x:Name="InstalledNavBtn" Tag="Installed" Padding="4,2" CornerRadius="6"
+                         ToolTip.Tip="Installed Packages">
                 <Panel>
                     <StackPanel Orientation="Horizontal" Spacing="12" Margin="8,6">
-                        <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/local_pc.svg" Width="20" Height="20" VerticalAlignment="Center"/>
+                        <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/local_pc.svg" Width="24" Height="24" VerticalAlignment="Center"/>
                         <TextBlock Text="Installed Packages"
-                                   FontSize="14"
+                                   FontSize="16"
                                    FontWeight="SemiBold"
-                                   VerticalAlignment="Center"/>
+                                   VerticalAlignment="Center"
+                                   IsVisible="{Binding IsPaneOpen}"/>
                     </StackPanel>
                     <ProgressBar IsIndeterminate="True"
                                  IsVisible="{Binding InstalledIsLoading}"
@@ -95,20 +109,22 @@
             </ListBoxItem>
 
             <!-- Package Bundles -->
-            <ListBoxItem x:Name="BundlesNavBtn" Tag="Bundles" Padding="4,2" CornerRadius="6">
+            <ListBoxItem x:Name="BundlesNavBtn" Tag="Bundles" Padding="4,2" CornerRadius="6"
+                         ToolTip.Tip="Package Bundles">
                 <Panel>
                     <StackPanel Orientation="Horizontal" Spacing="12" Margin="8,6">
-                        <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/save_as.svg" Width="20" Height="20" VerticalAlignment="Center"/>
+                        <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/save_as.svg" Width="24" Height="24" VerticalAlignment="Center"/>
                         <TextBlock Text="Package Bundles"
-                                   FontSize="14"
+                                   FontSize="16"
                                    FontWeight="SemiBold"
-                                   VerticalAlignment="Center"/>
-                        <!-- Unsaved changes badge -->
+                                   VerticalAlignment="Center"
+                                   IsVisible="{Binding IsPaneOpen}"/>
+                        <!-- Unsaved changes badge (expanded) -->
                         <Border Background="{DynamicResource SystemFillColorCautionBrush}"
                                 CornerRadius="10"
                                 Width="16"
                                 Height="16"
-                                IsVisible="{Binding BundlesBadgeVisible}"
+                                IsVisible="{Binding BundlesBadgeExpandedVisible}"
                                 VerticalAlignment="Center">
                             <TextBlock Text="!"
                                        FontSize="10"
@@ -117,13 +133,22 @@
                                        VerticalAlignment="Center"/>
                         </Border>
                     </StackPanel>
+                    <!-- Unsaved changes badge (compact overlay dot) -->
+                    <Border Background="{DynamicResource SystemFillColorCautionBrush}"
+                            CornerRadius="5"
+                            Width="10"
+                            Height="10"
+                            IsVisible="{Binding BundlesBadgeCompactVisible}"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Margin="28,5,0,0"/>
                 </Panel>
             </ListBoxItem>
 
         </ListBox>
 
         <!-- Footer items -->
-        <StackPanel Grid.Row="2" Margin="8,0,8,12" Spacing="2">
+        <StackPanel Grid.Row="1" Margin="8,0,8,12" Spacing="2">
             <Separator Margin="8,4"/>
 
             <Button x:Name="SettingsNavBtn"
@@ -133,10 +158,12 @@
                     Background="Transparent"
                     BorderThickness="0"
                     Padding="12,8"
-                    CornerRadius="6">
+                    CornerRadius="6"
+                    ToolTip.Tip="Settings">
                 <StackPanel Orientation="Horizontal" Spacing="12">
-                    <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/settings.svg" Width="20" Height="20" VerticalAlignment="Center"/>
-                    <TextBlock Text="Settings" FontSize="14" VerticalAlignment="Center"/>
+                    <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/settings.svg" Width="24" Height="24" VerticalAlignment="Center"/>
+                    <TextBlock Text="Settings" FontSize="16" VerticalAlignment="Center"
+                               IsVisible="{Binding IsPaneOpen}"/>
                 </StackPanel>
             </Button>
 
@@ -147,10 +174,12 @@
                     Background="Transparent"
                     BorderThickness="0"
                     Padding="12,8"
-                    CornerRadius="6">
+                    CornerRadius="6"
+                    ToolTip.Tip="Package Managers">
                 <StackPanel Orientation="Horizontal" Spacing="12">
-                    <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/clipboard_list.svg" Width="20" Height="20" VerticalAlignment="Center"/>
-                    <TextBlock Text="Package Managers" FontSize="14" VerticalAlignment="Center"/>
+                    <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/clipboard_list.svg" Width="24" Height="24" VerticalAlignment="Center"/>
+                    <TextBlock Text="Package Managers" FontSize="16" VerticalAlignment="Center"
+                               IsVisible="{Binding IsPaneOpen}"/>
                 </StackPanel>
             </Button>
 
@@ -159,10 +188,12 @@
                     Background="Transparent"
                     BorderThickness="0"
                     Padding="12,8"
-                    CornerRadius="6">
+                    CornerRadius="6"
+                    ToolTip.Tip="More">
                 <StackPanel Orientation="Horizontal" Spacing="12">
-                    <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/options.svg" Width="20" Height="20" VerticalAlignment="Center"/>
-                    <TextBlock Text="More" FontSize="14" VerticalAlignment="Center"/>
+                    <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/options.svg" Width="24" Height="24" VerticalAlignment="Center"/>
+                    <TextBlock Text="More" FontSize="16" VerticalAlignment="Center"
+                               IsVisible="{Binding IsPaneOpen}"/>
                 </StackPanel>
                 <Button.Flyout>
                     <MenuFlyout Placement="RightEdgeAlignedTop">

From 08e71d742caed08c42e4264d3723a2ed3474c883 Mon Sep 17 00:00:00 2001
From: Gabriel Dufresne <gabrielduf@hotmail.com>
Date: Tue, 24 Mar 2026 14:15:43 -0400
Subject: [PATCH 2/8] Fixed some bug in AbstractPackagesPage

---
 .../Models/PackageCollections.cs              |  4 +--
 .../SoftwarePages/PackagesPageViewModel.cs    | 19 +++++++++-
 .../ManageIgnoredUpdatesWindow.axaml          | 36 ++++++++++++++-----
 .../ManageIgnoredUpdatesWindow.axaml.cs       | 10 ++++++
 .../SoftwarePages/AbstractPackagesPage.axaml  | 31 ++++++----------
 .../AbstractPackagesPage.axaml.cs             | 16 ---------
 6 files changed, 66 insertions(+), 50 deletions(-)

diff --git a/src/UniGetUI.Avalonia/Models/PackageCollections.cs b/src/UniGetUI.Avalonia/Models/PackageCollections.cs
index d5c0f7c28..83258b1d4 100644
--- a/src/UniGetUI.Avalonia/Models/PackageCollections.cs
+++ b/src/UniGetUI.Avalonia/Models/PackageCollections.cs
@@ -58,9 +58,7 @@ public PackageWrapper(IPackage package, PackagesPageViewModel page)
     {
         Package = package;
         _page = page;
-        VersionComboString = package.IsUpgradable
-            ? $"{package.VersionString} -> {package.NewVersionString}"
-            : package.VersionString;
+        VersionComboString = package.VersionString;
 
         Package.PropertyChanged += Package_PropertyChanged;
         UpdateDisplayState();
diff --git a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
index 4824c7c8a..6701aab98 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
@@ -401,7 +401,24 @@ partial void OnInstantSearchChanged(bool value)
 
     partial void OnUpperLowerCaseChanged(bool value) => FilterPackages();
     partial void OnIgnoreSpecialCharsChanged(bool value) => FilterPackages();
-    partial void OnSearchModeChanged(SearchMode value) => FilterPackages();
+    partial void OnSearchModeChanged(SearchMode value)
+    {
+        OnPropertyChanged(nameof(SearchMode_Both));
+        OnPropertyChanged(nameof(SearchMode_Name));
+        OnPropertyChanged(nameof(SearchMode_Id));
+        OnPropertyChanged(nameof(SearchMode_Exact));
+        OnPropertyChanged(nameof(SearchMode_Similar));
+        FilterPackages();
+    }
+
+    // One bool property per mode — used for two-way RadioButton bindings.
+    // Mutual exclusion is enforced by the ViewModel: setting any one to true
+    // changes SearchMode, which notifies all five properties.
+    public bool SearchMode_Both    { get => SearchMode == SearchMode.Both;    set { if (value) SearchMode = SearchMode.Both; } }
+    public bool SearchMode_Name    { get => SearchMode == SearchMode.Name;    set { if (value) SearchMode = SearchMode.Name; } }
+    public bool SearchMode_Id      { get => SearchMode == SearchMode.Id;      set { if (value) SearchMode = SearchMode.Id; } }
+    public bool SearchMode_Exact   { get => SearchMode == SearchMode.Exact;   set { if (value) SearchMode = SearchMode.Exact; } }
+    public bool SearchMode_Similar { get => SearchMode == SearchMode.Similar; set { if (value) SearchMode = SearchMode.Similar; } }
 
     partial void OnAllPackagesCheckedChanged(bool? value)
     {
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml
index fdc928c2e..3e3856e24 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml
@@ -21,22 +21,38 @@
         </Style>
     </Window.Styles>
 
-    <Grid RowDefinitions="Auto,*"
-          Margin="12"
+    <Grid RowDefinitions="Auto,Auto,*"
+          Margin="16"
           RowSpacing="8">
 
+        <!-- ── Title ── -->
+        <TextBlock Grid.Row="0"
+                   Text="{Binding Title}"
+                   FontSize="20"
+                   FontWeight="SemiBold"
+                   Margin="0,0,0,4"/>
+
         <!-- ── Header: description + Reset list button ── -->
-        <Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
+        <Grid Grid.Row="1" ColumnDefinitions="*,Auto" ColumnSpacing="8">
 
             <TextBlock Text="{Binding Description}"
                        TextWrapping="Wrap"
                        VerticalAlignment="Center"
-                       Opacity="0.85"/>
+                       Opacity="0.75"/>
 
-            <Button Grid.Column="1" VerticalAlignment="Center">
+            <Button x:Name="ResetButton" Grid.Column="1" VerticalAlignment="Center">
                 <TextBlock Text="{Binding ResetLabel}"/>
                 <Button.Flyout>
                     <Flyout Placement="Bottom">
+                        <Flyout.FlyoutPresenterTheme>
+                            <ControlTheme TargetType="FlyoutPresenter">
+                                <Setter Property="Background" Value="{DynamicResource AppDialogPanelBackground}"/>
+                                <Setter Property="BorderBrush" Value="{DynamicResource AppBorderBrush}"/>
+                                <Setter Property="BorderThickness" Value="1"/>
+                                <Setter Property="CornerRadius" Value="8"/>
+                                <Setter Property="Padding" Value="12"/>
+                            </ControlTheme>
+                        </Flyout.FlyoutPresenterTheme>
                         <Grid Width="300"
                               ColumnDefinitions="*,*"
                               RowDefinitions="Auto,Auto"
@@ -48,11 +64,12 @@
                             <Button Grid.Row="1" Grid.Column="0"
                                     Content="{Binding ResetYes}"
                                     HorizontalAlignment="Stretch"
-                                    Command="{Binding ResetAllCommand}"/>
+                                    Click="ResetYes_Click"/>
                             <Button Grid.Row="1" Grid.Column="1"
                                     Content="{Binding ResetNo}"
                                     HorizontalAlignment="Stretch"
-                                    Classes="accent"/>
+                                    Classes="accent"
+                                    Click="ResetNo_Click"/>
                         </Grid>
                     </Flyout>
                 </Button.Flyout>
@@ -61,10 +78,11 @@
         </Grid>
 
         <!-- ── Package list (DataGrid, mirrors the main package list) ── -->
-        <Border Grid.Row="1"
+        <Border Grid.Row="2"
                 CornerRadius="8"
                 BorderThickness="1"
-                Margin="0,6,0,6">
+                BorderBrush="{DynamicResource AppBorderBrush}"
+                Margin="0,4,0,0">
             <Panel>
 
                 <!-- Empty state -->
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml.cs
index bfb8754a3..e9ed49210 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using UniGetUI.Avalonia.ViewModels;
 
 namespace UniGetUI.Avalonia.Views;
@@ -12,4 +13,13 @@ public ManageIgnoredUpdatesWindow()
         InitializeComponent();
         vm.CloseRequested += (_, _) => Close();
     }
+
+    private void ResetYes_Click(object? sender, RoutedEventArgs e)
+    {
+        ((ManageIgnoredUpdatesViewModel)DataContext!).ResetAllCommand.Execute(null);
+        ResetButton.Flyout?.Hide();
+    }
+
+    private void ResetNo_Click(object? sender, RoutedEventArgs e) =>
+        ResetButton.Flyout?.Hide();
 }
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index b5fa43187..8fefd99a1 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -331,40 +331,29 @@
                                 </StackPanel>
                             </Expander.Header>
                             <StackPanel HorizontalAlignment="Stretch" Orientation="Vertical" Spacing="0">
-                                <RadioButton x:Name="QueryNameRadio"
-                                             GroupName="QueryOptionsGroup"
-                                             Height="30"
+                                <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
-                                             IsCheckedChanged="QueryNameRadio_IsCheckedChanged">
+                                             IsChecked="{Binding SearchMode_Name, Mode=TwoWay}">
                                     <TextBlock Text="Package Name" TextWrapping="Wrap"/>
                                 </RadioButton>
-                                <RadioButton x:Name="QueryIdRadio"
-                                             GroupName="QueryOptionsGroup"
-                                             Height="30"
+                                <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
-                                             IsCheckedChanged="QueryIdRadio_IsCheckedChanged">
+                                             IsChecked="{Binding SearchMode_Id, Mode=TwoWay}">
                                     <TextBlock Text="Package ID" TextWrapping="Wrap"/>
                                 </RadioButton>
-                                <RadioButton x:Name="QueryBothRadio"
-                                             GroupName="QueryOptionsGroup"
-                                             Height="30"
+                                <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
-                                             IsChecked="True"
-                                             IsCheckedChanged="QueryBothRadio_IsCheckedChanged">
+                                             IsChecked="{Binding SearchMode_Both, Mode=TwoWay}">
                                     <TextBlock Text="Both" TextWrapping="Wrap"/>
                                 </RadioButton>
-                                <RadioButton x:Name="QueryExactMatch"
-                                             GroupName="QueryOptionsGroup"
-                                             Height="30"
+                                <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
-                                             IsCheckedChanged="QueryExactMatch_IsCheckedChanged">
+                                             IsChecked="{Binding SearchMode_Exact, Mode=TwoWay}">
                                     <TextBlock Text="Exact match" TextWrapping="Wrap"/>
                                 </RadioButton>
-                                <RadioButton x:Name="QuerySimilarResultsRadio"
-                                             GroupName="QueryOptionsGroup"
-                                             Height="30"
+                                <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
-                                             IsCheckedChanged="QuerySimilarResultsRadio_IsCheckedChanged"
+                                             IsChecked="{Binding SearchMode_Similar, Mode=TwoWay}"
                                              IsEnabled="{Binding SimilarSearchEnabled}">
                                     <TextBlock Text="Show similar packages" TextWrapping="Wrap"/>
                                 </RadioButton>
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
index d41b49672..3669d492b 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
@@ -210,22 +210,6 @@ private void UpdateSortMenuChecks()
         OrderByDescending_Menu.Icon = Check(!ViewModel.SortAscending);
     }
 
-    // ─── Search mode radio buttons (UI → ViewModel.SearchMode) ───────────────
-    private void QueryNameRadio_IsCheckedChanged(object? sender, RoutedEventArgs e)
-    { if (QueryNameRadio.IsChecked == true) ViewModel.SearchMode = SearchMode.Name; }
-
-    private void QueryIdRadio_IsCheckedChanged(object? sender, RoutedEventArgs e)
-    { if (QueryIdRadio.IsChecked == true) ViewModel.SearchMode = SearchMode.Id; }
-
-    private void QueryBothRadio_IsCheckedChanged(object? sender, RoutedEventArgs e)
-    { if (QueryBothRadio.IsChecked == true) ViewModel.SearchMode = SearchMode.Both; }
-
-    private void QueryExactMatch_IsCheckedChanged(object? sender, RoutedEventArgs e)
-    { if (QueryExactMatch.IsChecked == true) ViewModel.SearchMode = SearchMode.Exact; }
-
-    private void QuerySimilarResultsRadio_IsCheckedChanged(object? sender, RoutedEventArgs e)
-    { if (QuerySimilarResultsRadio.IsChecked == true) ViewModel.SearchMode = SearchMode.Similar; }
-
     // ─── IKeyboardShortcutListener ────────────────────────────────────────────
     public void SearchTriggered()
     {

From 6db366c5f911669d6cfbf23b1f2a4c3a624b6ee9 Mon Sep 17 00:00:00 2001
From: Gabriel Dufresne <gabrielduf@hotmail.com>
Date: Tue, 24 Mar 2026 16:28:14 -0400
Subject: [PATCH 3/8] make changes to the app style

---
 src/UniGetUI.Avalonia/App.axaml               | 18 +++---
 .../SettingsPages/SettingsBasePage.axaml      |  9 ++-
 .../SoftwarePages/AbstractPackagesPage.axaml  | 61 ++++++++++++++++---
 .../AbstractPackagesPage.axaml.cs             |  4 ++
 4 files changed, 72 insertions(+), 20 deletions(-)

diff --git a/src/UniGetUI.Avalonia/App.axaml b/src/UniGetUI.Avalonia/App.axaml
index 78f626305..efce79adc 100644
--- a/src/UniGetUI.Avalonia/App.axaml
+++ b/src/UniGetUI.Avalonia/App.axaml
@@ -14,18 +14,18 @@
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Dark">
                     <!-- Settings cards -->
-                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#262B3C"/>
+                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#222534"/>
                     <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#3a3a3a"/>
                     <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#2e3448"/>
                     <!-- Window structure -->
-                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#1e2025"/>
-                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#313131"/>
+                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#191b29"/>
+                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#191b29"/>
                     <SolidColorBrush x:Key="AppSplitterBackground"       Color="#14161a"/>
                     <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#16181c"/>
                     <SolidColorBrush x:Key="AppBorderBrush"              Color="#323439"/>
                     <SolidColorBrush x:Key="AppBadgeBackground"          Color="#3c3e44"/>
                     <!-- Dialogs -->
-                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#1e2025"/>
+                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#191b29"/>
                     <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#2a2d34"/>
                     <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#3a3d44"/>
                     <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#12141a"/>
@@ -40,12 +40,12 @@
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="Light">
                     <!-- Settings cards -->
-                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#f3f3f3"/>
-                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#d0d0d0"/>
-                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#e8e8e8"/>
+                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#fbfbfd"/>
+                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#eff0f3"/>
+                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#f5f6f9"/>
                     <!-- Window structure -->
-                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#f0f0f0"/>
-                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#e0e0e0"/>
+                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#f0f3f9"/>
+                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#f0f3f9"/>
                     <SolidColorBrush x:Key="AppSplitterBackground"       Color="#d8d8d8"/>
                     <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#f8f8f8"/>
                     <SolidColorBrush x:Key="AppBorderBrush"              Color="#cccccc"/>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml
index 210ae3512..769371324 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
+             xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
              x:DataType="vm:SettingsBasePageViewModel">
 
     <Grid RowDefinitions="Auto,Auto,*">
@@ -15,9 +16,13 @@
                     VerticalAlignment="Center"
                     Margin="16,12,16,8">
             <Button x:Name="BackButton"
-                    Content="←"
                     Margin="0,0,12,0"
-                    Padding="8,4"/>
+                    Padding="4"
+                    Background="Transparent"
+                    BorderThickness="0">
+                <controls:SvgIcon Width="24" Height="24"
+                                  Path="avares://UniGetUI.Avalonia/Assets/Symbols/backward.svg"/>
+            </Button>
             <TextBlock Text="{Binding Title}"
                        FontSize="26"
                        FontWeight="SemiBold"
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index 8fefd99a1..b3a6973bf 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -19,6 +19,33 @@
       <Style Selector="DataGridCell:current">
          <Setter Property="BorderBrush" Value="Transparent"/>
       </Style>
+      <Style Selector="DataGridColumnHeader">
+         <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+      </Style>
+      <Style Selector="Expander /template/ ToggleButton#ExpanderHeader">
+         <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+      </Style>
+      <!-- Toolbar buttons: flat, no background/border in normal state (WinUI AppBarButton style) -->
+      <Style Selector="#ToolbarRow Button">
+         <Setter Property="Background" Value="Transparent"/>
+         <Setter Property="BorderThickness" Value="0"/>
+      </Style>
+      <Style Selector="#ToolbarRow ToggleButton">
+         <Setter Property="Background" Value="Transparent"/>
+         <Setter Property="BorderThickness" Value="0"/>
+      </Style>
+      <Style Selector="#ToolbarRow ToggleButton:checked">
+         <Setter Property="Background" Value="{DynamicResource SystemAccentColor}"/>
+      </Style>
+      <!-- Main action button: card background with border -->
+      <Style Selector="Button#MainToolbarButton">
+         <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+         <Setter Property="BorderThickness" Value="1"/>
+      </Style>
+      <Style Selector="Button#MainToolbarButtonDropdown">
+         <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+         <Setter Property="BorderThickness" Value="1"/>
+      </Style>
    </UserControl.Styles>
 
    <Grid RowDefinitions="Auto,Auto,*" Margin="8,8,8,8">
@@ -148,7 +175,7 @@
               Grid.Row="1"
               ColumnDefinitions="Auto,Auto,*"
               ColumnSpacing="4"
-              Margin="0,0,0,8">
+              Margin="0">
 
             <!-- Filters toggle — MinWidth tracks the filter pane so action buttons stay aligned with the package list -->
             <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="0,0,8,0"
@@ -170,7 +197,6 @@
                 <Button x:Name="MainToolbarButton"
                         Height="36"
                         Margin="0,0,1,0"
-                        BorderThickness="0"
                         CornerRadius="4,0,0,4">
                     <StackPanel Orientation="Horizontal" Spacing="4">
                         <controls:SvgIcon x:Name="MainToolbarButtonIcon"
@@ -186,7 +212,6 @@
                         Width="30"
                         Height="36"
                         Padding="4"
-                        BorderThickness="0"
                         CornerRadius="0,4,4,0">
                     <TextBlock Text="▾" FontSize="20" HorizontalAlignment="Center"/>
                 </Button>
@@ -229,7 +254,8 @@
                                   HorizontalContentAlignment="Stretch"
                                   IsExpanded="True"
                                   CornerRadius="8"
-                                  Padding="4,4,4,8">
+                                  Padding="4,4,4,8"
+                                  Background="{DynamicResource SettingsCardBackground}">
                             <Expander.Header>
                                 <StackPanel Orientation="Horizontal" Spacing="8">
                                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/local_pc.svg" Width="16" Height="16" VerticalAlignment="Center"/>
@@ -295,7 +321,8 @@
                                   HorizontalContentAlignment="Stretch"
                                   IsExpanded="False"
                                   CornerRadius="8"
-                                  Padding="16,8,16,8">
+                                  Padding="16,8,16,8"
+                                  Background="{DynamicResource SettingsCardBackground}">
                             <Expander.Header>
                                 <StackPanel Orientation="Horizontal" Spacing="8">
                                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/options.svg" Width="16" Height="16" VerticalAlignment="Center"/>
@@ -323,7 +350,8 @@
                                   HorizontalContentAlignment="Stretch"
                                   IsExpanded="True"
                                   CornerRadius="8"
-                                  Padding="16,8,16,8">
+                                  Padding="16,8,16,8"
+                                  Background="{DynamicResource SettingsCardBackground}">
                             <Expander.Header>
                                 <StackPanel Orientation="Horizontal" Spacing="8">
                                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/search.svg" Width="16" Height="16" VerticalAlignment="Center"/>
@@ -379,10 +407,24 @@
                 <!-- Package list container -->
                 <Border Margin="0,6,0,6"
                         CornerRadius="8"
-                        BorderThickness="1">
-                <Grid RowDefinitions="*">
+                        BorderThickness="1"
+                        BorderBrush="{DynamicResource AppBorderBrush}"
+                        Background="{DynamicResource SettingsCardBackground}">
+                <Grid RowDefinitions="Auto,*">
+                    <!-- Header bar for grid/icons views (select-all) — hidden in list mode, which has its own DataGrid header -->
+                    <Border Grid.Row="0"
+                            IsVisible="{Binding !IsListViewMode}"
+                            BorderBrush="{DynamicResource AppBorderBrush}"
+                            BorderThickness="0,0,0,1"
+                            Padding="10,0">
+                        <CheckBox IsChecked="{Binding AllPackagesChecked, Mode=TwoWay}"
+                                  Content="Select all"
+                                  Height="32"
+                                  VerticalAlignment="Center"/>
+                    </Border>
+
                     <!-- Package list (list/grid/icons views) -->
-                    <Panel >
+                    <Panel Grid.Row="1">
                         <DataGrid x:Name="PackageList"
                                   IsVisible="{Binding IsListViewMode}"
                                   HorizontalAlignment="Stretch"
@@ -594,6 +636,7 @@
                              CornerRadius="8,0,0,8"
                              FontSize="40"
                              Watermark="Search for packages"
+                             Background="{DynamicResource AppWindowBackground}"
                              Text="{Binding MegaQueryText, Mode=TwoWay}"
                              KeyDown="MegaQueryBlock_KeyDown"/>
                     <Button x:Name="MegaFindButton"
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
index 3669d492b..2266e0cb2 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
@@ -302,6 +302,8 @@ await ShowInfoDialog(win,
 
     private static async Task ShowInfoDialog(Window owner, string title, string message)
     {
+        object? bgResource = null;
+        Application.Current?.Resources.TryGetResource("AppWindowBackground", Application.Current.ActualThemeVariant, out bgResource);
         var dialog = new Window
         {
             Width = 460,
@@ -310,12 +312,14 @@ private static async Task ShowInfoDialog(Window owner, string title, string mess
             ShowInTaskbar = false,
             WindowStartupLocation = WindowStartupLocation.CenterOwner,
             Title = title,
+            Background = bgResource as IBrush,
         };
 
         var okBtn = new Button
         {
             Content = CoreTools.Translate("OK"),
             MinWidth = 80,
+            CornerRadius = new CornerRadius(4),
             HorizontalAlignment = HorizontalAlignment.Right,
         };
         okBtn.Classes.Add("accent");

From a316fd9bb359c2bcb4bc482e942b2bd94e0a29df Mon Sep 17 00:00:00 2001
From: Gabriel Dufresne <gabrielduf@hotmail.com>
Date: Wed, 25 Mar 2026 10:54:36 -0400
Subject: [PATCH 4/8] refactor some code to be more avalonia like

---
 src/UniGetUI.Avalonia/App.axaml               | 90 +------------------
 src/UniGetUI.Avalonia/App.axaml.cs            | 10 +++
 .../Assets/Styles/Styles.Common.axaml         | 35 ++++++++
 .../Assets/Styles/Styles.Linux.axaml          | 61 +++++++++++++
 .../Assets/Styles/Styles.Windows.axaml        | 61 +++++++++++++
 .../Assets/Styles/Styles.macOS.axaml          | 61 +++++++++++++
 .../AvaloniaOperationRegistry.cs              |  3 +-
 .../Models/PackageCollections.cs              |  3 +-
 .../UniGetUI.Avalonia.csproj                  |  3 +
 .../DialogPages/OperationViewModel.cs         | 69 +++-----------
 .../ViewModels/MainWindowViewModel.cs         |  5 +-
 .../SoftwarePages/PackagesPageViewModel.cs    | 35 +++++---
 .../Controls/Settings/SecureCheckboxCard.cs   | 13 +--
 .../Pages/SettingsPages/Interface_P.axaml.cs  | 10 +--
 .../SoftwarePages/AbstractPackagesPage.axaml  |  2 +-
 15 files changed, 282 insertions(+), 179 deletions(-)
 create mode 100644 src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
 create mode 100644 src/UniGetUI.Avalonia/Assets/Styles/Styles.Linux.axaml
 create mode 100644 src/UniGetUI.Avalonia/Assets/Styles/Styles.Windows.axaml
 create mode 100644 src/UniGetUI.Avalonia/Assets/Styles/Styles.macOS.axaml

diff --git a/src/UniGetUI.Avalonia/App.axaml b/src/UniGetUI.Avalonia/App.axaml
index efce79adc..acfa80dd8 100644
--- a/src/UniGetUI.Avalonia/App.axaml
+++ b/src/UniGetUI.Avalonia/App.axaml
@@ -2,102 +2,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="UniGetUI.Avalonia.App"
              xmlns:avaloniaApplication1="clr-namespace:UniGetUI.Avalonia"
-             xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
              RequestedThemeVariant="Default">
 
     <Application.DataTemplates>
         <avaloniaApplication1:ViewLocator/>
     </Application.DataTemplates>
 
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Dark">
-                    <!-- Settings cards -->
-                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#222534"/>
-                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#3a3a3a"/>
-                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#2e3448"/>
-                    <!-- Window structure -->
-                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#191b29"/>
-                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#191b29"/>
-                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#14161a"/>
-                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#16181c"/>
-                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#323439"/>
-                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#3c3e44"/>
-                    <!-- Dialogs -->
-                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#191b29"/>
-                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#2a2d34"/>
-                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#3a3d44"/>
-                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#12141a"/>
-                    <!-- Warning banner -->
-                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#3d2800"/>
-                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#7a5200"/>
-                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
-                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
-                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#ffe082"/>
-                    <!-- Setting warning subtext (WarningText on cards) -->
-                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#ffc107"/>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Light">
-                    <!-- Settings cards -->
-                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#fbfbfd"/>
-                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#eff0f3"/>
-                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#f5f6f9"/>
-                    <!-- Window structure -->
-                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#f0f3f9"/>
-                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#f0f3f9"/>
-                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#d8d8d8"/>
-                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#f8f8f8"/>
-                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#cccccc"/>
-                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#e0e0e0"/>
-                    <!-- Dialogs -->
-                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#ffffff"/>
-                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#f5f5f5"/>
-                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#ebebeb"/>
-                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#e8e8e8"/>
-                    <!-- Warning banner -->
-                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#fff8e1"/>
-                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#d4a700"/>
-                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
-                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
-                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#7a4f00"/>
-                    <!-- Setting warning subtext (WarningText on cards) -->
-                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#a05c00"/>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-
     <Application.Styles>
         <FluentTheme />
-        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
-
-        <!-- SettingsCard appearance -->
-        <Style Selector="Border.settings-card">
-            <Setter Property="Background"   Value="{DynamicResource SettingsCardBackground}"/>
-            <Setter Property="BorderBrush"  Value="{DynamicResource SettingsCardBorderBrush}"/>
-            <Setter Property="Margin"       Value="40,0"/>
-        </Style>
-        <Style Selector="Border.settings-card-clickable:pointerover">
-            <Setter Property="Background"   Value="{DynamicResource SettingsCardHoverBackground}"/>
-        </Style>
-
-        <!-- Setting warning subtext (amber, both themes) -->
-        <Style Selector="TextBlock.setting-warning-text">
-            <Setter Property="Foreground" Value="{DynamicResource SettingWarningTextForeground}"/>
-        </Style>
-
-        <!-- Warning banner (InfoBar-style amber/golden) -->
-        <Style Selector="Border.warning-banner">
-            <Setter Property="Background"      Value="{DynamicResource WarningBannerBackground}"/>
-            <Setter Property="BorderBrush"     Value="{DynamicResource WarningBannerBorderBrush}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Margin"          Value="40,4,40,0"/>
-        </Style>
-
-        <!-- SvgIcon: inherit the Fluent foreground so icons match text colour in both themes -->
-        <Style Selector="controls|SvgIcon">
-            <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-        </Style>
+        <StyleInclude Source="avares://UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml"/>
     </Application.Styles>
 </Application>
diff --git a/src/UniGetUI.Avalonia/App.axaml.cs b/src/UniGetUI.Avalonia/App.axaml.cs
index bcaff1376..d3ef1afde 100644
--- a/src/UniGetUI.Avalonia/App.axaml.cs
+++ b/src/UniGetUI.Avalonia/App.axaml.cs
@@ -3,6 +3,7 @@
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Styling;
 using UniGetUI.Avalonia.Views;
 using UniGetUI.PackageEngine;
@@ -15,6 +16,15 @@ public partial class App : Application
     public override void Initialize()
     {
         AvaloniaXamlLoader.Load(this);
+
+        string platform = OperatingSystem.IsWindows() ? "Windows"
+            : OperatingSystem.IsMacOS() ? "macOS"
+            : "Linux";
+
+        Styles.Add(new StyleInclude(new Uri("avares://UniGetUI.Avalonia/"))
+        {
+            Source = new Uri($"avares://UniGetUI.Avalonia/Assets/Styles/Styles.{platform}.axaml")
+        });
     }
 
     public override void OnFrameworkInitializationCompleted()
diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
new file mode 100644
index 000000000..0ffcf9ff6
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
@@ -0,0 +1,35 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:controls="using:UniGetUI.Avalonia.Views.Controls">
+
+    <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
+
+    <!-- SettingsCard appearance -->
+    <Style Selector="Border.settings-card">
+        <Setter Property="Background"   Value="{DynamicResource SettingsCardBackground}"/>
+        <Setter Property="BorderBrush"  Value="{DynamicResource SettingsCardBorderBrush}"/>
+        <Setter Property="Margin"       Value="40,0"/>
+    </Style>
+    <Style Selector="Border.settings-card-clickable:pointerover">
+        <Setter Property="Background"   Value="{DynamicResource SettingsCardHoverBackground}"/>
+    </Style>
+
+    <!-- Setting warning subtext (amber, both themes) -->
+    <Style Selector="TextBlock.setting-warning-text">
+        <Setter Property="Foreground" Value="{DynamicResource SettingWarningTextForeground}"/>
+    </Style>
+
+    <!-- Warning banner (InfoBar-style amber/golden) -->
+    <Style Selector="Border.warning-banner">
+        <Setter Property="Background"      Value="{DynamicResource WarningBannerBackground}"/>
+        <Setter Property="BorderBrush"     Value="{DynamicResource WarningBannerBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Margin"          Value="40,4,40,0"/>
+    </Style>
+
+    <!-- SvgIcon: inherit the Fluent foreground so icons match text colour in both themes -->
+    <Style Selector="controls|SvgIcon">
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+    </Style>
+
+</Styles>
diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Linux.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Linux.axaml
new file mode 100644
index 000000000..06928f792
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Linux.axaml
@@ -0,0 +1,61 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Dark">
+                    <!-- Settings cards -->
+                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#222534"/>
+                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#3a3a3a"/>
+                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#2e3448"/>
+                    <!-- Window structure -->
+                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#191b29"/>
+                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#191b29"/>
+                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#14161a"/>
+                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#16181c"/>
+                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#323439"/>
+                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#3c3e44"/>
+                    <!-- Dialogs -->
+                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#191b29"/>
+                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#2a2d34"/>
+                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#3a3d44"/>
+                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#12141a"/>
+                    <!-- Warning banner -->
+                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#3d2800"/>
+                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#7a5200"/>
+                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
+                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
+                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#ffe082"/>
+                    <!-- Setting warning subtext -->
+                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#ffc107"/>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <!-- Settings cards -->
+                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#fbfbfd"/>
+                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#eff0f3"/>
+                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#f5f6f9"/>
+                    <!-- Window structure -->
+                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#f0f3f9"/>
+                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#f0f3f9"/>
+                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#d8d8d8"/>
+                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#f8f8f8"/>
+                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#cccccc"/>
+                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#e0e0e0"/>
+                    <!-- Dialogs -->
+                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#ffffff"/>
+                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#f5f5f5"/>
+                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#ebebeb"/>
+                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#e8e8e8"/>
+                    <!-- Warning banner -->
+                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#fff8e1"/>
+                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#d4a700"/>
+                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
+                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
+                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#7a4f00"/>
+                    <!-- Setting warning subtext -->
+                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#a05c00"/>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+</Styles>
diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Windows.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Windows.axaml
new file mode 100644
index 000000000..06928f792
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Windows.axaml
@@ -0,0 +1,61 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Dark">
+                    <!-- Settings cards -->
+                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#222534"/>
+                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#3a3a3a"/>
+                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#2e3448"/>
+                    <!-- Window structure -->
+                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#191b29"/>
+                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#191b29"/>
+                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#14161a"/>
+                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#16181c"/>
+                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#323439"/>
+                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#3c3e44"/>
+                    <!-- Dialogs -->
+                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#191b29"/>
+                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#2a2d34"/>
+                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#3a3d44"/>
+                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#12141a"/>
+                    <!-- Warning banner -->
+                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#3d2800"/>
+                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#7a5200"/>
+                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
+                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
+                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#ffe082"/>
+                    <!-- Setting warning subtext -->
+                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#ffc107"/>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <!-- Settings cards -->
+                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#fbfbfd"/>
+                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#eff0f3"/>
+                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#f5f6f9"/>
+                    <!-- Window structure -->
+                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#f0f3f9"/>
+                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#f0f3f9"/>
+                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#d8d8d8"/>
+                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#f8f8f8"/>
+                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#cccccc"/>
+                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#e0e0e0"/>
+                    <!-- Dialogs -->
+                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#ffffff"/>
+                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#f5f5f5"/>
+                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#ebebeb"/>
+                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#e8e8e8"/>
+                    <!-- Warning banner -->
+                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#fff8e1"/>
+                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#d4a700"/>
+                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
+                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
+                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#7a4f00"/>
+                    <!-- Setting warning subtext -->
+                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#a05c00"/>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+</Styles>
diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.macOS.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.macOS.axaml
new file mode 100644
index 000000000..06928f792
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.macOS.axaml
@@ -0,0 +1,61 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Dark">
+                    <!-- Settings cards -->
+                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#222534"/>
+                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#3a3a3a"/>
+                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#2e3448"/>
+                    <!-- Window structure -->
+                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#191b29"/>
+                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#191b29"/>
+                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#14161a"/>
+                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#16181c"/>
+                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#323439"/>
+                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#3c3e44"/>
+                    <!-- Dialogs -->
+                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#191b29"/>
+                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#2a2d34"/>
+                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#3a3d44"/>
+                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#12141a"/>
+                    <!-- Warning banner -->
+                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#3d2800"/>
+                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#7a5200"/>
+                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
+                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
+                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#ffe082"/>
+                    <!-- Setting warning subtext -->
+                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#ffc107"/>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <!-- Settings cards -->
+                    <SolidColorBrush x:Key="SettingsCardBackground"      Color="#fbfbfd"/>
+                    <SolidColorBrush x:Key="SettingsCardBorderBrush"     Color="#eff0f3"/>
+                    <SolidColorBrush x:Key="SettingsCardHoverBackground" Color="#f5f6f9"/>
+                    <!-- Window structure -->
+                    <SolidColorBrush x:Key="AppWindowBackground"         Color="#f0f3f9"/>
+                    <SolidColorBrush x:Key="AppTitleBarBackground"       Color="#f0f3f9"/>
+                    <SolidColorBrush x:Key="AppSplitterBackground"       Color="#d8d8d8"/>
+                    <SolidColorBrush x:Key="AppOperationsPanelBackground" Color="#f8f8f8"/>
+                    <SolidColorBrush x:Key="AppBorderBrush"              Color="#cccccc"/>
+                    <SolidColorBrush x:Key="AppBadgeBackground"          Color="#e0e0e0"/>
+                    <!-- Dialogs -->
+                    <SolidColorBrush x:Key="AppDialogBackground"         Color="#ffffff"/>
+                    <SolidColorBrush x:Key="AppDialogPanelBackground"    Color="#f5f5f5"/>
+                    <SolidColorBrush x:Key="AppDialogSubtleBackground"   Color="#ebebeb"/>
+                    <SolidColorBrush x:Key="AppDialogDarkBackground"     Color="#e8e8e8"/>
+                    <!-- Warning banner -->
+                    <SolidColorBrush x:Key="WarningBannerBackground"     Color="#fff8e1"/>
+                    <SolidColorBrush x:Key="WarningBannerBorderBrush"    Color="#d4a700"/>
+                    <SolidColorBrush x:Key="WarningBannerIconBackground" Color="#f0a500"/>
+                    <SolidColorBrush x:Key="WarningBannerIconForeground" Color="#1a1000"/>
+                    <SolidColorBrush x:Key="WarningBannerSubtext"        Color="#7a4f00"/>
+                    <!-- Setting warning subtext -->
+                    <SolidColorBrush x:Key="SettingWarningTextForeground" Color="#a05c00"/>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+</Styles>
diff --git a/src/UniGetUI.Avalonia/Infrastructure/AvaloniaOperationRegistry.cs b/src/UniGetUI.Avalonia/Infrastructure/AvaloniaOperationRegistry.cs
index 7860121cb..c9f87837b 100644
--- a/src/UniGetUI.Avalonia/Infrastructure/AvaloniaOperationRegistry.cs
+++ b/src/UniGetUI.Avalonia/Infrastructure/AvaloniaOperationRegistry.cs
@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using Avalonia;
+using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Threading;
@@ -23,7 +24,7 @@ public static class AvaloniaOperationRegistry
     public static readonly ObservableCollection<AbstractOperation> Operations = new();
 
     /// <summary>Bindable view-models shown in the operations panel.</summary>
-    public static readonly ObservableCollection<OperationViewModel> OperationViewModels = new();
+    public static readonly AvaloniaList<OperationViewModel> OperationViewModels = new();
 
     /// <summary>
     /// Register an operation and create its UI view-model.
diff --git a/src/UniGetUI.Avalonia/Models/PackageCollections.cs b/src/UniGetUI.Avalonia/Models/PackageCollections.cs
index 83258b1d4..c8442fd35 100644
--- a/src/UniGetUI.Avalonia/Models/PackageCollections.cs
+++ b/src/UniGetUI.Avalonia/Models/PackageCollections.cs
@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using Avalonia.Collections;
 using UniGetUI.Avalonia.ViewModels.Pages;
 using UniGetUI.Interface.Enums;
 using UniGetUI.PackageEngine.Interfaces;
@@ -102,7 +103,7 @@ public void Dispose()
 /// Avalonia-compatible observable collection of PackageWrapper with sorting support
 /// (replaces WinUI's ObservablePackageCollection that used SortableObservableCollection).
 /// </summary>
-public sealed class ObservablePackageCollection : ObservableCollection<PackageWrapper>
+public sealed class ObservablePackageCollection : AvaloniaList<PackageWrapper>
 {
     public enum Sorter
     {
diff --git a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
index 9e39a8861..ef790a910 100644
--- a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
+++ b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
@@ -41,6 +41,9 @@
     </ItemGroup>
 
     <ItemGroup>
+        <!-- Platform-specific styles -->
+        <AvaloniaResource Include="Assets\Styles\*.axaml" />
+
         <!-- SVG symbol icons (shared with WinUI project) -->
         <AvaloniaResource Include="..\UniGetUI\Assets\Symbols\*.svg" Link="Assets\Symbols\%(Filename)%(Extension)" />
 
diff --git a/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationViewModel.cs
index fdbba1fdf..c199dc0dc 100644
--- a/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationViewModel.cs
@@ -1,12 +1,11 @@
 using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
 using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Media;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Avalonia.Views;
 using UniGetUI.Core.Tools;
@@ -15,7 +14,7 @@
 
 namespace UniGetUI.Avalonia.ViewModels;
 
-public sealed class OperationViewModel : INotifyPropertyChanged
+public sealed partial class OperationViewModel : ViewModelBase
 {
     public AbstractOperation Operation { get; }
 
@@ -25,6 +24,15 @@ public sealed class OperationViewModel : INotifyPropertyChanged
     public ICommand ButtonCommand { get; }
     public ICommand ShowDetailsCommand { get; }
 
+    // ── Bindable properties ───────────────────────────────────────────────────
+    [ObservableProperty] private string _title;
+    [ObservableProperty] private string _liveLine;
+    [ObservableProperty] private string _buttonText;
+    [ObservableProperty] private bool _progressIndeterminate;
+    [ObservableProperty] private double _progressValue;
+    [ObservableProperty] private IBrush _progressBrush;
+    [ObservableProperty] private IBrush _backgroundBrush;
+
     public OperationViewModel(AbstractOperation operation)
     {
         Operation = operation;
@@ -124,61 +132,6 @@ private void ShowDetails()
         }
     }
 
-    // ── Bindable properties ───────────────────────────────────────────────────
-    private string _title;
-    public string Title
-    {
-        get => _title;
-        set { _title = value; OnPropertyChanged(); }
-    }
-
-    private string _liveLine;
-    public string LiveLine
-    {
-        get => _liveLine;
-        set { _liveLine = value; OnPropertyChanged(); }
-    }
-
-    private string _buttonText;
-    public string ButtonText
-    {
-        get => _buttonText;
-        set { _buttonText = value; OnPropertyChanged(); }
-    }
-
-    private bool _progressIndeterminate;
-    public bool ProgressIndeterminate
-    {
-        get => _progressIndeterminate;
-        set { _progressIndeterminate = value; OnPropertyChanged(); }
-    }
-
-    private double _progressValue;
-    public double ProgressValue
-    {
-        get => _progressValue;
-        set { _progressValue = value; OnPropertyChanged(); }
-    }
-
-    private IBrush _progressBrush;
-    public IBrush ProgressBrush
-    {
-        get => _progressBrush;
-        set { _progressBrush = value; OnPropertyChanged(); }
-    }
-
-    private IBrush _backgroundBrush;
-    public IBrush BackgroundBrush
-    {
-        get => _backgroundBrush;
-        set { _backgroundBrush = value; OnPropertyChanged(); }
-    }
-
-    public event PropertyChangedEventHandler? PropertyChanged;
-
-    private void OnPropertyChanged([CallerMemberName] string? name = null)
-        => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
-
     // ── Minimal ICommand implementation ───────────────────────────────────────
     private sealed class SyncCommand(Action action) : ICommand
     {
diff --git a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
index d62cb9f25..7c47e03b7 100644
--- a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
@@ -1,6 +1,6 @@
-using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using Avalonia;
+using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Threading;
@@ -47,8 +47,7 @@ public partial class MainWindowViewModel : ViewModelBase
     public event EventHandler<PageType>? CurrentPageChanged;
 
     // ─── Operations panel ─────────────────────────────────────────────────────
-    public ObservableCollection<OperationViewModel> Operations
-        => AvaloniaOperationRegistry.OperationViewModels;
+    public AvaloniaList<OperationViewModel> Operations => AvaloniaOperationRegistry.OperationViewModels;
 
     [ObservableProperty]
     private bool _operationsPanelVisible;
diff --git a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
index 6701aab98..3308ec976 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
@@ -2,6 +2,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Globalization;
+using Avalonia.Collections;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -19,6 +20,8 @@ namespace UniGetUI.Avalonia.ViewModels.Pages;
 
 public enum SearchMode { Both, Name, Id, Exact, Similar }
 
+public enum PackageViewMode { List = 0, Grid = 1, Icons = 2 }
+
 public enum ReloadReason
 {
     FirstRun,
@@ -116,7 +119,7 @@ public partial class PackagesPageViewModel : ViewModelBase
     [ObservableProperty] private bool _newVersionHeaderVisible;
     [ObservableProperty] private bool _reloadButtonVisible;
     [ObservableProperty] private bool _isFilterPaneOpen;
-    [ObservableProperty] private int _viewMode;
+    [ObservableProperty] private PackageViewMode _viewMode;
     [ObservableProperty] private int _sortFieldIndex;
     [ObservableProperty] private bool _sortAscending = true;
     [ObservableProperty] private bool _instantSearch = true;
@@ -132,8 +135,8 @@ public partial class PackagesPageViewModel : ViewModelBase
 
     // ─── Collections ──────────────────────────────────────────────────────────
     public ObservablePackageCollection FilteredPackages { get; } = new();
-    public ObservableCollection<SourceTreeNode> SourceNodes { get; } = new();
-    public ObservableCollection<object> ToolBarItems { get; } = new();
+    public AvaloniaList<SourceTreeNode> SourceNodes { get; } = new();
+    public AvaloniaList<object> ToolBarItems { get; } = new();
 
     // ─── Internal state ───────────────────────────────────────────────────────
     private string _searchQuery = "";
@@ -183,8 +186,10 @@ public PackagesPageViewModel(PackagesPageData data)
 
         InstantSearch = !Settings.GetDictionaryItem<string, bool>(Settings.K.DisableInstantSearch, PageName);
 
-        ViewMode = Settings.GetDictionaryItem<string, int>(Settings.K.PackageListViewMode, PageName);
-        if (ViewMode < 0 || ViewMode > 2) ViewMode = 0;
+        var savedMode = Settings.GetDictionaryItem<string, int>(Settings.K.PackageListViewMode, PageName);
+        ViewMode = Enum.IsDefined(typeof(PackageViewMode), savedMode)
+            ? (PackageViewMode)savedMode
+            : PackageViewMode.List;
 
         _localPackagesNode.PackageName = CoreTools.Translate("Local");
 
@@ -515,7 +520,7 @@ private void OnRootSourceNodePropertyChanged(object? sender, PropertyChangedEven
     // ─── Header texts ─────────────────────────────────────────────────────────
     public void UpdateHeaderTexts()
     {
-        bool isList = ViewMode == 0;
+        bool isList = ViewMode == PackageViewMode.List;
         NameHeaderText = isList ? CoreTools.Translate("Package Name") : "";
         IdHeaderText = isList ? CoreTools.Translate("Package ID") : "";
         VersionHeaderText = isList ? CoreTools.Translate("Version") : "";
@@ -523,17 +528,25 @@ public void UpdateHeaderTexts()
         SourceHeaderText = isList ? CoreTools.Translate("Source") : "";
     }
 
-    public bool IsListViewMode => ViewMode == 0;
-    public bool IsGridViewMode => ViewMode == 1;
-    public bool IsIconsViewMode => ViewMode == 2;
+    public bool IsListViewMode => ViewMode == PackageViewMode.List;
+    public bool IsGridViewMode => ViewMode == PackageViewMode.Grid;
+    public bool IsIconsViewMode => ViewMode == PackageViewMode.Icons;
+
+    // Shim for SelectedIndex="{Binding ViewModeIndex}" in AXAML (ListBox requires int)
+    public int ViewModeIndex
+    {
+        get => (int)ViewMode;
+        set => ViewMode = (PackageViewMode)value;
+    }
 
-    partial void OnViewModeChanged(int value)
+    partial void OnViewModeChanged(PackageViewMode value)
     {
         UpdateHeaderTexts();
-        Settings.SetDictionaryItem(Settings.K.PackageListViewMode, PageName, value);
+        Settings.SetDictionaryItem(Settings.K.PackageListViewMode, PageName, (int)value);
         OnPropertyChanged(nameof(IsListViewMode));
         OnPropertyChanged(nameof(IsGridViewMode));
         OnPropertyChanged(nameof(IsIconsViewMode));
+        OnPropertyChanged(nameof(ViewModeIndex));
     }
 
     // ─── Package count (called by PackageWrapper.IsChecked setter) ────────────
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
index 54c12ecf5..f4ef5e2c7 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
@@ -30,16 +30,6 @@ public SecureSettings.K SettingName
         }
     }
 
-    public new bool IsEnabled
-    {
-        set
-        {
-            base.IsEnabled = value;
-            _warningBlock.Opacity = value ? 1 : 0.2;
-        }
-        get => base.IsEnabled;
-    }
-
     public bool ForceInversion { get; set; }
     public bool Checked => _checkbox.IsChecked ?? false;
 
@@ -104,6 +94,9 @@ public SecureCheckboxCard()
         };
 
         _checkbox.IsCheckedChanged += (s, e) => _ = _checkbox_Toggled();
+
+        this.GetObservable(IsEnabledProperty)
+            .Subscribe(enabled => _warningBlock.Opacity = enabled ? 1 : 0.2);
     }
 
     protected virtual async Task _checkbox_Toggled()
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 be66f2b93..71ce4eaf9 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml.cs
@@ -40,7 +40,7 @@ public Interface_P()
         ThemeSelector.AddItem(CoreTools.AutoTranslated("Dark"), "dark");
         ThemeSelector.AddItem(CoreTools.AutoTranslated("Follow system color scheme"), "auto");
         ThemeSelector.SettingName = CoreSettings.K.PreferredTheme;
-        ThemeSelector.Text = "Application theme:";
+        ThemeSelector.Text = CoreTools.AutoTranslated("Application theme:");
         ThemeSelector.ShowAddedItems();
         ThemeSelector.ValueChanged += (_, _) => App.ApplyTheme(CoreSettings.GetValue(CoreSettings.K.PreferredTheme));
 
@@ -51,18 +51,18 @@ public Interface_P()
         StartupPageSelector.AddItem(CoreTools.AutoTranslated("Package Bundles"), "bundles");
         StartupPageSelector.AddItem(CoreTools.AutoTranslated("Settings"), "settings");
         StartupPageSelector.SettingName = CoreSettings.K.StartupPage;
-        StartupPageSelector.Text = "UniGetUI startup page:";
+        StartupPageSelector.Text = CoreTools.AutoTranslated("UniGetUI startup page:");
         StartupPageSelector.ShowAddedItems();
 
         DisableSystemTray.SettingName = CoreSettings.K.DisableSystemTray;
-        DisableSystemTray.Text = "Close UniGetUI to the system tray";
+        DisableSystemTray.Text = CoreTools.AutoTranslated("Close UniGetUI to the system tray");
 
         DisableIconsOnPackageLists.SettingName = CoreSettings.K.DisableIconsOnPackageLists;
-        DisableIconsOnPackageLists.Text = "Show package icons on package lists";
+        DisableIconsOnPackageLists.Text = CoreTools.AutoTranslated("Show package icons on package lists");
         DisableIconsOnPackageLists.StateChanged += ShowRestartBanner;
 
         DisableSelectingUpdatesByDefault.SettingName = CoreSettings.K.DisableSelectingUpdatesByDefault;
-        DisableSelectingUpdatesByDefault.Text = "Select upgradable packages by default";
+        DisableSelectingUpdatesByDefault.Text = CoreTools.AutoTranslated("Select upgradable packages by default");
         DisableSelectingUpdatesByDefault.StateChanged += ShowRestartBanner;
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index b3a6973bf..954fe35bf 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -142,7 +142,7 @@
                     <TextBlock Text="View mode:" VerticalAlignment="Center"/>
                     <ListBox x:Name="ViewModeSelector"
                              SelectionMode="Single"
-                             SelectedIndex="{Binding ViewMode, Mode=TwoWay}"
+                             SelectedIndex="{Binding ViewModeIndex, Mode=TwoWay}"
                              Background="Transparent"
                              BorderThickness="1"
                              CornerRadius="4"

From 19c8258d49144a162e615e151b95aa80f1427a38 Mon Sep 17 00:00:00 2001
From: Gabriel Dufresne <gabrielduf@hotmail.com>
Date: Wed, 25 Mar 2026 11:41:28 -0400
Subject: [PATCH 5/8] Fixed untranslated strings in pages

---
 .../MarkupExtensions/TranslateExtension.cs    | 21 ++++++
 .../UniGetUI.Avalonia.csproj                  |  6 +-
 .../ManageIgnoredUpdatesViewModel.cs          |  6 +-
 .../DialogPages/PackageDetailsViewModel.cs    | 10 +--
 .../SoftwarePages/PackagesPageViewModel.cs    |  4 +-
 .../Views/Controls/Settings/ButtonCard.cs     |  4 +-
 .../Controls/Settings/CheckboxButtonCard.cs   |  4 +-
 .../Views/Controls/Settings/CheckboxCard.cs   |  4 +-
 .../Views/Controls/Settings/ComboboxCard.cs   |  2 +-
 .../Controls/Settings/SecureCheckboxCard.cs   | 13 +++-
 .../Controls/Settings/SettingsPageButton.cs   |  4 +-
 .../Views/Controls/Settings/TextboxCard.cs    |  4 +-
 .../Controls/Settings/TranslatedTextBlock.cs  |  2 +-
 .../ManageIgnoredUpdatesWindow.axaml          |  3 +-
 .../DialogPages/PackageDetailsWindow.axaml    |  4 +-
 src/UniGetUI.Avalonia/Views/MainWindow.axaml  |  3 +-
 .../SettingsPages/Administrator.axaml.cs      | 64 ++++++++++---------
 .../Views/Pages/SettingsPages/Backup.axaml    | 11 ++--
 .../Views/Pages/SettingsPages/Backup.axaml.cs |  8 +--
 .../Pages/SettingsPages/Experimental.axaml.cs | 22 +++----
 .../Views/Pages/SettingsPages/General.axaml   | 21 +++---
 .../Pages/SettingsPages/General.axaml.cs      | 10 +--
 .../Pages/SettingsPages/Interface_P.axaml     |  7 +-
 .../Pages/SettingsPages/Interface_P.axaml.cs  | 28 ++++----
 .../Pages/SettingsPages/Internet.axaml.cs     | 10 +--
 .../SettingsPages/Notifications.axaml.cs      | 10 +--
 .../Pages/SettingsPages/Operations.axaml      | 15 ++---
 .../Pages/SettingsPages/Operations.axaml.cs   | 14 ++--
 .../SettingsPages/SettingsHomepage.axaml      | 40 ++++++------
 .../SettingsPages/SettingsHomepage.axaml.cs   |  1 +
 .../Views/Pages/SettingsPages/Updates.axaml   | 15 ++---
 .../Pages/SettingsPages/Updates.axaml.cs      | 12 ++--
 src/UniGetUI.Avalonia/Views/SidebarView.axaml | 45 ++++++-------
 .../SoftwarePages/AbstractPackagesPage.axaml  | 53 +++++++--------
 34 files changed, 261 insertions(+), 219 deletions(-)
 create mode 100644 src/UniGetUI.Avalonia/MarkupExtensions/TranslateExtension.cs

diff --git a/src/UniGetUI.Avalonia/MarkupExtensions/TranslateExtension.cs b/src/UniGetUI.Avalonia/MarkupExtensions/TranslateExtension.cs
new file mode 100644
index 000000000..b068c219f
--- /dev/null
+++ b/src/UniGetUI.Avalonia/MarkupExtensions/TranslateExtension.cs
@@ -0,0 +1,21 @@
+using Avalonia.Markup.Xaml;
+using UniGetUI.Core.Tools;
+
+namespace UniGetUI.Avalonia.MarkupExtensions;
+
+/// <summary>
+/// Markup extension that translates a string at load time.
+/// Usage: Text="{t:Translate Some text}"
+/// For strings with commas use named-property form: Text="{t:Translate Text='A, B, C'}"
+/// </summary>
+public class TranslateExtension : MarkupExtension
+{
+    public TranslateExtension() { }
+    public TranslateExtension(string text) => Text = text;
+
+    [ConstructorArgument("text")]
+    public string Text { get; set; } = "";
+
+    public override object ProvideValue(IServiceProvider serviceProvider)
+        => CoreTools.Translate(Text);
+}
diff --git a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
index ef790a910..1d5e15743 100644
--- a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
+++ b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
@@ -41,9 +41,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <!-- Platform-specific styles -->
-        <AvaloniaResource Include="Assets\Styles\*.axaml" />
-
         <!-- SVG symbol icons (shared with WinUI project) -->
         <AvaloniaResource Include="..\UniGetUI\Assets\Symbols\*.svg" Link="Assets\Symbols\%(Filename)%(Extension)" />
 
@@ -66,6 +63,9 @@
 
     <ItemGroup>
       <AvaloniaXaml Remove="Infrastructure\**" />
+      <!-- Style-only files have no x:Class; exclude from codegen and embed as plain resources -->
+      <AvaloniaXaml Remove="Assets\Styles\*.axaml" />
+      <AvaloniaResource Include="Assets\Styles\*.axaml" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/UniGetUI.Avalonia/ViewModels/DialogPages/ManageIgnoredUpdatesViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/DialogPages/ManageIgnoredUpdatesViewModel.cs
index 60f36e274..5a740ddaf 100644
--- a/src/UniGetUI.Avalonia/ViewModels/DialogPages/ManageIgnoredUpdatesViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/DialogPages/ManageIgnoredUpdatesViewModel.cs
@@ -14,16 +14,16 @@ public partial class ManageIgnoredUpdatesViewModel : ObservableObject
     public event EventHandler? CloseRequested;
 
     public string Title { get; } = CoreTools.Translate("Manage ignored updates");
-    public string Description { get; } = CoreTools.Translate("The packages listed here won't be taken in account when checking for updates. Click the button on their right to stop ignoring their updates.");
+    public string Description { get; } = CoreTools.Translate("The packages listed here won't be taken in account when checking for updates. Double-click them or click the button on their right to stop ignoring their updates.");
     public string ResetLabel { get; } = CoreTools.Translate("Reset list");
     public string ResetConfirm { get; } = CoreTools.Translate("Do you really want to reset the ignored updates list? This action cannot be reverted");
     public string ResetYes { get; } = CoreTools.Translate("Yes");
     public string ResetNo { get; } = CoreTools.Translate("No");
     public string EmptyLabel { get; } = CoreTools.Translate("No ignored updates");
-    public string ColName { get; } = CoreTools.Translate("Package name");
+    public string ColName { get; } = CoreTools.Translate("Package Name");
     public string ColId { get; } = CoreTools.Translate("Package ID");
     public string ColVersion { get; } = CoreTools.Translate("Ignored version");
-    public string ColNewVersion { get; } = CoreTools.Translate("Available update");
+    public string ColNewVersion { get; } = CoreTools.Translate("New version");
     public string ColManager { get; } = CoreTools.Translate("Source");
 
     public ObservableCollection<IgnoredPackageEntryViewModel> Entries { get; } = [];
diff --git a/src/UniGetUI.Avalonia/ViewModels/DialogPages/PackageDetailsViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/DialogPages/PackageDetailsViewModel.cs
index 3eeb9679e..a32843e5a 100644
--- a/src/UniGetUI.Avalonia/ViewModels/DialogPages/PackageDetailsViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/DialogPages/PackageDetailsViewModel.cs
@@ -127,15 +127,15 @@ public partial class PackageDetailsViewModel : ObservableObject
     public string LabelLicense { get; } = CoreTools.Translate("License") + ":";
     public string LabelPackageId { get; } = CoreTools.Translate("Package ID") + ":";
     public string LabelManifest { get; } = CoreTools.Translate("Manifest") + ":";
-    public string LabelInstallerType { get; } = CoreTools.Translate("Installer type") + ":";
-    public string LabelInstallerSize { get; } = CoreTools.Translate("Installer size") + ":";
+    public string LabelInstallerType { get; } = CoreTools.Translate("Installer Type") + ":";
+    public string LabelInstallerSize { get; } = CoreTools.Translate("Size") + ":";
     public string LabelInstallerUrl { get; } = CoreTools.Translate("Installer URL") + ":";
-    public string LabelUpdateDate { get; } = CoreTools.Translate("Last updated") + ":";
+    public string LabelUpdateDate { get; } = CoreTools.Translate("Last updated:");
     public string LabelReleaseNotesUrl { get; } = CoreTools.Translate("Release notes URL") + ":";
     public string LabelOpen { get; } = CoreTools.Translate("Open");
     public string LabelClose { get; } = CoreTools.Translate("Close");
-    public string HeaderDetails { get; } = CoreTools.Translate("Details");
-    public string HeaderDeps { get; } = CoreTools.Translate("Dependencies");
+    public string HeaderDetails { get; } = CoreTools.Translate("Package details");
+    public string HeaderDeps { get; } = CoreTools.Translate("Dependencies:");
     public string HeaderReleaseNotes { get; } = CoreTools.Translate("Release notes");
 
     public PackageDetailsViewModel(IPackage package, OperationType role)
diff --git a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
index 3308ec976..95cb6094c 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
@@ -371,14 +371,14 @@ public async Task LoadPackages(ReloadReason reason = ReloadReason.External)
     }
 
     // ─── Sorting ──────────────────────────────────────────────────────────────
-    public string SortFieldName => SortFieldIndex switch
+    public string SortFieldName => CoreTools.Translate(SortFieldIndex switch
     {
         1 => "Id",
         2 => "Version",
         3 => "New version",
         4 => "Source",
         _ => "Name",
-    };
+    });
 
     partial void OnSortFieldIndexChanged(int value)
     {
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs
index 6c7102141..1f8b2be0a 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs
@@ -18,12 +18,12 @@ public sealed partial class ButtonCard : SettingsCard
 
     public string ButtonText
     {
-        set => _button.Content = CoreTools.Translate(value);
+        set => _button.Content = value;
     }
 
     public string Text
     {
-        set => Header = CoreTools.Translate(value);
+        set => Header = value;
     }
 
     public ICommand? Command
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
index bf04e4ac6..b384d8896 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxButtonCard.cs
@@ -36,12 +36,12 @@ public CoreSettings.K SettingName
 
     public string CheckboxText
     {
-        set => _textblock.Text = CoreTools.Translate(value);
+        set => _textblock.Text = value;
     }
 
     public string ButtonText
     {
-        set => Button.Content = CoreTools.Translate(value);
+        set => Button.Content = value;
     }
 
     private bool _buttonAlwaysOn;
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
index f07e1b0ef..a899065be 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
@@ -37,14 +37,14 @@ public CoreSettings.K SettingName
 
     public string Text
     {
-        set => _textblock.Text = CoreTools.Translate(value);
+        set => _textblock.Text = value;
     }
 
     public string WarningText
     {
         set
         {
-            _warningBlock.Text = CoreTools.Translate(value);
+            _warningBlock.Text = value;
             _warningBlock.IsVisible = value.Any();
         }
     }
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/ComboboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/ComboboxCard.cs
index 1d6020706..6debbd2f6 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/ComboboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/ComboboxCard.cs
@@ -21,7 +21,7 @@ public CoreSettings.K SettingName
 
     public string Text
     {
-        set => Header = CoreTools.Translate(value);
+        set => Header = value;
     }
 
     public event EventHandler<EventArgs>? ValueChanged;
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
index f4ef5e2c7..24680e41a 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
@@ -37,14 +37,14 @@ public SecureSettings.K SettingName
 
     public string Text
     {
-        set => _textblock.Text = CoreTools.Translate(value);
+        set => _textblock.Text = value;
     }
 
     public string WarningText
     {
         set
         {
-            _warningBlock.Text = CoreTools.Translate(value);
+            _warningBlock.Text = value;
             _warningBlock.IsVisible = value.Any();
         }
     }
@@ -97,6 +97,15 @@ public SecureCheckboxCard()
 
         this.GetObservable(IsEnabledProperty)
             .Subscribe(enabled => _warningBlock.Opacity = enabled ? 1 : 0.2);
+
+        // The Devolutions SettingsCard measures the Header with infinite width, so
+        // TextWrapping alone won't constrain the warning block. We fix it by updating
+        // MaxWidth after every layout pass, leaving room for the Content (toggle) area.
+        SizeChanged += (_, e) =>
+        {
+            var contentWidth = (Content as Control)?.Bounds.Width ?? 0;
+            _warningBlock.MaxWidth = Math.Max(100, e.NewSize.Width - contentWidth - 48);
+        };
     }
 
     protected virtual async Task _checkbox_Toggled()
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsPageButton.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsPageButton.cs
index e868e4f5e..6d6084322 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsPageButton.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsPageButton.cs
@@ -12,12 +12,12 @@ public partial class SettingsPageButton : SettingsCard
 {
     public string Text
     {
-        set => Header = CoreTools.Translate(value);
+        set => Header = value;
     }
 
     public string UnderText
     {
-        set => Description = CoreTools.Translate(value);
+        set => Description = value;
     }
 
     public IconType Icon
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs
index 229548209..79c5e670d 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs
@@ -27,12 +27,12 @@ public CoreSettings.K SettingName
 
     public string Placeholder
     {
-        set => _textbox.Watermark = CoreTools.Translate(value);
+        set => _textbox.Watermark = value;
     }
 
     public string Text
     {
-        set => Header = CoreTools.Translate(value);
+        set => Header = value;
     }
 
     public Uri HelpUrl
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/TranslatedTextBlock.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/TranslatedTextBlock.cs
index de821ab4d..b0819b305 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/TranslatedTextBlock.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/TranslatedTextBlock.cs
@@ -1,11 +1,11 @@
 using Avalonia.Controls;
-using Avalonia.Media;
 using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.Views.Controls.Settings;
 
 /// <summary>
 /// A TextBlock whose Text property is automatically translated via CoreTools.Translate.
+/// Used for section headers set from code-behind; prefer {t:Translate} in AXAML instead.
 /// </summary>
 public class TranslatedTextBlock : TextBlock
 {
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml
index 3e3856e24..c99ad473c 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/ManageIgnoredUpdatesWindow.axaml
@@ -2,6 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="using:UniGetUI.Avalonia.ViewModels"
         xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
+        xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
         x:Class="UniGetUI.Avalonia.Views.ManageIgnoredUpdatesWindow"
         x:DataType="vm:ManageIgnoredUpdatesViewModel"
         Width="900" MinWidth="520"
@@ -190,7 +191,7 @@
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             Command="{Binding RemoveCommand}"
-                                            ToolTip.Tip="Remove">
+                                            ToolTip.Tip="{t:Translate Text='Remove from list'}">
                                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/delete.svg"
                                                           Width="16" Height="16"/>
                                     </Button>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
index 8a3ac91ad..267032470 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
@@ -28,8 +28,8 @@
 
                 <!-- ── Header: icon + name + source ── -->
                 <Grid ColumnDefinitions="Auto,*" ColumnSpacing="16">
-
-                    <Border Width="72" Height="72"
+                    <Border
+                        Width="72" Height="72"
                             CornerRadius="12"
                             Background="{DynamicResource AppDialogPanelBackground}"
                             ClipToBounds="True">
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
index 5b6453906..0759552c5 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
@@ -3,6 +3,7 @@
         xmlns:views="using:UniGetUI.Avalonia.Views"
         xmlns:vm="using:UniGetUI.Avalonia.ViewModels"
         xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
+        xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="750"
@@ -163,7 +164,7 @@
                         Background="Transparent"
                         BorderThickness="0"
                         CornerRadius="4"
-                        ToolTip.Tip="Toggle navigation panel"
+                        ToolTip.Tip="{t:Translate Toggle navigation panel}"
                         Command="{Binding ToggleSidebarCommand}">
                     <PathIcon Width="14" Height="14"
                               Data="M1,1 H15 V3 H1 Z M1,7 H15 V9 H1 Z M1,13 H15 V15 H1 Z"/>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml.cs
index c09eb8e9d..2a4f3d48c 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml.cs
@@ -32,21 +32,21 @@ public Administrator()
         WarningBodyLine1.Text =
             CoreTools.Translate("The following settings may pose a security risk, hence they are disabled by default.")
             + " "
-            + CoreTools.Translate("Enable the settings below IF AND ONLY IF you fully understand what they do, and the implications and dangers they may involve.");
+            + CoreTools.Translate("Enable the settings below if and only if you fully understand what they do, and the implications they may have.");
         WarningBodyLine2.Text =
             CoreTools.Translate("The settings will list, in their descriptions, the potential security issues they may have.");
 
         // Admin rights section
         DoCacheAdminRightsForBatches.SettingName = Settings.K.DoCacheAdminRightsForBatches;
-        DoCacheAdminRightsForBatches.Text = "Ask for administrator privileges once for each batch of operations";
+        DoCacheAdminRightsForBatches.Text = CoreTools.Translate("Ask for administrator privileges once for each batch of operations");
         DoCacheAdminRightsForBatches.StateChanged += RestartCache;
 
         DoCacheAdminRights.SettingName = Settings.K.DoCacheAdminRights;
-        DoCacheAdminRights.Text = "Ask only once for administrator privileges";
+        DoCacheAdminRights.Text = CoreTools.Translate("Ask only once for administrator privileges");
         DoCacheAdminRights.StateChanged += RestartCache;
 
         ProhibitElevator.SettingName = Settings.K.ProhibitElevation;
-        ProhibitElevator.Text = "Prohibit any kind of Elevation via UniGetUI Elevator or GSudo";
+        ProhibitElevator.Text = CoreTools.Translate("Prohibit any kind of Elevation via UniGetUI Elevator or GSudo");
         ProhibitElevator.StateChanged += ShowRestartBanner;
 
         // Bind IsElevationEnabled to the ProhibitElevator toggle (inverted)
@@ -58,46 +58,36 @@ public Administrator()
 
         // CLI arguments section
         AllowCLIArguments.SettingName = SecureSettings.K.AllowCLIArguments;
-        AllowCLIArguments.Text = "Allow custom command-line arguments";
-        AllowCLIArguments._warningBlock.Text =
-            CoreTools.Translate("Custom command-line arguments can change the way in which programs are installed, upgraded or uninstalled, in a way UniGetUI cannot control.")
-            + "\n"
-            + CoreTools.Translate("Using custom command-lines can break packages. Proceed with caution.");
+        AllowCLIArguments.Text = CoreTools.Translate("Allow custom command-line arguments");
+        AllowCLIArguments._warningBlock.Text = TwoLineWarning(
+            "Custom command-line arguments can change the way in which programs are installed, upgraded or uninstalled, in a way UniGetUI cannot control. Using custom command-lines can break packages. Proceed with caution.");
         AllowCLIArguments._warningBlock.IsVisible = true;
 
         AllowPrePostInstallCommands.SettingName = SecureSettings.K.AllowPrePostOpCommand;
-        AllowPrePostInstallCommands.Text = "Ignore custom pre-install and post-install commands when importing packages from a bundle";
-        AllowPrePostInstallCommands._warningBlock.Text =
-            CoreTools.Translate("Pre and post install commands will be run before and after a package gets installed, upgraded or uninstalled.")
-            + "\n"
-            + CoreTools.Translate("Be aware that they may break things unless used carefully.");
+        AllowPrePostInstallCommands.Text = CoreTools.Translate("Ignore custom pre-install and post-install commands when importing packages from a bundle");
+        AllowPrePostInstallCommands._warningBlock.Text = TwoLineWarning(
+            "Pre and post install commands will be run before and after a package gets installed, upgraded or uninstalled. Be aware that they may break things unless used carefully");
         AllowPrePostInstallCommands._warningBlock.IsVisible = true;
 
         // Manager paths section
         AllowCustomManagerPaths.SettingName = SecureSettings.K.AllowCustomManagerPaths;
-        AllowCustomManagerPaths.Text = "Allow changing the paths for package manager executables";
-        AllowCustomManagerPaths._warningBlock.Text =
-            CoreTools.Translate("Turning this on enables changing the executable file used to interact with package managers.")
-            + "\n"
-            + CoreTools.Translate("While this allows finer-grained customization of your install processes, it may also be dangerous.");
+        AllowCustomManagerPaths.Text = CoreTools.Translate("Allow changing the paths for package manager executables");
+        AllowCustomManagerPaths._warningBlock.Text = TwoLineWarning(
+            "Turning this on enables changing the executable file used to interact with package managers. While this allows finer-grained customization of your install processes, it may also be dangerous");
         AllowCustomManagerPaths._warningBlock.IsVisible = true;
         AllowCustomManagerPaths.StateChanged += ShowRestartBanner;
 
         // Bundle import restrictions
         AllowImportingCLIArguments.SettingName = SecureSettings.K.AllowImportingCLIArguments;
-        AllowImportingCLIArguments.Text = "Allow importing custom command-line arguments when importing packages from a bundle";
-        AllowImportingCLIArguments._warningBlock.Text =
-            CoreTools.Translate("Malformed command-line arguments can break packages, or even allow a malicious actor to gain privileged execution.")
-            + "\n"
-            + CoreTools.Translate("Therefore, importing custom command-line arguments is disabled by default.");
+        AllowImportingCLIArguments.Text = CoreTools.Translate("Allow importing custom command-line arguments when importing packages from a bundle");
+        AllowImportingCLIArguments._warningBlock.Text = TwoLineWarning(
+            "Malformed command-line arguments can break packages, or even allow a malicious actor to gain privileged execution. Therefore, importing custom command-line arguments is disabled by default");
         AllowImportingCLIArguments._warningBlock.IsVisible = true;
 
         AllowImportingPrePostInstallCommands.SettingName = SecureSettings.K.AllowImportPrePostOpCommands;
-        AllowImportingPrePostInstallCommands.Text = "Allow importing custom pre-install and post-install commands when importing packages from a bundle";
-        AllowImportingPrePostInstallCommands._warningBlock.Text =
-            CoreTools.Translate("Pre and post install commands can do very nasty things to your device, if designed to do so.")
-            + "\n"
-            + CoreTools.Translate("It can be very dangerous to import the commands from a bundle, unless you trust the source of that package bundle.");
+        AllowImportingPrePostInstallCommands.Text = CoreTools.Translate("Allow importing custom pre-install and post-install commands when importing packages from a bundle");
+        AllowImportingPrePostInstallCommands._warningBlock.Text = TwoLineWarning(
+            "Pre and post install commands can do very nasty things to your device, if designed to do so. It can be very dangerous to import the commands from a bundle, unless you trust the source of that package bundle");
         AllowImportingPrePostInstallCommands._warningBlock.IsVisible = true;
 
         // Bind import cards' enabled state directly to parent toggles (imperative, since
@@ -111,4 +101,20 @@ public Administrator()
         AllowPrePostInstallCommands._checkbox.IsCheckedChanged += (_, _) =>
             AllowImportingPrePostInstallCommands.IsEnabled = AllowPrePostInstallCommands._checkbox.IsChecked ?? false;
     }
+
+    // Translates the full key (correct translation) then splits at the first sentence
+    // boundary so the warning always renders on two readable lines.
+    // Handles both Latin (". ") and CJK ("。") sentence separators.
+    private static string TwoLineWarning(string key)
+    {
+        var text = CoreTools.Translate(key);
+        // Try Latin period+space first, then CJK ideographic full stop
+        var idx = text.IndexOf(". ", StringComparison.Ordinal);
+        if (idx >= 0)
+            return text[..(idx + 1)] + "\n" + text[(idx + 2)..];
+        idx = text.IndexOf('。');
+        if (idx >= 0)
+            return text[..(idx + 1)] + "\n" + text[(idx + 1)..];
+        return text;
+    }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml
index 3f0f3b1a7..01edc70a9 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
@@ -28,8 +29,8 @@
             <settings:ButtonCard x:Name="BackupNowButton_LOCAL"
                                  CornerRadius="0,0,8,8"
                                  BorderThickness="1,0,1,1"
-                                 Text="Perform a local backup now"
-                                 ButtonText="Backup"
+                                 Text="{t:Translate Perform a local backup now}"
+                                 ButtonText="{t:Translate Backup}"
                                  IsEnabled="{Binding IsLocalBackupEnabled}"
                                  Command="{Binding DoLocalBackupCommand}"
                                  CommandParameter="{Binding $self}"/>
@@ -38,8 +39,8 @@
 
             <settings:ButtonCard x:Name="ChangeBackupDirectory"
                                  CornerRadius="8"
-                                 Text="Change backup output directory"
-                                 ButtonText="Select"
+                                 Text="{t:Translate Change backup output directory}"
+                                 ButtonText="{t:Translate Select}"
                                  IsEnabled="{Binding IsLocalBackupEnabled}"
                                  Command="{Binding PickBackupDirectoryCommand}"
                                  CommandParameter="{Binding $self}"/>
@@ -50,7 +51,7 @@
 
             <settings:TextboxCard x:Name="ChangeBackupFileNameTextBox"
                                   CornerRadius="8,8,0,0"
-                                  Text="Set a custom backup file name"
+                                  Text="{t:Translate Set a custom backup file name}"
                                   IsEnabled="{Binding IsLocalBackupEnabled}"/>
 
             <settings:CheckboxCard x:Name="EnableBackupTimestamping"
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml.cs
index d44ca1dec..7bc2fa22a 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml.cs
@@ -36,7 +36,7 @@ public Backup()
         BuildBackupInfoCard();
 
         EnablePackageBackupCheckBox_LOCAL.SettingName = CoreSettings.K.EnablePackageBackup_LOCAL;
-        EnablePackageBackupCheckBox_LOCAL.Text = "Periodically perform a local backup of the installed packages";
+        EnablePackageBackupCheckBox_LOCAL.Text = CoreTools.Translate("Periodically perform a local backup of the installed packages");
         EnablePackageBackupCheckBox_LOCAL.StateChanged += (_, _) =>
         {
             VM.IsLocalBackupEnabled = EnablePackageBackupCheckBox_LOCAL.Checked;
@@ -45,11 +45,11 @@ public Backup()
         VM.IsLocalBackupEnabled = EnablePackageBackupCheckBox_LOCAL.Checked;
 
         ChangeBackupFileNameTextBox.SettingName = CoreSettings.K.ChangeBackupFileName;
-        ChangeBackupFileNameTextBox.Text = "Set a custom backup file name";
-        ChangeBackupFileNameTextBox.Placeholder = "Leave empty for default";
+        ChangeBackupFileNameTextBox.Text = CoreTools.Translate("Set a custom backup file name");
+        ChangeBackupFileNameTextBox.Placeholder = CoreTools.Translate("Leave empty for default");
 
         EnableBackupTimestamping.SettingName = CoreSettings.K.EnableBackupTimestamping;
-        EnableBackupTimestamping.Text = "Add a timestamp to the backup file names";
+        EnableBackupTimestamping.Text = CoreTools.Translate("Add a timestamp to the backup file names");
     }
 
     private void BuildBackupInfoCard()
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml.cs
index a0e3caaf7..859ef1b11 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml.cs
@@ -23,42 +23,42 @@ public Experimental()
         InitializeComponent();
 
         ShowVersionNumberOnTitlebar.SettingName = Settings.K.ShowVersionNumberOnTitlebar;
-        ShowVersionNumberOnTitlebar.Text = "Show UniGetUI's version and build number on the titlebar.";
+        ShowVersionNumberOnTitlebar.Text = CoreTools.Translate("Show UniGetUI's version and build number on the titlebar.");
         ShowVersionNumberOnTitlebar.StateChanged += ShowRestartBanner;
 
         DisableWidgetsApi.SettingName = Settings.K.DisableApi;
-        DisableWidgetsApi.Text = "Enable background api (WingetUI Widgets and Sharing, port 7058)";
+        DisableWidgetsApi.Text = CoreTools.Translate("Enable background api (WingetUI Widgets and Sharing, port 7058)");
         DisableWidgetsApi.StateChanged += ShowRestartBanner;
 
         DisableWaitForInternetConnection.SettingName = Settings.K.DisableWaitForInternetConnection;
-        DisableWaitForInternetConnection.Text = "Wait for the device to be connected to the internet before attempting to do tasks that require internet connectivity.";
+        DisableWaitForInternetConnection.Text = CoreTools.Translate("Wait for the device to be connected to the internet before attempting to do tasks that require internet connectivity.");
         DisableWaitForInternetConnection.StateChanged += ShowRestartBanner;
 
         DisableTimeoutOnPackageListingTasks.SettingName = Settings.K.DisableTimeoutOnPackageListingTasks;
         DisableTimeoutOnPackageListingTasks.ForceInversion = true;
-        DisableTimeoutOnPackageListingTasks.Text = "Disable the 1-minute timeout for package-related operations";
+        DisableTimeoutOnPackageListingTasks.Text = CoreTools.Translate("Disable the 1-minute timeout for package-related operations");
 
         UseUserGSudoToggle.SettingName = SecureSettings.K.ForceUserGSudo;
-        UseUserGSudoToggle.Text = "Use installed GSudo instead of UniGetUI Elevator";
+        UseUserGSudoToggle.Text = CoreTools.Translate("Use installed GSudo instead of UniGetUI Elevator");
         UseUserGSudoToggle.StateChanged += ShowRestartBanner;
 
         DisableDownloadingNewTranslations.SettingName = Settings.K.DisableLangAutoUpdater;
-        DisableDownloadingNewTranslations.Text = "Download updated language files from GitHub automatically";
+        DisableDownloadingNewTranslations.Text = CoreTools.Translate("Download updated language files from GitHub automatically");
         DisableDownloadingNewTranslations.StateChanged += ShowRestartBanner;
 
         IconDatabaseURLCard.SettingName = Settings.K.IconDataBaseURL;
         IconDatabaseURLCard.HelpUrl = new Uri("https://www.marticliment.com/unigetui/help/icons-and-screenshots#custom-source");
-        IconDatabaseURLCard.Placeholder = "Leave empty for default";
-        IconDatabaseURLCard.Text = "Use a custom icon and screenshot database URL";
+        IconDatabaseURLCard.Placeholder = CoreTools.Translate("Leave empty for default");
+        IconDatabaseURLCard.Text = CoreTools.Translate("Use a custom icon and screenshot database URL");
         IconDatabaseURLCard.ValueChanged += ShowRestartBanner;
 
         DisableDMWThreadOptimizations.SettingName = Settings.K.DisableDMWThreadOptimizations;
-        DisableDMWThreadOptimizations.Text = "Enable background CPU Usage optimizations (see Pull Request #3278)";
+        DisableDMWThreadOptimizations.Text = CoreTools.Translate("Enable background CPU Usage optimizations (see Pull Request #3278)");
 
         DisableIntegrityChecks.SettingName = Settings.K.DisableIntegrityChecks;
-        DisableIntegrityChecks.Text = "Perform integrity checks at startup";
+        DisableIntegrityChecks.Text = CoreTools.Translate("Perform integrity checks at startup");
 
         InstallInstalledPackagesBundlesPage.SettingName = Settings.K.InstallInstalledPackagesBundlesPage;
-        InstallInstalledPackagesBundlesPage.Text = "When batch installing packages from a bundle, install also packages that are already installed";
+        InstallInstalledPackagesBundlesPage.Text = CoreTools.Translate("When batch installing packages from a bundle, install also packages that are already installed");
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml
index 0f7ad8e08..9069eb63a 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
@@ -34,8 +35,8 @@
                                           Margin="44,32,4,8"/>
 
             <settings:ButtonCard CornerRadius="8"
-                                 Text="Manage telemetry settings"
-                                 ButtonText="Manage"
+                                 Text="{t:Translate Manage telemetry settings}"
+                                 ButtonText="{t:Translate Manage}"
                                  Command="{Binding ShowTelemetryDialogCommand}"
                                  CommandParameter="{Binding $self}"/>
 
@@ -44,21 +45,21 @@
                                           Margin="44,32,4,8"/>
 
             <settings:ButtonCard CornerRadius="8,8,0,0"
-                                 Text="Import settings from a local file"
-                                 ButtonText="Import"
+                                 Text="{t:Translate Import settings from a local file}"
+                                 ButtonText="{t:Translate Import}"
                                  Command="{Binding ImportSettingsCommand}"
                                  CommandParameter="{Binding $self}"/>
 
             <settings:ButtonCard BorderThickness="1,0"
                                  CornerRadius="0"
-                                 Text="Export settings to a local file"
-                                 ButtonText="Export"
+                                 Text="{t:Translate Export settings to a local file}"
+                                 ButtonText="{t:Translate Export}"
                                  Command="{Binding ExportSettingsCommand}"
                                  CommandParameter="{Binding $self}"/>
 
             <settings:ButtonCard CornerRadius="0,0,8,8"
-                                 Text="Reset WingetUI"
-                                 ButtonText="Reset UniGetUI"
+                                 Text="{t:Translate Reset WingetUI}"
+                                 ButtonText="{t:Translate Reset UniGetUI}"
                                  Command="{Binding ResetSettingsCommand}"
                                  CommandParameter="{Binding $self}"/>
 
@@ -70,8 +71,8 @@
                                          CornerRadius="8"
                                          Margin="0,0,0,20"
                                          Icon="Interactive"
-                                         Text="User interface preferences"
-                                         UnderText="Application theme, startup page, package icons, clear successful installs automatically"/>
+                                         Text="{t:Translate User interface preferences}"
+                                         UnderText="{t:Translate Text='Application theme, startup page, package icons, clear successful installs automatically'}"/>
 
         </StackPanel>
     </ScrollViewer>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml.cs
index 8cb5c82ca..1d961712d 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml.cs
@@ -38,19 +38,19 @@ public General()
         foreach (var entry in langDict)
             LanguageSelector.AddItem(entry.Value, entry.Key, false);
         LanguageSelector.SettingName = CoreSettings.K.PreferredLanguage;
-        LanguageSelector.Text = "WingetUI display language:";
+        LanguageSelector.Text = CoreTools.Translate("WingetUI display language:");
         LanguageSelector.ShowAddedItems();
         LanguageSelector.ValueChanged += ShowRestartBanner;
         LanguageSelector.Description = BuildTranslatorDescription();
 
         DisableAutoUpdateWingetUI.SettingName = CoreSettings.K.DisableAutoUpdateWingetUI;
-        DisableAutoUpdateWingetUI.CheckboxText = "Update WingetUI automatically";
-        DisableAutoUpdateWingetUI.ButtonText = "Check for updates";
+        DisableAutoUpdateWingetUI.CheckboxText = CoreTools.Translate("Update WingetUI automatically");
+        DisableAutoUpdateWingetUI.ButtonText = CoreTools.Translate("Check for updates");
         DisableAutoUpdateWingetUI.ButtonAlwaysOn = true;
         DisableAutoUpdateWingetUI.Click += (_, _) => { /* auto-updater not available in Avalonia port */ };
 
         EnableUniGetUIBeta.SettingName = CoreSettings.K.EnableUniGetUIBeta;
-        EnableUniGetUIBeta.Text = "Install prerelease versions of UniGetUI";
+        EnableUniGetUIBeta.Text = CoreTools.Translate("Install prerelease versions of UniGetUI");
 
         InterfaceSettingsButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Interface_P));
     }
@@ -66,7 +66,7 @@ private static StackPanel BuildTranslatorDescription()
 
         var link = new TextBlock
         {
-            Text = CoreTools.Translate("Become a translator!"),
+            Text = CoreTools.Translate("Become a translator"),
             TextDecorations = TextDecorations.Underline,
             VerticalAlignment = VerticalAlignment.Center,
             Cursor = new Cursor(StandardCursorType.Hand),
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml
index c93e82481..df587319d 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
@@ -33,8 +34,8 @@
                 <settings:ButtonCard x:Name="EditAutostartSettings"
                                      CornerRadius="0,0,8,8"
                                      BorderThickness="1,0,1,1"
-                                     Text="Manage WingetUI autostart behaviour"
-                                     ButtonText="Open"
+                                     Text="{t:Translate Manage WingetUI autostart behaviour}"
+                                     ButtonText="{t:Translate Open}"
                                      Command="{Binding EditAutostartSettingsCommand}"/>
             </StackPanel>
 
@@ -48,7 +49,7 @@
             <settings:ButtonCard x:Name="ResetIconCache"
                                  CornerRadius="0,0,8,8"
                                  BorderThickness="1,0,1,1"
-                                 ButtonText="Clear cache"
+                                 ButtonText="{t:Translate Clear cache}"
                                  Command="{Binding ResetIconCacheCommand}"
                                  CommandParameter="{Binding $self}"/>
 
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 71ce4eaf9..a2ff87c87 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml.cs
@@ -36,33 +36,33 @@ public Interface_P()
         if (CoreSettings.GetValue(CoreSettings.K.PreferredTheme) == "")
             CoreSettings.SetValue(CoreSettings.K.PreferredTheme, "auto");
 
-        ThemeSelector.AddItem(CoreTools.AutoTranslated("Light"), "light");
-        ThemeSelector.AddItem(CoreTools.AutoTranslated("Dark"), "dark");
-        ThemeSelector.AddItem(CoreTools.AutoTranslated("Follow system color scheme"), "auto");
+        ThemeSelector.AddItem(CoreTools.Translate("Light"), "light");
+        ThemeSelector.AddItem(CoreTools.Translate("Dark"), "dark");
+        ThemeSelector.AddItem(CoreTools.Translate("Follow system color scheme"), "auto");
         ThemeSelector.SettingName = CoreSettings.K.PreferredTheme;
-        ThemeSelector.Text = CoreTools.AutoTranslated("Application theme:");
+        ThemeSelector.Text = CoreTools.Translate("Application theme:");
         ThemeSelector.ShowAddedItems();
         ThemeSelector.ValueChanged += (_, _) => App.ApplyTheme(CoreSettings.GetValue(CoreSettings.K.PreferredTheme));
 
-        StartupPageSelector.AddItem(CoreTools.AutoTranslated("Default"), "default");
-        StartupPageSelector.AddItem(CoreTools.AutoTranslated("Discover Packages"), "discover");
-        StartupPageSelector.AddItem(CoreTools.AutoTranslated("Software Updates"), "updates");
-        StartupPageSelector.AddItem(CoreTools.AutoTranslated("Installed Packages"), "installed");
-        StartupPageSelector.AddItem(CoreTools.AutoTranslated("Package Bundles"), "bundles");
-        StartupPageSelector.AddItem(CoreTools.AutoTranslated("Settings"), "settings");
+        StartupPageSelector.AddItem(CoreTools.Translate("Default"), "default");
+        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");
+        StartupPageSelector.AddItem(CoreTools.Translate("Settings"), "settings");
         StartupPageSelector.SettingName = CoreSettings.K.StartupPage;
-        StartupPageSelector.Text = CoreTools.AutoTranslated("UniGetUI startup page:");
+        StartupPageSelector.Text = CoreTools.Translate("UniGetUI startup page:");
         StartupPageSelector.ShowAddedItems();
 
         DisableSystemTray.SettingName = CoreSettings.K.DisableSystemTray;
-        DisableSystemTray.Text = CoreTools.AutoTranslated("Close UniGetUI to the system tray");
+        DisableSystemTray.Text = CoreTools.Translate("Close UniGetUI to the system tray");
 
         DisableIconsOnPackageLists.SettingName = CoreSettings.K.DisableIconsOnPackageLists;
-        DisableIconsOnPackageLists.Text = CoreTools.AutoTranslated("Show package icons on package lists");
+        DisableIconsOnPackageLists.Text = CoreTools.Translate("Show package icons on package lists");
         DisableIconsOnPackageLists.StateChanged += ShowRestartBanner;
 
         DisableSelectingUpdatesByDefault.SettingName = CoreSettings.K.DisableSelectingUpdatesByDefault;
-        DisableSelectingUpdatesByDefault.Text = CoreTools.AutoTranslated("Select upgradable packages by default");
+        DisableSelectingUpdatesByDefault.Text = CoreTools.Translate("Select upgradable packages by default");
         DisableSelectingUpdatesByDefault.StateChanged += ShowRestartBanner;
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml.cs
index f0421c74f..0f1c51f11 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml.cs
@@ -31,7 +31,7 @@ public Internet()
         InitializeComponent();
 
         EnableProxy.SettingName = CoreSettings.K.EnableProxy;
-        EnableProxy.Text = "Connect the internet using a custom proxy";
+        EnableProxy.Text = CoreTools.Translate("Connect the internet using a custom proxy");
         EnableProxy.Description = CoreTools.Translate("Please note that not all package managers may fully support this feature");
         EnableProxy.StateChanged += (_, _) =>
         {
@@ -41,12 +41,12 @@ public Internet()
         VM.IsProxyEnabled = EnableProxy.Checked;
 
         ProxyURLCard.SettingName = CoreSettings.K.ProxyURL;
-        ProxyURLCard.Text = "Proxy URL";
-        ProxyURLCard.Placeholder = "Enter proxy URL here";
+        ProxyURLCard.Text = CoreTools.Translate("Proxy URL");
+        ProxyURLCard.Placeholder = CoreTools.Translate("Enter proxy URL here");
         ProxyURLCard.ValueChanged += (_, _) => InternetViewModel.ApplyProxyToProcess();
 
         EnableProxyAuth.SettingName = CoreSettings.K.EnableProxyAuth;
-        EnableProxyAuth.Text = "Authenticate to the proxy with a user and a password";
+        EnableProxyAuth.Text = CoreTools.Translate("Authenticate to the proxy with a user and a password");
         EnableProxyAuth.Description = CoreTools.Translate("Please note that not all package managers may fully support this feature");
         EnableProxyAuth.StateChanged += (_, _) =>
         {
@@ -60,7 +60,7 @@ public Internet()
         ProxyCompatTableHolder.Content = BuildProxyCompatTable();
 
         DisableWaitForInternetConnection.SettingName = CoreSettings.K.DisableWaitForInternetConnection;
-        DisableWaitForInternetConnection.Text = "Wait for the device to be connected to the internet before attempting to do tasks that require internet connectivity.";
+        DisableWaitForInternetConnection.Text = CoreTools.Translate("Wait for the device to be connected to the internet before attempting to do tasks that require internet connectivity.");
         DisableWaitForInternetConnection.StateChanged += (_, _) => RestartRequired?.Invoke(this, EventArgs.Empty);
     }
 
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml.cs
index 014017be6..d8ec23bd4 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml.cs
@@ -27,11 +27,11 @@ public Notifications()
         DisableErrorNotifications.SettingName = Settings.K.DisableUpdatesNotifications;
         DisableSuccessNotifications.SettingName = Settings.K.DisableSuccessNotifications;
 
-        DisableNotifications.Text = "Enable WingetUI notifications";
-        DisableUpdatesNotifications.Text = "Show a notification when there are available updates";
-        DisableProgressNotifications.Text = "Show a silent notification when an operation is running";
-        DisableErrorNotifications.Text = "Show a notification when an operation fails";
-        DisableSuccessNotifications.Text = "Show a notification when an operation finishes successfully";
+        DisableNotifications.Text = CoreTools.Translate("Enable WingetUI notifications");
+        DisableUpdatesNotifications.Text = CoreTools.Translate("Show a notification when there are available updates");
+        DisableProgressNotifications.Text = CoreTools.Translate("Show a silent notification when an operation is running");
+        DisableErrorNotifications.Text = CoreTools.Translate("Show a notification when an operation fails");
+        DisableSuccessNotifications.Text = CoreTools.Translate("Show a notification when an operation finishes successfully");
 
         TrayWarningText.Text = CoreTools.Translate("The system tray icon must be enabled in order for notifications to work");
 
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml
index ea32565bf..abfffd318 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
@@ -40,18 +41,16 @@
 
             <settings:SettingsCard x:Name="UpdatesSettingsButton"
                                    CornerRadius="8,8,0,0"
-                                   IsClickEnabled="True">
-                <settings:SettingsCard.Header>Package update preferences</settings:SettingsCard.Header>
-                <settings:SettingsCard.Description>Update check frequency, automatically install updates, etc.</settings:SettingsCard.Description>
-            </settings:SettingsCard>
+                                   IsClickEnabled="True"
+                                   Header="{t:Translate Package update preferences}"
+                                   Description="{t:Translate Text='Update check frequency, automatically install updates, etc.'}"/>
 
             <settings:SettingsCard x:Name="AdminButton"
                                    BorderThickness="1,0,1,1"
                                    CornerRadius="0,0,8,8"
-                                   IsClickEnabled="True">
-                <settings:SettingsCard.Header>Administrator rights and other dangerous settings</settings:SettingsCard.Header>
-                <settings:SettingsCard.Description>Reduce UAC prompts, elevate installations by default, unlock certain dangerous features, etc.</settings:SettingsCard.Description>
-            </settings:SettingsCard>
+                                   IsClickEnabled="True"
+                                   Header="{t:Translate Administrator rights and other dangerous settings}"
+                                   Description="{t:Translate Text='Reduce UAC prompts, elevate installations by default, unlock certain dangerous features, etc.'}"/>
 
         </StackPanel>
     </ScrollViewer>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml.cs
index b0f150c14..155c457cc 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml.cs
@@ -23,7 +23,7 @@ public Operations()
         InitializeComponent();
 
         ParallelOperationCount.SettingName = Settings.K.ParallelOperationCount;
-        ParallelOperationCount.Text = "Choose how many operations should be performed in parallel";
+        ParallelOperationCount.Text = CoreTools.Translate("Choose how many operations should be performed in parallel");
         for (int i = 1; i <= 10; i++) ParallelOperationCount.AddItem(i.ToString(), i.ToString(), false);
         foreach (var v in new[] { "15", "20", "30", "50", "75", "100" })
             ParallelOperationCount.AddItem(v, v, false);
@@ -32,17 +32,17 @@ public Operations()
 
         MaintainSuccessfulInstalls.SettingName = Settings.K.MaintainSuccessfulInstalls;
         MaintainSuccessfulInstalls.ForceInversion = true;
-        MaintainSuccessfulInstalls.WarningText = "Download operations are not affected by this setting";
-        MaintainSuccessfulInstalls.Text = "Clear successful operations from the operation list after a 5 second delay";
+        MaintainSuccessfulInstalls.WarningText = CoreTools.Translate("Download operations are not affected by this setting");
+        MaintainSuccessfulInstalls.Text = CoreTools.Translate("Clear successful operations from the operation list after a 5 second delay");
 
         KillProcessesThatRefuseToDie.SettingName = Settings.K.KillProcessesThatRefuseToDie;
-        KillProcessesThatRefuseToDie.Text = "Try to kill the processes that refuse to close when requested to";
+        KillProcessesThatRefuseToDie.Text = CoreTools.Translate("Try to kill the processes that refuse to close when requested to");
         KillProcessesThatRefuseToDie.WarningOpacity = 0.7;
-        KillProcessesThatRefuseToDie.WarningText = "You may lose unsaved data";
+        KillProcessesThatRefuseToDie.WarningText = CoreTools.Translate("You may lose unsaved data");
 
         AskToDeleteNewDesktopShortcuts.SettingName = Settings.K.AskToDeleteNewDesktopShortcuts;
-        AskToDeleteNewDesktopShortcuts.CheckboxText = "Ask to delete desktop shortcuts created during an install or upgrade.";
-        AskToDeleteNewDesktopShortcuts.ButtonText = "Manage shortcuts";
+        AskToDeleteNewDesktopShortcuts.CheckboxText = CoreTools.Translate("Ask to delete desktop shortcuts created during an install or upgrade.");
+        AskToDeleteNewDesktopShortcuts.ButtonText = CoreTools.Translate("Manage shortcuts");
         AskToDeleteNewDesktopShortcuts.Click += (_, _) =>
         {
             // DialogHelper.ManageDesktopShortcuts() — not yet ported; no-op on macOS
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml
index d65025115..66ce6aa63 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
@@ -15,8 +16,8 @@
             <settings:SettingsPageButton x:Name="GeneralButton"
                 CornerRadius="8"
                 Icon="Settings"
-                Text="General preferences"
-                UnderText="Language, import/export settings, app updates"/>
+                Text="{t:Translate General preferences}"
+                UnderText="{t:Translate Text='Language, theme and other miscellaneous preferences'}"/>
 
             <Border Height="16"/>
 
@@ -24,14 +25,14 @@
             <settings:SettingsPageButton x:Name="InterfaceButton"
                 CornerRadius="8,8,0,0"
                 Icon="Interactive"
-                Text="User interface preferences"
-                UnderText="Theme, tray icon, startup page, icon style"/>
+                Text="{t:Translate User interface preferences}"
+                UnderText="{t:Translate Text='Application theme, startup page, package icons, clear successful installs automatically'}"/>
             <settings:SettingsPageButton x:Name="NotificationsButton"
                 BorderThickness="1,0,1,1"
                 CornerRadius="0,0,8,8"
                 Icon="Megaphone"
-                Text="Notification preferences"
-                UnderText="Control which notifications are shown"/>
+                Text="{t:Translate Notification preferences}"
+                UnderText="{t:Translate Show notifications on different events}"/>
 
             <Border Height="16"/>
 
@@ -39,8 +40,8 @@
             <settings:SettingsPageButton x:Name="AdministratorButton"
                 CornerRadius="8"
                 Icon="UAC"
-                Text="Administrator rights and other dangerous settings"
-                UnderText="Reduce UAC prompts, custom CLI args, bundle import restrictions"/>
+                Text="{t:Translate Administrator rights and other dangerous settings}"
+                UnderText="{t:Translate Text='Reduce UAC prompts, elevate installations by default, unlock certain dangerous features, etc.'}"/>
 
             <Border Height="16"/>
 
@@ -48,14 +49,14 @@
             <settings:SettingsPageButton x:Name="OperationsButton"
                 CornerRadius="8,8,0,0"
                 Icon="Package"
-                Text="Package operation preferences"
-                UnderText="Concurrency, shortcuts, operation list behaviour"/>
+                Text="{t:Translate Package operation preferences}"
+                UnderText="{t:Translate Text='Change how UniGetUI checks and installs available updates for your packages'}"/>
             <settings:SettingsPageButton x:Name="UpdatesButton"
                 BorderThickness="1,0,1,1"
                 CornerRadius="0,0,8,8"
                 Icon="Update"
-                Text="Package update preferences"
-                UnderText="Update check frequency, automatically install updates"/>
+                Text="{t:Translate Package update preferences}"
+                UnderText="{t:Translate Text='Update check frequency, automatically install updates, etc.'}"/>
 
             <Border Height="16"/>
 
@@ -63,8 +64,8 @@
             <settings:SettingsPageButton x:Name="BackupButton"
                 CornerRadius="8"
                 Icon="Disk"
-                Text="Package backup"
-                UnderText="Back up your installed packages locally or to the cloud"/>
+                Text="{t:Translate Package backup}"
+                UnderText="{t:Translate Automatically save a list of all your installed packages to easily restore them.}"/>
 
             <Border Height="16"/>
 
@@ -72,8 +73,8 @@
             <settings:SettingsPageButton x:Name="ManagersButton"
                 CornerRadius="8"
                 Icon="Search"
-                Text="Manage package managers"
-                UnderText="Enable/disable managers and configure their settings"/>
+                Text="{t:Translate Package manager preferences}"
+                UnderText="{t:Translate Text='Enable and disable package managers, change default install options, etc.'}"/>
 
             <Border Height="16"/>
 
@@ -81,14 +82,13 @@
             <settings:SettingsPageButton x:Name="InternetButton"
                 CornerRadius="8,8,0,0"
                 Icon="Search"
-                Text="Internet and proxy settings"
-                UnderText="HTTP proxy configuration"/>
+                Text="{t:Translate Internet connection settings}"
+                UnderText="{t:Translate Text='Proxy settings, etc.'}"/>
             <settings:SettingsPageButton x:Name="ExperimentalButton"
                 BorderThickness="1,0,1,1"
                 CornerRadius="0,0,8,8"
                 Icon="Experimental"
-                Text="Experimental settings and developer options"
-                UnderText="Unstable features, debugging options"/>
+                Text="{t:Translate Experimental settings and developer options}"/>
 
         </StackPanel>
     </ScrollViewer>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml.cs
index b02130198..e0107303d 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml.cs
@@ -26,6 +26,7 @@ public SettingsHomepage()
         BackupButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Backup));
         AdministratorButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Administrator));
         ExperimentalButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Experimental));
+        ExperimentalButton.UnderText = CoreTools.Translate("Beta features and other options that shouldn't be touched");
         ManagersButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(ManagersHomepage));
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml
index e9334a58d..dee2d9736 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
@@ -52,17 +53,15 @@
             <settings:SettingsCard x:Name="OperationsSettingsButton"
                                    BorderThickness="1,1,1,0"
                                    CornerRadius="8,8,0,0"
-                                   IsClickEnabled="True">
-                <settings:SettingsCard.Header>Package operation preferences</settings:SettingsCard.Header>
-                <settings:SettingsCard.Description>Change how UniGetUI handles install, update and uninstall operations.</settings:SettingsCard.Description>
-            </settings:SettingsCard>
+                                   IsClickEnabled="True"
+                                   Header="{t:Translate Package operation preferences}"
+                                   Description="{t:Translate Text='Change how UniGetUI handles install, update and uninstall operations.'}"/>
 
             <settings:SettingsCard x:Name="AdminButton"
                                    CornerRadius="0,0,8,8"
-                                   IsClickEnabled="True">
-                <settings:SettingsCard.Header>Administrator rights and other dangerous settings</settings:SettingsCard.Header>
-                <settings:SettingsCard.Description>Reduce UAC prompts, elevate installations by default, unlock certain dangerous features, etc.</settings:SettingsCard.Description>
-            </settings:SettingsCard>
+                                   IsClickEnabled="True"
+                                   Header="{t:Translate Administrator rights and other dangerous settings}"
+                                   Description="{t:Translate Text='Reduce UAC prompts, elevate installations by default, unlock certain dangerous features, etc.'}"/>
 
         </StackPanel>
     </ScrollViewer>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml.cs
index a0dc3391e..abb8d7945 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml.cs
@@ -25,10 +25,10 @@ public Updates()
 
         // Assign setting names and labels
         DisableAutoCheckForUpdates.SettingName = Settings.K.DisableAutoCheckforUpdates;
-        DisableAutoCheckForUpdates.Text = "Check for package updates periodically";
+        DisableAutoCheckForUpdates.Text = CoreTools.Translate("Check for package updates periodically");
 
         UpdatesCheckIntervalSelector.SettingName = Settings.K.UpdatesCheckInterval;
-        UpdatesCheckIntervalSelector.Text = "Check for updates every:";
+        UpdatesCheckIntervalSelector.Text = CoreTools.Translate("Check for updates every:");
         UpdatesCheckIntervalSelector.ValueChanged += ShowRestartBanner;
 
         var updates_dict = new Dictionary<string, string>
@@ -50,19 +50,19 @@ public Updates()
         UpdatesCheckIntervalSelector.ShowAddedItems();
 
         AutomaticallyUpdatePackages.SettingName = Settings.K.AutomaticallyUpdatePackages;
-        AutomaticallyUpdatePackages.Text = "Install available updates automatically";
+        AutomaticallyUpdatePackages.Text = CoreTools.Translate("Install available updates automatically");
 
         DisableAUPOnMeteredConnections.SettingName = Settings.K.DisableAUPOnMeteredConnections;
         DisableAUPOnMeteredConnections.ForceInversion = true;
-        DisableAUPOnMeteredConnections.Text = "Do not automatically install updates when the network connection is metered";
+        DisableAUPOnMeteredConnections.Text = CoreTools.Translate("Do not automatically install updates when the network connection is metered");
 
         DisableAUPOnBattery.SettingName = Settings.K.DisableAUPOnBattery;
         DisableAUPOnBattery.ForceInversion = true;
-        DisableAUPOnBattery.Text = "Do not automatically install updates when the device runs on battery";
+        DisableAUPOnBattery.Text = CoreTools.Translate("Do not automatically install updates when the device runs on battery");
 
         DisableAUPOnBatterySaver.SettingName = Settings.K.DisableAUPOnBatterySaver;
         DisableAUPOnBatterySaver.ForceInversion = true;
-        DisableAUPOnBatterySaver.Text = "Do not automatically install updates when the battery saver is on";
+        DisableAUPOnBatterySaver.Text = CoreTools.Translate("Do not automatically install updates when the battery saver is on");
 
         // Wire navigation cards
         OperationsSettingsButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Operations));
diff --git a/src/UniGetUI.Avalonia/Views/SidebarView.axaml b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
index 16e5ea364..7aedc963d 100644
--- a/src/UniGetUI.Avalonia/Views/SidebarView.axaml
+++ b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels"
              xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
@@ -22,11 +23,11 @@
 
             <!-- Discover Packages -->
             <ListBoxItem x:Name="DiscoverNavBtn" Tag="Discover" Padding="4,2" CornerRadius="6"
-                         ToolTip.Tip="Discover Packages">
+                         ToolTip.Tip="{t:Translate Discover Packages}">
                 <Panel>
                     <StackPanel Orientation="Horizontal" Spacing="12" Margin="8,6">
                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/ms_store.svg" Width="24" Height="24" VerticalAlignment="Center" />
-                        <TextBlock Text="Discover Packages"
+                        <TextBlock Text="{t:Translate Discover Packages}"
                                    FontSize="16"
                                    FontWeight="SemiBold"
                                    VerticalAlignment="Center"
@@ -42,11 +43,11 @@
 
             <!-- Software Updates -->
             <ListBoxItem x:Name="UpdatesNavBtn" Tag="Updates" Padding="4,2" CornerRadius="6"
-                         ToolTip.Tip="Software Updates">
+                         ToolTip.Tip="{t:Translate Software Updates}">
                 <Panel>
                     <StackPanel Orientation="Horizontal" Spacing="12" Margin="8,6">
                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/update.svg" Width="24" Height="24" VerticalAlignment="Center"/>
-                        <TextBlock Text="Software Updates"
+                        <TextBlock Text="{t:Translate Software Updates}"
                                    FontSize="16"
                                    FontWeight="SemiBold"
                                    VerticalAlignment="Center"
@@ -90,11 +91,11 @@
 
             <!-- Installed Packages -->
             <ListBoxItem x:Name="InstalledNavBtn" Tag="Installed" Padding="4,2" CornerRadius="6"
-                         ToolTip.Tip="Installed Packages">
+                         ToolTip.Tip="{t:Translate Installed Packages}">
                 <Panel>
                     <StackPanel Orientation="Horizontal" Spacing="12" Margin="8,6">
                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/local_pc.svg" Width="24" Height="24" VerticalAlignment="Center"/>
-                        <TextBlock Text="Installed Packages"
+                        <TextBlock Text="{t:Translate Installed Packages}"
                                    FontSize="16"
                                    FontWeight="SemiBold"
                                    VerticalAlignment="Center"
@@ -110,11 +111,11 @@
 
             <!-- Package Bundles -->
             <ListBoxItem x:Name="BundlesNavBtn" Tag="Bundles" Padding="4,2" CornerRadius="6"
-                         ToolTip.Tip="Package Bundles">
+                         ToolTip.Tip="{t:Translate Package Bundles}">
                 <Panel>
                     <StackPanel Orientation="Horizontal" Spacing="12" Margin="8,6">
                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/save_as.svg" Width="24" Height="24" VerticalAlignment="Center"/>
-                        <TextBlock Text="Package Bundles"
+                        <TextBlock Text="{t:Translate Package Bundles}"
                                    FontSize="16"
                                    FontWeight="SemiBold"
                                    VerticalAlignment="Center"
@@ -159,10 +160,10 @@
                     BorderThickness="0"
                     Padding="12,8"
                     CornerRadius="6"
-                    ToolTip.Tip="Settings">
+                    ToolTip.Tip="{t:Translate Settings}">
                 <StackPanel Orientation="Horizontal" Spacing="12">
                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/settings.svg" Width="24" Height="24" VerticalAlignment="Center"/>
-                    <TextBlock Text="Settings" FontSize="16" VerticalAlignment="Center"
+                    <TextBlock Text="{t:Translate Settings}" FontSize="16" VerticalAlignment="Center"
                                IsVisible="{Binding IsPaneOpen}"/>
                 </StackPanel>
             </Button>
@@ -175,10 +176,10 @@
                     BorderThickness="0"
                     Padding="12,8"
                     CornerRadius="6"
-                    ToolTip.Tip="Package Managers">
+                    ToolTip.Tip="{t:Translate Package Managers}">
                 <StackPanel Orientation="Horizontal" Spacing="12">
                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/clipboard_list.svg" Width="24" Height="24" VerticalAlignment="Center"/>
-                    <TextBlock Text="Package Managers" FontSize="16" VerticalAlignment="Center"
+                    <TextBlock Text="{t:Translate Package Managers}" FontSize="16" VerticalAlignment="Center"
                                IsVisible="{Binding IsPaneOpen}"/>
                 </StackPanel>
             </Button>
@@ -189,25 +190,25 @@
                     BorderThickness="0"
                     Padding="12,8"
                     CornerRadius="6"
-                    ToolTip.Tip="More">
+                    ToolTip.Tip="{t:Translate More}">
                 <StackPanel Orientation="Horizontal" Spacing="12">
                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/options.svg" Width="24" Height="24" VerticalAlignment="Center"/>
-                    <TextBlock Text="More" FontSize="16" VerticalAlignment="Center"
+                    <TextBlock Text="{t:Translate More}" FontSize="16" VerticalAlignment="Center"
                                IsVisible="{Binding IsPaneOpen}"/>
                 </StackPanel>
                 <Button.Flyout>
                     <MenuFlyout Placement="RightEdgeAlignedTop">
-                        <MenuItem Header="WingetUI Log" Click="UniGetUILogs_Click"/>
-                        <MenuItem Header="Package Manager logs" Click="ManagerLogsMenu_Click"/>
-                        <MenuItem Header="Operation history" Click="OperationHistoryMenu_Click"/>
+                        <MenuItem Header="{t:Translate WingetUI Log}" Click="UniGetUILogs_Click"/>
+                        <MenuItem Header="{t:Translate Package Manager logs}" Click="ManagerLogsMenu_Click"/>
+                        <MenuItem Header="{t:Translate Operation history}" Click="OperationHistoryMenu_Click"/>
                         <Separator/>
-                        <MenuItem x:Name="VersionMenuItem" Header="Version" IsEnabled="False"/>
-                        <MenuItem Header="Release notes" Click="ReleaseNotesMenu_Click"/>
+                        <MenuItem x:Name="VersionMenuItem" Header="{t:Translate Version}" IsEnabled="False"/>
+                        <MenuItem Header="{t:Translate Release notes}" Click="ReleaseNotesMenu_Click"/>
                         <Separator/>
-                        <MenuItem Header="Help" Click="HelpMenu_Click"/>
-                        <MenuItem Header="About" Click="AboutNavButton_Click"/>
+                        <MenuItem Header="{t:Translate Help}" Click="HelpMenu_Click"/>
+                        <MenuItem Header="{t:Translate About}" Click="AboutNavButton_Click"/>
                         <Separator/>
-                        <MenuItem Header="Quit UniGetUI" Click="QuitUniGetUI_Click"/>
+                        <MenuItem Header="{t:Translate Quit UniGetUI}" Click="QuitUniGetUI_Click"/>
                     </MenuFlyout>
                 </Button.Flyout>
             </Button>
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index 954fe35bf..cea649f33 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -4,6 +4,7 @@
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages"
              xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
              xmlns:pkg="using:UniGetUI.PackageEngine.PackageClasses"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -99,7 +100,7 @@
                             Orientation="Horizontal"
                             Spacing="4"
                             VerticalAlignment="Center">
-                    <TextBlock Text="Order by:" VerticalAlignment="Center"/>
+                    <TextBlock Text="{t:Translate Order by:}" VerticalAlignment="Center"/>
                     <Button x:Name="OrderByButton" Padding="8,4" CornerRadius="4">
                         <StackPanel Orientation="Horizontal" Spacing="6">
                             <TextBlock Text="{Binding SortFieldName}" VerticalAlignment="Center" FontSize="12"/>
@@ -107,14 +108,14 @@
                         </StackPanel>
                         <Button.Flyout>
                             <MenuFlyout Placement="BottomEdgeAlignedLeft">
-                                <MenuItem x:Name="OrderByName_Menu"       Header="Name"        Click="OrderByName_Click"/>
-                                <MenuItem x:Name="OrderById_Menu"         Header="Id"          Click="OrderById_Click"/>
-                                <MenuItem x:Name="OrderByVersion_Menu"    Header="Version"     Click="OrderByVersion_Click"/>
-                                <MenuItem x:Name="OrderByNewVersion_Menu" Header="New version" Click="OrderByNewVersion_Click"/>
-                                <MenuItem x:Name="OrderBySource_Menu"     Header="Source"      Click="OrderBySource_Click"/>
+                                <MenuItem x:Name="OrderByName_Menu"       Header="{t:Translate Name}"        Click="OrderByName_Click"/>
+                                <MenuItem x:Name="OrderById_Menu"         Header="{t:Translate Id}"          Click="OrderById_Click"/>
+                                <MenuItem x:Name="OrderByVersion_Menu"    Header="{t:Translate Version}"     Click="OrderByVersion_Click"/>
+                                <MenuItem x:Name="OrderByNewVersion_Menu" Header="{t:Translate New version}" Click="OrderByNewVersion_Click"/>
+                                <MenuItem x:Name="OrderBySource_Menu"     Header="{t:Translate Source}"      Click="OrderBySource_Click"/>
                                 <Separator/>
-                                <MenuItem x:Name="OrderByAscending_Menu"  Header="Ascending"   Click="OrderByAscending_Click"/>
-                                <MenuItem x:Name="OrderByDescending_Menu" Header="Descending"  Click="OrderByDescending_Click"/>
+                                <MenuItem x:Name="OrderByAscending_Menu"  Header="{t:Translate Ascendant}"   Click="OrderByAscending_Click"/>
+                                <MenuItem x:Name="OrderByDescending_Menu" Header="{t:Translate Descendant}"  Click="OrderByDescending_Click"/>
                             </MenuFlyout>
                         </Button.Flyout>
                     </Button>
@@ -139,7 +140,7 @@
                             Orientation="Horizontal"
                             Spacing="4"
                             VerticalAlignment="Center">
-                    <TextBlock Text="View mode:" VerticalAlignment="Center"/>
+                    <TextBlock Text="{t:Translate View mode:}" VerticalAlignment="Center"/>
                     <ListBox x:Name="ViewModeSelector"
                              SelectionMode="Single"
                              SelectedIndex="{Binding ViewModeIndex, Mode=TwoWay}"
@@ -187,7 +188,7 @@
                               IsChecked="{Binding IsFilterPaneOpen, Mode=TwoWay}">
                     <StackPanel Orientation="Horizontal" Spacing="8">
                         <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/options.svg" Width="16" Height="16" VerticalAlignment="Center"/>
-                        <TextBlock Text="Filters" FontSize="12" FontWeight="Medium" VerticalAlignment="Center"/>
+                        <TextBlock Text="{t:Translate Filters}" FontSize="12" FontWeight="Medium" VerticalAlignment="Center"/>
                     </StackPanel>
                 </ToggleButton>
             </StackPanel>
@@ -259,12 +260,12 @@
                             <Expander.Header>
                                 <StackPanel Orientation="Horizontal" Spacing="8">
                                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/local_pc.svg" Width="16" Height="16" VerticalAlignment="Center"/>
-                                    <TextBlock Text="Sources" FontWeight="SemiBold" VerticalAlignment="Center"/>
+                                    <TextBlock Text="{t:Translate Sources}" FontWeight="SemiBold" VerticalAlignment="Center"/>
                                 </StackPanel>
                             </Expander.Header>
                             <StackPanel Orientation="Vertical">
                                 <TextBlock x:Name="SourcesPlaceholderText"
-                                           Text="Search for packages to start"
+                                           Text="{t:Translate Search for packages to start}"
                                            MinHeight="60"
                                            HorizontalAlignment="Center"
                                            VerticalAlignment="Center"
@@ -287,7 +288,7 @@
                                             Padding="2"
                                             Background="Transparent"
                                             BorderThickness="0">
-                                        <TextBlock Text="Select all" FontSize="12" FontWeight="SemiBold"/>
+                                        <TextBlock Text="{t:Translate Select all}" FontSize="12" FontWeight="SemiBold"/>
                                     </Button>
                                     <Button x:Name="ClearSourceSelectionButton"
                                             Grid.Column="1"
@@ -297,7 +298,7 @@
                                             Padding="2"
                                             Background="Transparent"
                                             BorderThickness="0">
-                                        <TextBlock Text="Clear selection" FontSize="12" FontWeight="SemiBold"/>
+                                        <TextBlock Text="{t:Translate Clear selection}" FontSize="12" FontWeight="SemiBold"/>
                                     </Button>
                                     <ItemsControl x:Name="SourcesTreeView"
                                               Grid.Row="1"
@@ -326,21 +327,21 @@
                             <Expander.Header>
                                 <StackPanel Orientation="Horizontal" Spacing="8">
                                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/options.svg" Width="16" Height="16" VerticalAlignment="Center"/>
-                                    <TextBlock Text="Filters" FontWeight="SemiBold" VerticalAlignment="Center"/>
+                                    <TextBlock Text="{t:Translate Filters}" FontWeight="SemiBold" VerticalAlignment="Center"/>
                                 </StackPanel>
                             </Expander.Header>
                             <StackPanel HorizontalAlignment="Stretch" Orientation="Vertical" Spacing="0">
                                 <CheckBox x:Name="InstantSearchCheckbox"
                                           IsChecked="{Binding InstantSearch, Mode=TwoWay}">
-                                    <TextBlock Text="Instant search" TextWrapping="Wrap"/>
+                                    <TextBlock Text="{t:Translate Instant search}" TextWrapping="Wrap"/>
                                 </CheckBox>
                                 <CheckBox x:Name="UpperLowerCaseCheckbox"
                                           IsChecked="{Binding UpperLowerCase, Mode=TwoWay}">
-                                    <TextBlock Text="Distinguish between uppercase and lowercase" TextWrapping="Wrap"/>
+                                    <TextBlock Text="{t:Translate Distinguish between uppercase and lowercase}" TextWrapping="Wrap"/>
                                 </CheckBox>
                                 <CheckBox x:Name="IgnoreSpecialCharsCheckbox"
                                           IsChecked="{Binding IgnoreSpecialChars, Mode=TwoWay}">
-                                    <TextBlock Text="Ignore special characters" TextWrapping="Wrap"/>
+                                    <TextBlock Text="{t:Translate Ignore special characters}" TextWrapping="Wrap"/>
                                 </CheckBox>
                             </StackPanel>
                         </Expander>
@@ -355,35 +356,35 @@
                             <Expander.Header>
                                 <StackPanel Orientation="Horizontal" Spacing="8">
                                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/search.svg" Width="16" Height="16" VerticalAlignment="Center"/>
-                                    <TextBlock Text="Search mode" FontWeight="SemiBold" VerticalAlignment="Center"/>
+                                    <TextBlock Text="{t:Translate Search mode}" FontWeight="SemiBold" VerticalAlignment="Center"/>
                                 </StackPanel>
                             </Expander.Header>
                             <StackPanel HorizontalAlignment="Stretch" Orientation="Vertical" Spacing="0">
                                 <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
                                              IsChecked="{Binding SearchMode_Name, Mode=TwoWay}">
-                                    <TextBlock Text="Package Name" TextWrapping="Wrap"/>
+                                    <TextBlock Text="{t:Translate Package Name}" TextWrapping="Wrap"/>
                                 </RadioButton>
                                 <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
                                              IsChecked="{Binding SearchMode_Id, Mode=TwoWay}">
-                                    <TextBlock Text="Package ID" TextWrapping="Wrap"/>
+                                    <TextBlock Text="{t:Translate Package ID}" TextWrapping="Wrap"/>
                                 </RadioButton>
                                 <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
                                              IsChecked="{Binding SearchMode_Both, Mode=TwoWay}">
-                                    <TextBlock Text="Both" TextWrapping="Wrap"/>
+                                    <TextBlock Text="{t:Translate Both}" TextWrapping="Wrap"/>
                                 </RadioButton>
                                 <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
                                              IsChecked="{Binding SearchMode_Exact, Mode=TwoWay}">
-                                    <TextBlock Text="Exact match" TextWrapping="Wrap"/>
+                                    <TextBlock Text="{t:Translate Exact match}" TextWrapping="Wrap"/>
                                 </RadioButton>
                                 <RadioButton Height="30"
                                              Margin="0,-2,0,-2"
                                              IsChecked="{Binding SearchMode_Similar, Mode=TwoWay}"
                                              IsEnabled="{Binding SimilarSearchEnabled}">
-                                    <TextBlock Text="Show similar packages" TextWrapping="Wrap"/>
+                                    <TextBlock Text="{t:Translate Show similar packages}" TextWrapping="Wrap"/>
                                 </RadioButton>
                             </StackPanel>
                         </Expander>
@@ -418,7 +419,7 @@
                             BorderThickness="0,0,0,1"
                             Padding="10,0">
                         <CheckBox IsChecked="{Binding AllPackagesChecked, Mode=TwoWay}"
-                                  Content="Select all"
+                                  Content="{t:Translate Select all}"
                                   Height="32"
                                   VerticalAlignment="Center"/>
                     </Border>
@@ -635,7 +636,7 @@
                              Padding="16,8,10,08"
                              CornerRadius="8,0,0,8"
                              FontSize="40"
-                             Watermark="Search for packages"
+                             Watermark="{t:Translate Search for packages}"
                              Background="{DynamicResource AppWindowBackground}"
                              Text="{Binding MegaQueryText, Mode=TwoWay}"
                              KeyDown="MegaQueryBlock_KeyDown"/>

From 368c41e40999882d5e82cf19b05ee64f46ea31d1 Mon Sep 17 00:00:00 2001
From: Gabriel Dufresne <gabrielduf@hotmail.com>
Date: Wed, 25 Mar 2026 14:46:59 -0400
Subject: [PATCH 6/8] refactor - commands, bindings, and view cleanup

---
 .../UniGetUI.Avalonia.csproj                  |   3 +
 .../DialogPages/OperationOutputViewModel.cs   |  16 ++
 .../DialogPages/OperationViewModel.cs         |   2 +-
 .../DialogPages/PackageDetailsViewModel.cs    |   1 +
 .../ViewModels/MainWindowViewModel.cs         |   7 +
 .../SettingsPages/AdministratorViewModel.cs   |  64 +++++-
 .../Pages/SettingsPages/BackupViewModel.cs    |  15 +-
 .../SettingsPages/ExperimentalViewModel.cs    |   5 +
 .../Pages/SettingsPages/GeneralViewModel.cs   |   9 +
 .../SettingsPages/Interface_PViewModel.cs     |   3 +
 .../Pages/SettingsPages/InternetViewModel.cs  | 161 +++++++++++++++
 .../SettingsPages/NotificationsViewModel.cs   |  16 +-
 .../SettingsPages/OperationsViewModel.cs      |  26 +++
 .../SettingsBasePageViewModel.cs              |  19 ++
 .../SettingsHomepageViewModel.cs              |  14 ++
 .../Pages/SettingsPages/UpdatesViewModel.cs   |  43 ++++
 .../ViewModels/SidebarViewModel.cs            |  17 +-
 .../SoftwarePages/PackagesPageViewModel.cs    | 153 +++++++++++++-
 .../Views/Controls/Settings/ButtonCard.cs     |  23 +--
 .../Views/Controls/Settings/CheckboxCard.cs   |  13 ++
 .../Views/Controls/Settings/ComboboxCard.cs   |  14 ++
 .../Controls/Settings/SecureCheckboxCard.cs   |  28 ++-
 .../Views/Controls/Settings/SettingsCard.cs   | 107 ++++++----
 .../Views/Controls/Settings/TextboxCard.cs    |  13 ++
 .../DialogPages/OperationOutputWindow.axaml   |  29 +++
 .../OperationOutputWindow.axaml.cs            |  20 ++
 .../DialogPages/OperationOutputWindow.cs      |  53 -----
 .../DialogPages/PackageDetailsWindow.axaml    |   4 +-
 .../DialogPages/PackageDetailsWindow.axaml.cs |   1 -
 .../Views/DialogPages/TelemetryDialog.axaml   |  17 +-
 .../DialogPages/TelemetryDialog.axaml.cs      |  10 -
 src/UniGetUI.Avalonia/Views/MainWindow.axaml  |   2 +-
 .../Views/MainWindow.axaml.cs                 |  17 --
 .../Pages/SettingsPages/Administrator.axaml   |  44 +++-
 .../SettingsPages/Administrator.axaml.cs      |  99 +--------
 .../Views/Pages/SettingsPages/Backup.axaml    |  16 +-
 .../Views/Pages/SettingsPages/Backup.axaml.cs |  29 +--
 .../Pages/SettingsPages/Experimental.axaml    |  36 +++-
 .../Pages/SettingsPages/Experimental.axaml.cs |  44 +---
 .../Views/Pages/SettingsPages/General.axaml   |  14 +-
 .../Pages/SettingsPages/General.axaml.cs      |  22 +-
 .../Pages/SettingsPages/Interface_P.axaml     |  12 +-
 .../Pages/SettingsPages/Interface_P.axaml.cs  |  20 +-
 .../Views/Pages/SettingsPages/Internet.axaml  |  20 +-
 .../Pages/SettingsPages/Internet.axaml.cs     | 161 +--------------
 .../Pages/SettingsPages/Notifications.axaml   |  19 +-
 .../SettingsPages/Notifications.axaml.cs      |  29 ---
 .../Pages/SettingsPages/Operations.axaml      |  23 ++-
 .../Pages/SettingsPages/Operations.axaml.cs   |  46 +----
 .../SettingsPages/SettingsBasePage.axaml      |   6 +-
 .../SettingsPages/SettingsBasePage.axaml.cs   |  15 +-
 .../SettingsPages/SettingsHomepage.axaml      |  57 +++---
 .../SettingsPages/SettingsHomepage.axaml.cs   |  13 +-
 .../Views/Pages/SettingsPages/Updates.axaml   |  30 ++-
 .../Pages/SettingsPages/Updates.axaml.cs      |  55 +----
 src/UniGetUI.Avalonia/Views/SidebarView.axaml |  24 +--
 .../Views/SidebarView.axaml.cs                |  33 +--
 .../SoftwarePages/AbstractPackagesPage.axaml  |  14 +-
 .../AbstractPackagesPage.axaml.cs             | 189 +++---------------
 .../SoftwarePages/DiscoverSoftwarePage.cs     |  24 +--
 .../SoftwarePages/InstalledPackagesPage.cs    |  31 +--
 .../Views/SoftwarePages/PackageBundlesPage.cs |  27 +--
 .../SoftwarePages/SoftwareUpdatesPage.cs      |  27 +--
 63 files changed, 1088 insertions(+), 1016 deletions(-)
 create mode 100644 src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationOutputViewModel.cs
 create mode 100644 src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml
 create mode 100644 src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml.cs
 delete mode 100644 src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.cs

diff --git a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
index 1d5e15743..29249d077 100644
--- a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
+++ b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
@@ -135,6 +135,9 @@
         <DependentUpon>ManagersHomepage.axaml</DependentUpon>
         <SubType>Code</SubType>
       </Compile>
+      <Compile Update="Views\DialogPages\OperationOutputWindow.axaml.cs">
+        <DependentUpon>OperationOutputWindow.axaml</DependentUpon>
+      </Compile>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationOutputViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationOutputViewModel.cs
new file mode 100644
index 000000000..11e07aa2a
--- /dev/null
+++ b/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationOutputViewModel.cs
@@ -0,0 +1,16 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using UniGetUI.PackageOperations;
+
+namespace UniGetUI.Avalonia.ViewModels.DialogPages;
+
+public partial class OperationOutputViewModel : ObservableObject
+{
+    [ObservableProperty] private string _title = "";
+    [ObservableProperty] private string _outputText = "";
+
+    public OperationOutputViewModel(AbstractOperation operation)
+    {
+        Title = operation.Metadata.Title;
+        OutputText = string.Join("\n", operation.GetOutput().Select(x => x.Item1));
+    }
+}
diff --git a/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationViewModel.cs
index c199dc0dc..1011cd473 100644
--- a/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/DialogPages/OperationViewModel.cs
@@ -7,7 +7,7 @@
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using UniGetUI.Avalonia.Infrastructure;
-using UniGetUI.Avalonia.Views;
+using UniGetUI.Avalonia.Views.DialogPages;
 using UniGetUI.Core.Tools;
 using UniGetUI.PackageEngine.Enums;
 using UniGetUI.PackageOperations;
diff --git a/src/UniGetUI.Avalonia/ViewModels/DialogPages/PackageDetailsViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/DialogPages/PackageDetailsViewModel.cs
index a32843e5a..20bc1b7fd 100644
--- a/src/UniGetUI.Avalonia/ViewModels/DialogPages/PackageDetailsViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/DialogPages/PackageDetailsViewModel.cs
@@ -297,6 +297,7 @@ private static void OpenUrl(string? url)
         catch { }
     }
 
+    [RelayCommand]
     public void RequestClose() => CloseRequested?.Invoke(this, EventArgs.Empty);
 }
 
diff --git a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
index 7c47e03b7..4937e3eef 100644
--- a/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/MainWindowViewModel.cs
@@ -340,7 +340,14 @@ private async Task ShowAboutDialog()
         Sidebar.SelectNavButtonForPage(_currentPage);
     }
 
+    // ─── Banner close commands ────────────────────────────────────────────────
+    [RelayCommand] private void CloseUpdatesBanner() => UpdatesBannerVisible = false;
+    [RelayCommand] private void CloseErrorBanner() => ErrorBannerVisible = false;
+    [RelayCommand] private void CloseWinGetWarningBanner() => WinGetWarningBannerVisible = false;
+    [RelayCommand] private void CloseTelemetryWarner() => TelemetryWarnerVisible = false;
+
     // ─── Search box ──────────────────────────────────────────────────────────
+    [RelayCommand]
     public void SubmitGlobalSearch()
     {
         if (CurrentPageContent is ISearchBoxPage page)
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/AdministratorViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/AdministratorViewModel.cs
index 1bdafbb40..fc1c5ea48 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/AdministratorViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/AdministratorViewModel.cs
@@ -1,12 +1,68 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.ViewModels;
+using UniGetUI.Core.SettingsEngine;
+using UniGetUI.Core.SettingsEngine.SecureSettings;
+using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
 
 public partial class AdministratorViewModel : ViewModelBase
 {
-    /// <summary>
-    /// True when elevation is NOT prohibited — controls enabled-state of the cache-admin-rights cards.
-    /// </summary>
-    [ObservableProperty] private bool _isElevationEnabled = true;
+    public event EventHandler? RestartRequired;
+
+    // ── Warning banner strings ────────────────────────────────────────────
+    public string WarningTitle { get; } = CoreTools.Translate("Warning") + "!";
+
+    public string WarningBody1 { get; } =
+        CoreTools.Translate("The following settings may pose a security risk, hence they are disabled by default.")
+        + " "
+        + CoreTools.Translate("Enable the settings below if and only if you fully understand what they do, and the implications they may have.");
+
+    public string WarningBody2 { get; } =
+        CoreTools.Translate("The settings will list, in their descriptions, the potential security issues they may have.");
+
+    // ── Observable state ─────────────────────────────────────────────────
+    /// <summary>True when elevation is NOT prohibited — controls enabled-state of the cache-admin-rights cards.</summary>
+    [ObservableProperty] private bool _isElevationEnabled;
+
+    /// <summary>Mirrors AllowCLIArguments toggle — controls IsEnabled of AllowImportingCLIArguments.</summary>
+    [ObservableProperty] private bool _isCLIArgumentsEnabled;
+
+    /// <summary>Mirrors AllowPrePostOpCommand toggle — controls IsEnabled of AllowImportingPrePostInstallCommands.</summary>
+    [ObservableProperty] private bool _isPrePostCommandsEnabled;
+
+    public AdministratorViewModel()
+    {
+        _isElevationEnabled = !Settings.Get(Settings.K.ProhibitElevation);
+        _isCLIArgumentsEnabled = SecureSettings.Get(SecureSettings.K.AllowCLIArguments);
+        _isPrePostCommandsEnabled = SecureSettings.Get(SecureSettings.K.AllowPrePostOpCommand);
+    }
+
+    // ── Commands ─────────────────────────────────────────────────────────
+
+    [RelayCommand]
+    private void RestartCache() => _ = CoreTools.ResetUACForCurrentProcess();
+
+    [RelayCommand]
+    private void ShowRestartRequired() => RestartRequired?.Invoke(this, EventArgs.Empty);
+
+    [RelayCommand]
+    private void RefreshElevationState()
+    {
+        IsElevationEnabled = !Settings.Get(Settings.K.ProhibitElevation);
+        RestartRequired?.Invoke(this, EventArgs.Empty);
+    }
+
+    [RelayCommand]
+    private void RefreshCLIState()
+    {
+        IsCLIArgumentsEnabled = SecureSettings.Get(SecureSettings.K.AllowCLIArguments);
+    }
+
+    [RelayCommand]
+    private void RefreshPrePostState()
+    {
+        IsPrePostCommandsEnabled = SecureSettings.Get(SecureSettings.K.AllowPrePostOpCommand);
+    }
 }
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/BackupViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/BackupViewModel.cs
index 30a87fc35..75a5de617 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/BackupViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/BackupViewModel.cs
@@ -11,10 +11,23 @@ namespace UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
 
 public partial class BackupViewModel : ViewModelBase
 {
+    public event EventHandler? RestartRequired;
+
     [ObservableProperty] private bool _isLocalBackupEnabled;
     [ObservableProperty] private string _backupDirectoryLabel = "";
 
-    public BackupViewModel() => RefreshDirectoryLabel();
+    public BackupViewModel()
+    {
+        _isLocalBackupEnabled = CoreSettings.Get(CoreSettings.K.EnablePackageBackup_LOCAL);
+        RefreshDirectoryLabel();
+    }
+
+    [RelayCommand]
+    private void EnableLocalBackupChanged()
+    {
+        IsLocalBackupEnabled = CoreSettings.Get(CoreSettings.K.EnablePackageBackup_LOCAL);
+        RestartRequired?.Invoke(this, EventArgs.Empty);
+    }
 
     private void RefreshDirectoryLabel()
     {
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/ExperimentalViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/ExperimentalViewModel.cs
index b7bb36ce7..869b36b79 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/ExperimentalViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/ExperimentalViewModel.cs
@@ -1,7 +1,12 @@
+using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.ViewModels;
 
 namespace UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
 
 public partial class ExperimentalViewModel : ViewModelBase
 {
+    public event EventHandler? RestartRequired;
+
+    [RelayCommand]
+    private void ShowRestartRequired() => RestartRequired?.Invoke(this, EventArgs.Empty);
 }
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/GeneralViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/GeneralViewModel.cs
index c84f116b0..a51bcef0a 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/GeneralViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/GeneralViewModel.cs
@@ -5,6 +5,7 @@
 using global::Avalonia.Platform.Storage;
 using UniGetUI.Avalonia.ViewModels;
 using UniGetUI.Avalonia.Views.DialogPages;
+using UniGetUI.Avalonia.Views.Pages.SettingsPages;
 using UniGetUI.Core.Logging;
 using UniGetUI.Core.Tools;
 using CoreSettings = global::UniGetUI.Core.SettingsEngine.Settings;
@@ -64,5 +65,13 @@ private void ResetSettings(Visual? _)
     }
 
     public event EventHandler? RestartRequired;
+    public event EventHandler<Type>? NavigationRequested;
+
     private void OnRestartRequired() => RestartRequired?.Invoke(this, EventArgs.Empty);
+
+    [RelayCommand]
+    private void ShowRestartRequired() => RestartRequired?.Invoke(this, EventArgs.Empty);
+
+    [RelayCommand]
+    private void NavigateToInterface() => NavigationRequested?.Invoke(this, typeof(Interface_P));
 }
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/Interface_PViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/Interface_PViewModel.cs
index b3d66352f..b4f2a3f24 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/Interface_PViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/Interface_PViewModel.cs
@@ -15,6 +15,9 @@ public partial class Interface_PViewModel : ViewModelBase
 
     public event EventHandler? RestartRequired;
 
+    [RelayCommand]
+    private void ShowRestartRequired() => RestartRequired?.Invoke(this, EventArgs.Empty);
+
     [RelayCommand]
     private static void EditAutostartSettings()
         => CoreTools.Launch("ms-settings:startupapps");
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/InternetViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/InternetViewModel.cs
index fdab2f0b4..606c00b81 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/InternetViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/InternetViewModel.cs
@@ -1,14 +1,175 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.ViewModels;
+using UniGetUI.Avalonia.Views.Controls.Settings;
+using UniGetUI.Core.Tools;
+using UniGetUI.PackageEngine;
+using UniGetUI.PackageEngine.ManagerClasses.Manager;
 using CoreSettings = global::UniGetUI.Core.SettingsEngine.Settings;
 
 namespace UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
 
 public partial class InternetViewModel : ViewModelBase
 {
+    public event EventHandler? RestartRequired;
+
+    private TextBox? _usernameBox;
+    private TextBox? _passwordBox;
+    private ProgressBar? _savingIndicator;
+
     [ObservableProperty] private bool _isProxyEnabled;
     [ObservableProperty] private bool _isProxyAuthEnabled;
 
+    public InternetViewModel()
+    {
+        _isProxyEnabled = CoreSettings.Get(CoreSettings.K.EnableProxy);
+        _isProxyAuthEnabled = CoreSettings.Get(CoreSettings.K.EnableProxyAuth);
+    }
+
+    public SettingsCard BuildCredentialsCard()
+    {
+        _savingIndicator = new ProgressBar
+        {
+            IsIndeterminate = true,
+            Opacity = 0,
+            Margin = new Thickness(0, -8, 0, 0),
+        };
+
+        _usernameBox = new TextBox
+        {
+            Watermark = CoreTools.Translate("Username"),
+            MinWidth = 200,
+            Margin = new Thickness(0, 0, 0, 4),
+        };
+
+        _passwordBox = new TextBox
+        {
+            Watermark = CoreTools.Translate("Password"),
+            MinWidth = 200,
+            PasswordChar = '●',
+        };
+
+        var creds = CoreSettings.GetProxyCredentials();
+        if (creds is not null)
+        {
+            _usernameBox.Text = creds.UserName;
+            _passwordBox.Text = creds.Password;
+        }
+
+        _usernameBox.TextChanged += (_, _) => _ = SaveCredentialsAsync();
+        _passwordBox.TextChanged += (_, _) => _ = SaveCredentialsAsync();
+
+        var stack = new StackPanel { Orientation = Orientation.Vertical };
+        stack.Children.Add(_savingIndicator);
+        stack.Children.Add(_usernameBox);
+        stack.Children.Add(_passwordBox);
+
+        return new SettingsCard
+        {
+            CornerRadius = new CornerRadius(0, 0, 8, 8),
+            BorderThickness = new Thickness(1, 0, 1, 1),
+            Header = CoreTools.Translate("Credentials"),
+            Description = CoreTools.Translate("It is not guaranteed that the provided credentials will be stored safely"),
+            Content = stack,
+        };
+    }
+
+    public Control BuildProxyCompatTable()
+    {
+        var noStr = CoreTools.Translate("No");
+        var yesStr = CoreTools.Translate("Yes");
+        var partStr = CoreTools.Translate("Partially");
+
+        var headerRow = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto,Auto,*"), Margin = new Thickness(0, 0, 0, 8) };
+        headerRow.Children.Add(WithCol(new TextBlock { Text = CoreTools.Translate("Package manager"), FontWeight = FontWeight.Bold, TextWrapping = TextWrapping.Wrap }, 1));
+        headerRow.Children.Add(WithCol(new TextBlock { Text = CoreTools.Translate("Compatible with proxy"), FontWeight = FontWeight.Bold, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(16, 0, 0, 0) }, 2));
+        headerRow.Children.Add(WithCol(new TextBlock { Text = CoreTools.Translate("Compatible with authentication"), FontWeight = FontWeight.Bold, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(16, 0, 0, 0) }, 3));
+
+        var managerCol = new StackPanel { Orientation = Orientation.Vertical, Spacing = 6 };
+        var proxyCol = new StackPanel { Orientation = Orientation.Vertical, Spacing = 6 };
+        var authCol = new StackPanel { Orientation = Orientation.Vertical, Spacing = 6 };
+
+        foreach (var manager in PEInterface.Managers)
+        {
+            managerCol.Children.Add(new TextBlock { Text = manager.DisplayName, TextAlignment = TextAlignment.Center });
+
+            var proxyLevel = manager.Capabilities.SupportsProxy;
+            proxyCol.Children.Add(StatusBadge(
+                proxyLevel is ProxySupport.No ? noStr : (proxyLevel is ProxySupport.Partially ? partStr : yesStr),
+                proxyLevel is ProxySupport.Yes ? Colors.Green : (proxyLevel is ProxySupport.Partially ? Colors.Orange : Colors.Red)));
+
+            authCol.Children.Add(StatusBadge(
+                manager.Capabilities.SupportsProxyAuth ? yesStr : noStr,
+                manager.Capabilities.SupportsProxyAuth ? Colors.Green : Colors.Red));
+        }
+
+        var dataRow = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto,Auto,*"), ColumnSpacing = 16 };
+        dataRow.Children.Add(WithCol(managerCol, 1));
+        dataRow.Children.Add(WithCol(proxyCol, 2));
+        dataRow.Children.Add(WithCol(authCol, 3));
+
+        var tableStack = new StackPanel { Orientation = Orientation.Vertical };
+        tableStack.Children.Add(headerRow);
+        tableStack.Children.Add(dataRow);
+
+        return new SettingsCard
+        {
+            CornerRadius = new CornerRadius(8),
+            Header = CoreTools.Translate("Proxy compatibility table"),
+            Description = tableStack,
+        };
+    }
+
+    private static Border StatusBadge(string text, Color color) => new Border
+    {
+        CornerRadius = new CornerRadius(4),
+        Padding = new Thickness(4, 2),
+        BorderThickness = new Thickness(1),
+        Background = new SolidColorBrush(Color.FromArgb(60, color.R, color.G, color.B)),
+        BorderBrush = new SolidColorBrush(Color.FromArgb(120, color.R, color.G, color.B)),
+        Child = new TextBlock { Text = text, TextAlignment = TextAlignment.Center },
+    };
+
+    private static Control WithCol(Control c, int col) { Grid.SetColumn(c, col); return c; }
+
+    private async Task SaveCredentialsAsync()
+    {
+        if (_usernameBox is null || _passwordBox is null || _savingIndicator is null) return;
+        _savingIndicator.Opacity = 1;
+        string u = _usernameBox.Text ?? "";
+        string p = _passwordBox.Text ?? "";
+        await Task.Delay(500);
+        if ((_usernameBox.Text ?? "") != u) return;
+        if ((_passwordBox.Text ?? "") != p) return;
+        CoreSettings.SetProxyCredentials(u, p);
+        InternetViewModel.ApplyProxyToProcess();
+        _savingIndicator.Opacity = 0;
+    }
+
+    [RelayCommand]
+    private void RefreshProxyEnabled()
+    {
+        IsProxyEnabled = CoreSettings.Get(CoreSettings.K.EnableProxy);
+        ApplyProxyToProcess();
+    }
+
+    [RelayCommand]
+    private void RefreshProxyAuthEnabled()
+    {
+        IsProxyAuthEnabled = CoreSettings.Get(CoreSettings.K.EnableProxyAuth);
+        ApplyProxyToProcess();
+    }
+
+    [RelayCommand]
+    private static void ApplyProxy() => ApplyProxyToProcess();
+
+    [RelayCommand]
+    private void ShowRestartRequired() => RestartRequired?.Invoke(this, EventArgs.Empty);
+
     public static void ApplyProxyToProcess()
     {
         var proxyUri = CoreSettings.GetProxyUrl();
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/NotificationsViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/NotificationsViewModel.cs
index 2e56f1003..5db3b75be 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/NotificationsViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/NotificationsViewModel.cs
@@ -1,10 +1,24 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.ViewModels;
+using CoreSettings = global::UniGetUI.Core.SettingsEngine.Settings;
 
 namespace UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
 
 public partial class NotificationsViewModel : ViewModelBase
 {
-    [ObservableProperty] private bool _isSystemTrayEnabled = true;
+    [ObservableProperty] private bool _isSystemTrayEnabled;
     [ObservableProperty] private bool _isNotificationsEnabled;
+
+    public NotificationsViewModel()
+    {
+        _isSystemTrayEnabled = !CoreSettings.Get(CoreSettings.K.DisableSystemTray);
+        _isNotificationsEnabled = !CoreSettings.Get(CoreSettings.K.DisableNotifications);
+    }
+
+    [RelayCommand]
+    private void UpdateNotificationsEnabled()
+    {
+        IsNotificationsEnabled = !CoreSettings.Get(CoreSettings.K.DisableNotifications);
+    }
 }
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/OperationsViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/OperationsViewModel.cs
index 21162b923..cf0893d2c 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/OperationsViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/OperationsViewModel.cs
@@ -1,7 +1,33 @@
+using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.ViewModels;
+using UniGetUI.Avalonia.Views.Pages.SettingsPages;
+using UniGetUI.PackageOperations;
+using CoreSettings = global::UniGetUI.Core.SettingsEngine.Settings;
 
 namespace UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
 
 public partial class OperationsViewModel : ViewModelBase
 {
+    public event EventHandler? RestartRequired;
+    public event EventHandler<Type>? NavigationRequested;
+
+    /// <summary>Items for the parallel operation count ComboboxCard.</summary>
+    public IReadOnlyList<string> ParallelOpCounts { get; } =
+        [.. Enumerable.Range(1, 10).Select(i => i.ToString()), "15", "20", "30", "50", "75", "100"];
+
+    [RelayCommand]
+    private void UpdateMaxOperations()
+    {
+        if (int.TryParse(CoreSettings.GetValue(CoreSettings.K.ParallelOperationCount), out int value))
+            AbstractOperation.MAX_OPERATIONS = value;
+    }
+
+    [RelayCommand]
+    private void ShowRestartRequired() => RestartRequired?.Invoke(this, EventArgs.Empty);
+
+    [RelayCommand]
+    private void NavigateToUpdates() => NavigationRequested?.Invoke(this, typeof(Updates));
+
+    [RelayCommand]
+    private void NavigateToAdministrator() => NavigationRequested?.Invoke(this, typeof(Administrator));
 }
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/SettingsBasePageViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/SettingsBasePageViewModel.cs
index e47bc0e40..eb8cc66c9 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/SettingsBasePageViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/SettingsBasePageViewModel.cs
@@ -1,4 +1,6 @@
+using Avalonia.Controls.ApplicationLifetimes;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.ViewModels;
 using UniGetUI.Core.Tools;
 
@@ -9,6 +11,23 @@ public partial class SettingsBasePageViewModel : ViewModelBase
     [ObservableProperty] private string _title = "";
     [ObservableProperty] private bool _isRestartBannerVisible;
 
+    public event EventHandler? BackRequested;
+
     public string RestartBannerText => CoreTools.Translate("Restart UniGetUI to fully apply changes");
     public string RestartButtonText => CoreTools.Translate("Restart UniGetUI");
+
+    [RelayCommand]
+    private void Back() => BackRequested?.Invoke(this, EventArgs.Empty);
+
+    [RelayCommand]
+    private static void RestartApp()
+    {
+        var exe = Environment.ProcessPath;
+        if (exe is not null)
+            System.Diagnostics.Process.Start(
+                new System.Diagnostics.ProcessStartInfo(exe) { UseShellExecute = true });
+        (global::Avalonia.Application.Current?.ApplicationLifetime
+            as IClassicDesktopStyleApplicationLifetime)
+            ?.Shutdown();
+    }
 }
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/SettingsHomepageViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/SettingsHomepageViewModel.cs
index b7ac97527..06d34dfbc 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/SettingsHomepageViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/SettingsHomepageViewModel.cs
@@ -1,7 +1,21 @@
+using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.ViewModels;
+using UniGetUI.Avalonia.Views.Pages.SettingsPages;
 
 namespace UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
 
 public partial class SettingsHomepageViewModel : ViewModelBase
 {
+    public event EventHandler<Type>? NavigationRequested;
+
+    [RelayCommand] private void NavigateToGeneral() => NavigationRequested?.Invoke(this, typeof(General));
+    [RelayCommand] private void NavigateToInterface() => NavigationRequested?.Invoke(this, typeof(Interface_P));
+    [RelayCommand] private void NavigateToNotifications() => NavigationRequested?.Invoke(this, typeof(Notifications));
+    [RelayCommand] private void NavigateToUpdates() => NavigationRequested?.Invoke(this, typeof(Updates));
+    [RelayCommand] private void NavigateToOperations() => NavigationRequested?.Invoke(this, typeof(Operations));
+    [RelayCommand] private void NavigateToInternet() => NavigationRequested?.Invoke(this, typeof(Internet));
+    [RelayCommand] private void NavigateToBackup() => NavigationRequested?.Invoke(this, typeof(Backup));
+    [RelayCommand] private void NavigateToAdministrator() => NavigationRequested?.Invoke(this, typeof(Administrator));
+    [RelayCommand] private void NavigateToExperimental() => NavigationRequested?.Invoke(this, typeof(Experimental));
+    [RelayCommand] private void NavigateToManagers() => NavigationRequested?.Invoke(this, typeof(ManagersHomepage));
 }
diff --git a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/UpdatesViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/UpdatesViewModel.cs
index f9f90ab56..1111d8c03 100644
--- a/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/UpdatesViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/Pages/SettingsPages/UpdatesViewModel.cs
@@ -1,9 +1,52 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.ViewModels;
+using UniGetUI.Avalonia.Views.Pages.SettingsPages;
+using UniGetUI.Core.Tools;
+using CoreSettings = global::UniGetUI.Core.SettingsEngine.Settings;
 
 namespace UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
 
 public partial class UpdatesViewModel : ViewModelBase
 {
+    public event EventHandler? RestartRequired;
+    public event EventHandler<Type>? NavigationRequested;
+
     [ObservableProperty] private bool _isAutoCheckEnabled;
+
+    /// <summary>Items for the update interval ComboboxCard, in display/value pairs.</summary>
+    public IReadOnlyList<(string Name, string Value)> IntervalItems { get; } =
+    [
+        (CoreTools.Translate("{0} minutes", 10), "600"),
+        (CoreTools.Translate("{0} minutes", 30), "1800"),
+        (CoreTools.Translate("1 hour"),           "3600"),
+        (CoreTools.Translate("{0} hours", 2),    "7200"),
+        (CoreTools.Translate("{0} hours", 4),    "14400"),
+        (CoreTools.Translate("{0} hours", 8),    "28800"),
+        (CoreTools.Translate("{0} hours", 12),   "43200"),
+        (CoreTools.Translate("1 day"),            "86400"),
+        (CoreTools.Translate("{0} days", 2),    "172800"),
+        (CoreTools.Translate("{0} days", 3),    "259200"),
+        (CoreTools.Translate("1 week"),          "604800"),
+    ];
+
+    public UpdatesViewModel()
+    {
+        _isAutoCheckEnabled = !CoreSettings.Get(CoreSettings.K.DisableAutoCheckforUpdates);
+    }
+
+    [RelayCommand]
+    private void UpdateAutoCheckEnabled()
+    {
+        IsAutoCheckEnabled = !CoreSettings.Get(CoreSettings.K.DisableAutoCheckforUpdates);
+    }
+
+    [RelayCommand]
+    private void ShowRestartRequired() => RestartRequired?.Invoke(this, EventArgs.Empty);
+
+    [RelayCommand]
+    private void NavigateToOperations() => NavigationRequested?.Invoke(this, typeof(Operations));
+
+    [RelayCommand]
+    private void NavigateToAdministrator() => NavigationRequested?.Invoke(this, typeof(Administrator));
 }
diff --git a/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs
index 11761d567..468e10427 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs
@@ -1,6 +1,9 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.Views;
+using UniGetUI.Core.Data;
 using UniGetUI.Core.SettingsEngine;
+using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.ViewModels;
 
@@ -59,9 +62,9 @@ partial void OnIsPaneOpenChanged(bool value)
     public double PaneWidth => IsPaneOpen ? 250 : 72;
 
     public bool UpdatesBadgeExpandedVisible => UpdatesBadgeVisible && IsPaneOpen;
-    public bool UpdatesBadgeCompactVisible  => UpdatesBadgeVisible && !IsPaneOpen;
+    public bool UpdatesBadgeCompactVisible => UpdatesBadgeVisible && !IsPaneOpen;
     public bool BundlesBadgeExpandedVisible => BundlesBadgeVisible && IsPaneOpen;
-    public bool BundlesBadgeCompactVisible  => BundlesBadgeVisible && !IsPaneOpen;
+    public bool BundlesBadgeCompactVisible => BundlesBadgeVisible && !IsPaneOpen;
 
     // ─── Selected page ────────────────────────────────────────────────────────
     [ObservableProperty]
@@ -70,8 +73,14 @@ partial void OnIsPaneOpenChanged(bool value)
     // ─── Navigation ──────────────────────────────────────────────────────────
     public event EventHandler<PageType>? NavigationRequested;
 
-    public void RequestNavigation(PageType page) =>
-        NavigationRequested?.Invoke(this, page);
+    public string VersionLabel { get; } = CoreTools.Translate("WingetUI Version {0}", CoreData.VersionName);
+
+    [RelayCommand]
+    public void RequestNavigation(string? pageName)
+    {
+        if (Enum.TryParse<PageType>(pageName, out var page))
+            NavigationRequested?.Invoke(this, page);
+    }
 
     public void SelectNavButtonForPage(PageType page) =>
         SelectedPageType = page;
diff --git a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
index 95cb6094c..69c8ea8dc 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/PackagesPageViewModel.cs
@@ -2,12 +2,17 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Globalization;
+using Avalonia;
 using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using UniGetUI.Avalonia.Infrastructure;
 using UniGetUI.Avalonia.ViewModels;
+using UniGetUI.Avalonia.Views.Controls;
 using UniGetUI.Core.SettingsEngine;
 using UniGetUI.Core.Tools;
 using UniGetUI.PackageEngine.Enums;
@@ -155,6 +160,17 @@ public partial class PackagesPageViewModel : ViewModelBase
     public event Action<IPackage>? ShowingContextMenu;
     public event Action? FocusListRequested;
 
+    // ─── Events: view-side dialog/navigation requests ─────────────────────────
+    /// <summary>Fired when the ViewModel wants to navigate to the Help page.</summary>
+    public event Action? HelpRequested;
+    /// <summary>Fired when the ViewModel wants to show the Manage-Ignored-Updates dialog.</summary>
+    public event Action? ManageIgnoredRequested;
+    /// <summary>
+    /// Fired when the ViewModel has built a share URL.
+    /// Arguments: (packageName, url). Both null means "nothing to share".
+    /// </summary>
+    public event Action<string?, string?>? SharePackageRequested;
+
     // ─── Constructor ─────────────────────────────────────────────────────────
     public PackagesPageViewModel(PackagesPageData data)
     {
@@ -213,6 +229,108 @@ public PackagesPageViewModel(PackagesPageData data)
         // Toolbar is generated by the View after construction (see AbstractPackagesPage ctor)
     }
 
+    public Button AddToolbarButton(string svgName, string label, Action onClick, bool showLabel = true)
+    {
+        var icon = new SvgIcon
+        {
+            Path = $"avares://UniGetUI.Avalonia/Assets/Symbols/{svgName}.svg",
+            Width = 16,
+            Height = 16,
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+
+        var content = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4 };
+        content.Children.Add(icon);
+        if (showLabel)
+        {
+            content.Children.Add(new TextBlock
+            {
+                Text = label,
+                FontSize = 12,
+                VerticalAlignment = VerticalAlignment.Center,
+            });
+        }
+
+        var btn = new Button
+        {
+            Height = 36,
+            Padding = new Thickness(8, 4),
+            CornerRadius = new CornerRadius(4),
+            Content = content,
+        };
+        ToolTip.SetTip(btn, label);
+        btn.Click += (_, _) => onClick();
+        ToolBarItems.Add(btn);
+        return btn;
+    }
+
+    /// <summary>Adds a thin vertical separator to the toolbar.</summary>
+    public void AddToolbarSeparator()
+    {
+        ToolBarItems.Add(new Separator
+        {
+            Width = 1,
+            Height = 30,
+            Margin = new Thickness(4, 4),
+            Background = Application.Current?.FindResource("AppBorderBrush") as IBrush
+                         ?? new SolidColorBrush(Color.FromArgb(60, 255, 255, 255)),
+        });
+    }
+
+    public async Task ShowInfoDialog(Window owner, string title, string message)
+    {
+        object? bgResource = null;
+        Application.Current?.Resources.TryGetResource("AppWindowBackground", Application.Current.ActualThemeVariant, out bgResource);
+        var dialog = new Window
+        {
+            Width = 460,
+            Height = 180,
+            CanResize = false,
+            ShowInTaskbar = false,
+            WindowStartupLocation = WindowStartupLocation.CenterOwner,
+            Title = title,
+            Background = bgResource as IBrush,
+        };
+
+        var okBtn = new Button
+        {
+            Content = CoreTools.Translate("OK"),
+            MinWidth = 80,
+            CornerRadius = new CornerRadius(4),
+            HorizontalAlignment = HorizontalAlignment.Right,
+        };
+        okBtn.Classes.Add("accent");
+        okBtn.Click += (_, _) => dialog.Close();
+
+        var root = new Grid
+        {
+            Margin = new Thickness(20),
+            RowDefinitions = new RowDefinitions("Auto,*,Auto"),
+            RowSpacing = 12,
+        };
+        var titleBlock = new TextBlock
+        {
+            Text = title,
+            FontSize = 16,
+            FontWeight = FontWeight.SemiBold,
+        };
+        var msgBlock = new TextBlock
+        {
+            Text = message,
+            TextWrapping = TextWrapping.Wrap,
+            Opacity = 0.85,
+        };
+        Grid.SetRow(titleBlock, 0);
+        Grid.SetRow(msgBlock, 1);
+        Grid.SetRow(okBtn, 2);
+        root.Children.Add(titleBlock);
+        root.Children.Add(msgBlock);
+        root.Children.Add(okBtn);
+        dialog.Content = root;
+
+        await dialog.ShowDialog(owner);
+    }
+
     // ─── Loader events ────────────────────────────────────────────────────────
     private void Loader_PackagesChanged(object? sender, PackagesChangedEvent e)
     {
@@ -419,10 +537,10 @@ partial void OnSearchModeChanged(SearchMode value)
     // One bool property per mode — used for two-way RadioButton bindings.
     // Mutual exclusion is enforced by the ViewModel: setting any one to true
     // changes SearchMode, which notifies all five properties.
-    public bool SearchMode_Both    { get => SearchMode == SearchMode.Both;    set { if (value) SearchMode = SearchMode.Both; } }
-    public bool SearchMode_Name    { get => SearchMode == SearchMode.Name;    set { if (value) SearchMode = SearchMode.Name; } }
-    public bool SearchMode_Id      { get => SearchMode == SearchMode.Id;      set { if (value) SearchMode = SearchMode.Id; } }
-    public bool SearchMode_Exact   { get => SearchMode == SearchMode.Exact;   set { if (value) SearchMode = SearchMode.Exact; } }
+    public bool SearchMode_Both { get => SearchMode == SearchMode.Both; set { if (value) SearchMode = SearchMode.Both; } }
+    public bool SearchMode_Name { get => SearchMode == SearchMode.Name; set { if (value) SearchMode = SearchMode.Name; } }
+    public bool SearchMode_Id { get => SearchMode == SearchMode.Id; set { if (value) SearchMode = SearchMode.Id; } }
+    public bool SearchMode_Exact { get => SearchMode == SearchMode.Exact; set { if (value) SearchMode = SearchMode.Exact; } }
     public bool SearchMode_Similar { get => SearchMode == SearchMode.Similar; set { if (value) SearchMode = SearchMode.Similar; } }
 
     partial void OnAllPackagesCheckedChanged(bool? value)
@@ -591,6 +709,33 @@ public void UpdateSubtitle()
     [RelayCommand] private async Task Reload() => await LoadPackages(ReloadReason.Manual);
     [RelayCommand] private void SelectAllSources_Cmd() { SelectAllSources(); FilterPackages(); }
     [RelayCommand] private void ClearSourceSelection_Cmd() { ClearSourceSelection(); FilterPackages(); }
+    [RelayCommand] private void RequestHelp() => HelpRequested?.Invoke();
+    [RelayCommand] private void RequestManageIgnored() => ManageIgnoredRequested?.Invoke();
+
+    [RelayCommand]
+    public void RequestShare(IPackage? package)
+    {
+        if (package is null || package.Source.IsVirtualManager)
+        {
+            SharePackageRequested?.Invoke(null, null);
+            return;
+        }
+        var url = "https://marticliment.com/unigetui/share?"
+            + "name=" + System.Web.HttpUtility.UrlEncode(package.Name)
+            + "&id=" + System.Web.HttpUtility.UrlEncode(package.Id)
+            + "&sourceName=" + System.Web.HttpUtility.UrlEncode(package.Source.Name)
+            + "&managerName=" + System.Web.HttpUtility.UrlEncode(package.Manager.Name);
+        SharePackageRequested?.Invoke(package.Name, url);
+    }
+
+    // ─── Sort commands ────────────────────────────────────────────────────────
+    [RelayCommand] private void SortByName() => SortFieldIndex = 0;
+    [RelayCommand] private void SortById() => SortFieldIndex = 1;
+    [RelayCommand] private void SortByVersion() => SortFieldIndex = 2;
+    [RelayCommand] private void SortByNewVersion() => SortFieldIndex = 3;
+    [RelayCommand] private void SortBySource() => SortFieldIndex = 4;
+    [RelayCommand] private void SetSortAscending() => SortAscending = true;
+    [RelayCommand] private void SetSortDescending() => SortAscending = false;
 
     [RelayCommand]
     private void SubmitMegaQuery(string query)
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs
index 1f8b2be0a..ea9b24a3d 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/ButtonCard.cs
@@ -1,4 +1,3 @@
-using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
@@ -8,12 +7,6 @@ namespace UniGetUI.Avalonia.Views.Controls.Settings;
 
 public sealed partial class ButtonCard : SettingsCard
 {
-    public static readonly StyledProperty<ICommand?> CommandProperty =
-        AvaloniaProperty.Register<ButtonCard, ICommand?>(nameof(Command));
-
-    public static readonly StyledProperty<object?> CommandParameterProperty =
-        AvaloniaProperty.Register<ButtonCard, object?>(nameof(CommandParameter));
-
     private readonly Button _button = new();
 
     public string ButtonText
@@ -26,18 +19,6 @@ public string Text
         set => Header = value;
     }
 
-    public ICommand? Command
-    {
-        get => GetValue(CommandProperty);
-        set => SetValue(CommandProperty, value);
-    }
-
-    public object? CommandParameter
-    {
-        get => GetValue(CommandParameterProperty);
-        set => SetValue(CommandParameterProperty, value);
-    }
-
     public new event EventHandler<EventArgs>? Click;
 
     public ButtonCard()
@@ -51,8 +32,8 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
     {
         base.OnPropertyChanged(change);
         if (change.Property == CommandProperty)
-            _button.Command = (ICommand?)change.NewValue;
+            _button.Command = Command;
         else if (change.Property == CommandParameterProperty)
-            _button.CommandParameter = change.NewValue;
+            _button.CommandParameter = CommandParameter;
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
index a899065be..73af7686d 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/CheckboxCard.cs
@@ -1,3 +1,4 @@
+using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
@@ -10,6 +11,15 @@ namespace UniGetUI.Avalonia.Views.Controls.Settings;
 
 public partial class CheckboxCard : SettingsCard
 {
+    public static readonly StyledProperty<ICommand?> StateChangedCommandProperty =
+        AvaloniaProperty.Register<CheckboxCard, ICommand?>(nameof(StateChangedCommand));
+
+    public ICommand? StateChangedCommand
+    {
+        get => GetValue(StateChangedCommandProperty);
+        set => SetValue(StateChangedCommandProperty, value);
+    }
+
     public ToggleSwitch _checkbox;
     public TextBlock _textblock;
     public TextBlock _warningBlock;
@@ -94,6 +104,9 @@ protected virtual void _checkbox_Toggled(object? sender, RoutedEventArgs e)
         CoreSettings.Set(setting_name, (_checkbox.IsChecked ?? false) ^ IS_INVERTED ^ ForceInversion);
         StateChanged?.Invoke(this, EventArgs.Empty);
         _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
+        var cmd = StateChangedCommand;
+        if (cmd?.CanExecute(null) == true)
+            cmd.Execute(null);
     }
 }
 
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/ComboboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/ComboboxCard.cs
index 6debbd2f6..25f545d04 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/ComboboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/ComboboxCard.cs
@@ -1,4 +1,6 @@
 using System.Collections.ObjectModel;
+using System.Windows.Input;
+using Avalonia;
 using Avalonia.Controls;
 using UniGetUI.Core.Logging;
 using UniGetUI.Core.Tools;
@@ -8,6 +10,15 @@ namespace UniGetUI.Avalonia.Views.Controls.Settings;
 
 public sealed partial class ComboboxCard : SettingsCard
 {
+    public static readonly StyledProperty<ICommand?> ValueChangedCommandProperty =
+        AvaloniaProperty.Register<ComboboxCard, ICommand?>(nameof(ValueChangedCommand));
+
+    public ICommand? ValueChangedCommand
+    {
+        get => GetValue(ValueChangedCommandProperty);
+        set => SetValue(ValueChangedCommandProperty, value);
+    }
+
     private readonly ComboBox _combobox = new();
     private readonly ObservableCollection<string> _elements = [];
     private readonly Dictionary<string, string> _values_ref = [];
@@ -63,6 +74,9 @@ public void ShowAddedItems()
                     _values_ref[_combobox.SelectedItem?.ToString() ?? ""]
                 );
                 ValueChanged?.Invoke(this, EventArgs.Empty);
+                var cmd = ValueChangedCommand;
+                if (cmd?.CanExecute(null) == true)
+                    cmd.Execute(null);
             }
             catch (Exception ex)
             {
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
index 24680e41a..12971e1f5 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SecureCheckboxCard.cs
@@ -1,3 +1,4 @@
+using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Layout;
@@ -10,6 +11,15 @@ namespace UniGetUI.Avalonia.Views.Controls.Settings;
 
 public partial class SecureCheckboxCard : SettingsCard
 {
+    public static readonly StyledProperty<ICommand?> StateChangedCommandProperty =
+        AvaloniaProperty.Register<SecureCheckboxCard, ICommand?>(nameof(StateChangedCommand));
+
+    public ICommand? StateChangedCommand
+    {
+        get => GetValue(StateChangedCommandProperty);
+        set => SetValue(StateChangedCommandProperty, value);
+    }
+
     public ToggleSwitch _checkbox;
     public TextBlock _textblock;
     public TextBlock _warningBlock;
@@ -44,11 +54,24 @@ public string WarningText
     {
         set
         {
-            _warningBlock.Text = value;
+            _warningBlock.Text = FormatTwoLine(value);
             _warningBlock.IsVisible = value.Any();
         }
     }
 
+    // Splits translated warning text at the first sentence boundary so it renders
+    // on two readable lines. Handles both Latin (". ") and CJK ("。") separators.
+    private static string FormatTwoLine(string text)
+    {
+        var idx = text.IndexOf(". ", StringComparison.Ordinal);
+        if (idx >= 0)
+            return text[..(idx + 1)] + "\n" + text[(idx + 2)..];
+        idx = text.IndexOf('。');
+        if (idx >= 0)
+            return text[..(idx + 1)] + "\n" + text[(idx + 1)..];
+        return text;
+    }
+
     public SecureCheckboxCard()
     {
         _checkbox = new ToggleSwitch
@@ -121,6 +144,9 @@ await SecureSettings.TrySet(
                 (_checkbox.IsChecked ?? false) ^ IS_INVERTED ^ ForceInversion
             );
             StateChanged?.Invoke(this, EventArgs.Empty);
+            var cmd = StateChangedCommand;
+            if (cmd?.CanExecute(null) == true)
+                cmd.Execute(null);
             _textblock.Opacity = (_checkbox.IsChecked ?? false) ? 1 : 0.7;
             _checkbox.IsChecked = SecureSettings.Get(setting_name) ^ IS_INVERTED ^ ForceInversion;
             _loading.IsVisible = false;
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs
index 271e27038..24ebcffbb 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs
@@ -1,3 +1,4 @@
+using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -21,9 +22,20 @@ public class SettingsCard : UserControl
     private readonly ContentControl _contentPresenter;
     private readonly StackPanel _descriptionRow;
 
+    // ── Styled properties ──────────────────────────────────────────────────
+    public static readonly StyledProperty<object?> HeaderProperty =
+        AvaloniaProperty.Register<SettingsCard, object?>(nameof(Header));
+
+    public static readonly StyledProperty<object?> DescriptionProperty =
+        AvaloniaProperty.Register<SettingsCard, object?>(nameof(Description));
+
+    public static readonly StyledProperty<ICommand?> CommandProperty =
+        AvaloniaProperty.Register<SettingsCard, ICommand?>(nameof(Command));
+
+    public static readonly StyledProperty<object?> CommandParameterProperty =
+        AvaloniaProperty.Register<SettingsCard, object?>(nameof(CommandParameter));
+
     // ── Backing stores ─────────────────────────────────────────────────────
-    private object? _header;
-    private object? _description;
     private Control? _headerIcon;
     private object? _rightContent;
     private bool _isClickEnabled;
@@ -47,43 +59,26 @@ public class SettingsCard : UserControl
 
     public object? Header
     {
-        get => _header;
-        set
-        {
-            _header = value;
-            _headerPresenter.Content = value is string s
-                ? new TextBlock
-                {
-                    Text = s,
-                    TextWrapping = TextWrapping.Wrap,
-                    VerticalAlignment = VerticalAlignment.Center,
-                }
-                : value;
-        }
+        get => GetValue(HeaderProperty);
+        set => SetValue(HeaderProperty, value);
+    }
+
+    public ICommand? Command
+    {
+        get => GetValue(CommandProperty);
+        set => SetValue(CommandProperty, value);
+    }
+
+    public object? CommandParameter
+    {
+        get => GetValue(CommandParameterProperty);
+        set => SetValue(CommandParameterProperty, value);
     }
 
     public object? Description
     {
-        get => _description;
-        set
-        {
-            _description = value;
-            if (value is null)
-            {
-                _descriptionRow.IsVisible = false;
-                return;
-            }
-            _descriptionPresenter.Content = value is string s
-                ? new TextBlock
-                {
-                    Text = s,
-                    TextWrapping = TextWrapping.Wrap,
-                    FontSize = 12,
-                    Opacity = 0.7,
-                }
-                : value;
-            _descriptionRow.IsVisible = true;
-        }
+        get => GetValue(DescriptionProperty);
+        set => SetValue(DescriptionProperty, value);
     }
 
     public Control? HeaderIcon
@@ -200,9 +195,51 @@ public SettingsCard()
         PointerPressed += OnPointerPressed;
     }
 
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+        if (change.Property == HeaderProperty)
+        {
+            var value = change.NewValue;
+            _headerPresenter.Content = value is string s
+                ? new TextBlock
+                {
+                    Text = s,
+                    TextWrapping = TextWrapping.Wrap,
+                    VerticalAlignment = VerticalAlignment.Center,
+                }
+                : value;
+        }
+        else if (change.Property == DescriptionProperty)
+        {
+            var value = change.NewValue;
+            if (value is null)
+            {
+                _descriptionRow.IsVisible = false;
+                return;
+            }
+            _descriptionPresenter.Content = value is string s
+                ? new TextBlock
+                {
+                    Text = s,
+                    TextWrapping = TextWrapping.Wrap,
+                    FontSize = 12,
+                    Opacity = 0.7,
+                }
+                : value;
+            _descriptionRow.IsVisible = true;
+        }
+    }
+
     private void OnPointerPressed(object? sender, PointerPressedEventArgs e)
     {
         if (_isClickEnabled)
+        {
             Click?.Invoke(this, new RoutedEventArgs());
+            var cmd = Command;
+            var param = CommandParameter;
+            if (cmd?.CanExecute(param) == true)
+                cmd.Execute(param);
+        }
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs
index 79c5e670d..c7fc187fd 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/TextboxCard.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Layout;
@@ -9,6 +10,15 @@ namespace UniGetUI.Avalonia.Views.Controls.Settings;
 
 public sealed partial class TextboxCard : SettingsCard
 {
+    public static readonly StyledProperty<ICommand?> ValueChangedCommandProperty =
+        AvaloniaProperty.Register<TextboxCard, ICommand?>(nameof(ValueChangedCommand));
+
+    public ICommand? ValueChangedCommand
+    {
+        get => GetValue(ValueChangedCommandProperty);
+        set => SetValue(ValueChangedCommandProperty, value);
+    }
+
     private readonly TextBox _textbox;
     private readonly Button _helpbutton;   // WinUI HyperlinkButton → plain Button + Process.Start
 
@@ -82,5 +92,8 @@ public void SaveValue()
             CoreSettings.Set(setting_name, false);
 
         ValueChanged?.Invoke(this, EventArgs.Empty);
+        var cmd = ValueChangedCommand;
+        if (cmd?.CanExecute(null) == true)
+            cmd.Execute(null);
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml
new file mode 100644
index 000000000..db8fdc66d
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml
@@ -0,0 +1,29 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:UniGetUI.Avalonia.ViewModels.DialogPages"
+        x:Class="UniGetUI.Avalonia.Views.DialogPages.OperationOutputWindow"
+        x:DataType="vm:OperationOutputViewModel"
+        Width="700" MinWidth="400"
+        Height="500" MinHeight="300"
+        CanResize="True"
+        ShowInTaskbar="False"
+        Background="{DynamicResource AppDialogBackground}"
+        WindowStartupLocation="CenterOwner"
+        Title="{Binding Title}">
+
+    <ScrollViewer x:Name="OutputScroll"
+                  Margin="8"
+                  HorizontalScrollBarVisibility="Auto"
+                  VerticalScrollBarVisibility="Auto">
+        <TextBox Text="{Binding OutputText}"
+                 IsReadOnly="True"
+                 AcceptsReturn="True"
+                 TextWrapping="Wrap"
+                 FontFamily="Cascadia Mono,Consolas,Menlo,monospace"
+                 FontSize="12"
+                 Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"
+                 Background="Transparent"
+                 BorderThickness="0"/>
+    </ScrollViewer>
+
+</Window>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml.cs
new file mode 100644
index 000000000..3c1efabbe
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.axaml.cs
@@ -0,0 +1,20 @@
+using Avalonia.Controls;
+using UniGetUI.Avalonia.ViewModels.DialogPages;
+using UniGetUI.PackageOperations;
+
+namespace UniGetUI.Avalonia.Views.DialogPages;
+
+public partial class OperationOutputWindow : Window
+{
+    public OperationOutputWindow(AbstractOperation operation)
+    {
+        DataContext = new OperationOutputViewModel(operation);
+        InitializeComponent();
+    }
+
+    protected override void OnOpened(EventArgs e)
+    {
+        base.OnOpened(e);
+        OutputScroll.ScrollToEnd();
+    }
+}
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.cs b/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.cs
deleted file mode 100644
index 76566db64..000000000
--- a/src/UniGetUI.Avalonia/Views/DialogPages/OperationOutputWindow.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Layout;
-using Avalonia.Media;
-using UniGetUI.PackageOperations;
-
-namespace UniGetUI.Avalonia.Views;
-
-/// <summary>
-/// Simple window that shows the full output log of a completed or failed operation.
-/// Created in code so no AXAML file is required.
-/// </summary>
-public sealed class OperationOutputWindow : Window
-{
-    public OperationOutputWindow(AbstractOperation operation)
-    {
-        Title = operation.Metadata.Title;
-        Width = 700;
-        Height = 500;
-        MinWidth = 400;
-        MinHeight = 300;
-        Background = (Application.Current?.FindResource("AppDialogBackground") as IBrush) ?? new SolidColorBrush(Color.Parse("#1e2025"));
-
-        var lines = string.Join("\n", operation.GetOutput().Select(x => x.Item1));
-
-        var textBox = new TextBox
-        {
-            Text = lines,
-            IsReadOnly = true,
-            AcceptsReturn = true,
-            TextWrapping = TextWrapping.Wrap,
-            FontFamily = new FontFamily("Cascadia Mono,Consolas,Menlo,monospace"),
-            FontSize = 12,
-            Foreground = (Application.Current?.FindResource("SystemControlForegroundBaseHighBrush") as IBrush) ?? new SolidColorBrush(Color.Parse("#d4d4d4")),
-            Background = Brushes.Transparent,
-            BorderThickness = new Thickness(0),
-            VerticalAlignment = VerticalAlignment.Stretch,
-        };
-
-        var scroll = new ScrollViewer
-        {
-            Content = textBox,
-            HorizontalScrollBarVisibility = global::Avalonia.Controls.Primitives.ScrollBarVisibility.Auto,
-            VerticalScrollBarVisibility = global::Avalonia.Controls.Primitives.ScrollBarVisibility.Auto,
-            Margin = new Thickness(8),
-        };
-
-        Content = scroll;
-
-        // Scroll to bottom once shown
-        Opened += (_, _) => scroll.ScrollToEnd();
-    }
-}
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
index 267032470..be497430f 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml
@@ -361,8 +361,8 @@
         <Border Grid.Row="2"
                 BorderThickness="0,1,0,0"
                 Padding="16,10">
-            <Button x:Name="CloseButton"
-                    Content="{Binding LabelClose}"
+            <Button Content="{Binding LabelClose}"
+                    Command="{Binding RequestCloseCommand}"
                     HorizontalAlignment="Right"
                     Padding="16,6"/>
         </Border>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml.cs
index b2cbed086..27b07b824 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/PackageDetailsWindow.axaml.cs
@@ -26,7 +26,6 @@ public PackageDetailsWindow(IPackage package, OperationType operation)
         InitializeComponent();
 
         _vm.CloseRequested += (_, _) => Close();
-        CloseButton.Click += (_, _) => Close();
 
         MainActionButton.Click += (_, _) => OnMainAction();
         ActionVariantsButton.Flyout = BuildActionFlyout();
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml b/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml
index 3f1d3cf03..3adab7913 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml
@@ -1,6 +1,8 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
         x:Class="UniGetUI.Avalonia.Views.DialogPages.TelemetryDialog"
+        Title="{t:Translate Share anonymous usage data}"
         Width="520" MinWidth="420"
         SizeToContent="Height"
         MinHeight="250"
@@ -14,20 +16,23 @@
           RowSpacing="12">
 
         <!-- Title -->
-        <TextBlock x:Name="TitleBlock"
-                   Grid.Row="0"
+        <TextBlock Grid.Row="0"
+                   Text="{t:Translate Share anonymous usage data}"
                    FontSize="18"
                    FontWeight="SemiBold"/>
 
         <!-- Body -->
         <StackPanel Grid.Row="1" Spacing="8">
-            <TextBlock x:Name="Body1" TextWrapping="Wrap" Opacity="0.85"/>
+            <TextBlock Text="{t:Translate UniGetUI collects anonymous usage data with the sole purpose of understanding and improving the user experience.}"
+                       TextWrapping="Wrap" Opacity="0.85"/>
             <TextBlock x:Name="Body2" TextWrapping="Wrap" Opacity="0.85"/>
             <TextBlock x:Name="DetailsLink"
+                       Text="{t:Translate More details about the shared data and how it will be processed}"
                        TextDecorations="Underline"
                        Cursor="Hand"
                        Opacity="0.9"/>
-            <TextBlock x:Name="Body3" TextWrapping="Wrap" Opacity="0.85"/>
+            <TextBlock Text="{t:Translate Text='Do you accept that UniGetUI collects and sends anonymous usage statistics, with the sole purpose of understanding and improving the user experience?'}"
+                       TextWrapping="Wrap" Opacity="0.85"/>
         </StackPanel>
 
         <!-- Buttons -->
@@ -36,8 +41,8 @@
                     HorizontalAlignment="Right"
                     Spacing="8"
                     Margin="0,4,0,0">
-            <Button x:Name="DeclineButton" MinWidth="100"/>
-            <Button x:Name="AcceptButton"  MinWidth="100" Classes="accent"/>
+            <Button x:Name="DeclineButton" Content="{t:Translate Decline}" MinWidth="100"/>
+            <Button x:Name="AcceptButton"  Content="{t:Translate Accept}" MinWidth="100" Classes="accent"/>
         </StackPanel>
 
     </Grid>
diff --git a/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml.cs b/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml.cs
index ea33d0ea5..2b162f564 100644
--- a/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/DialogPages/TelemetryDialog.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Input;
 using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.Views.DialogPages;
@@ -12,16 +11,7 @@ public TelemetryDialog()
     {
         InitializeComponent();
 
-        Title = CoreTools.Translate("Share anonymous usage data");
-
-        TitleBlock.Text = CoreTools.Translate("Share anonymous usage data");
-        Body1.Text = CoreTools.Translate("UniGetUI collects anonymous usage data with the sole purpose of understanding and improving the user experience.");
         Body2.Text = CoreTools.Translate("No personal information is collected nor sent, and the collected data is anonimized, so it can't be back-tracked to you.");
-        DetailsLink.Text = CoreTools.Translate("More details about the shared data and how it will be processed");
-        Body3.Text = CoreTools.Translate("Do you accept that UniGetUI collects and sends anonymous usage statistics, with the sole purpose of understanding and improving the user experience?");
-
-        DeclineButton.Content = CoreTools.Translate("Decline");
-        AcceptButton.Content = CoreTools.Translate("Accept");
 
         DetailsLink.Bind(TextBlock.ForegroundProperty,
             DetailsLink.GetResourceObservable("SystemControlHighlightAccentBrush"));
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
index 0759552c5..c5c212504 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml
@@ -193,7 +193,7 @@
                         Padding="3"
                         CornerRadius="0,4,4,0"
                         IsEnabled="{Binding GlobalSearchEnabled}"
-                        Click="SearchButton_Click">
+                        Command="{Binding SubmitGlobalSearchCommand}">
                     <controls:SvgIcon Path="avares://UniGetUI.Avalonia/Assets/Symbols/search.svg"
                                       Width="12"
                                       Height="12"/>
diff --git a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
index 025b5fb88..424b75fff 100644
--- a/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/MainWindow.axaml.cs
@@ -1,6 +1,5 @@
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.Interactivity;
 using UniGetUI.Avalonia.ViewModels;
 using UniGetUI.Avalonia.Views.Pages;
 
@@ -88,22 +87,6 @@ private void SearchBox_KeyDown(object? sender, KeyEventArgs e)
             ViewModel.SubmitGlobalSearch();
     }
 
-    private void SearchButton_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel.SubmitGlobalSearch();
-
-    // ─── Banner close handlers ────────────────────────────────────────────────
-    private void UpdatesBannerCloseButton_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel.UpdatesBannerVisible = false;
-
-    private void ErrorBannerCloseButton_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel.ErrorBannerVisible = false;
-
-    private void WinGetWarningBannerCloseButton_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel.WinGetWarningBannerVisible = false;
-
-    private void TelemetryWarnerCloseButton_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel.TelemetryWarnerVisible = false;
-
     // ─── Public navigation API ────────────────────────────────────────────────
     public void Navigate(PageType type) => ViewModel.NavigateTo(type);
 
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml
index 6174ab2c9..f086046d6 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
@@ -31,16 +32,16 @@
                     </Border>
                     <!-- Text -->
                     <StackPanel Grid.Column="1" Orientation="Vertical">
-                        <TextBlock x:Name="WarningTitleText"
+                        <TextBlock Text="{Binding WarningTitle}"
                                    FontWeight="SemiBold"
                                    FontSize="14"
                                    TextWrapping="Wrap"
                                    Margin="0,0,0,4"/>
-                        <TextBlock x:Name="WarningBodyLine1"
+                        <TextBlock Text="{Binding WarningBody1}"
                                    TextWrapping="Wrap"
                                    Foreground="{DynamicResource WarningBannerSubtext}"
                                    Margin="0,0,0,6"/>
-                        <TextBlock x:Name="WarningBodyLine2"
+                        <TextBlock Text="{Binding WarningBody2}"
                                    TextWrapping="Wrap"
                                    Foreground="{DynamicResource WarningBannerSubtext}"/>
                     </StackPanel>
@@ -51,28 +52,40 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:CheckboxCard x:Name="DoCacheAdminRightsForBatches"
+            <settings:CheckboxCard SettingName="DoCacheAdminRightsForBatches"
+                                   Text="{t:Translate Ask for administrator privileges once for each batch of operations}"
+                                   StateChangedCommand="{Binding RestartCacheCommand}"
                                    BorderThickness="1,1,1,0"
                                    CornerRadius="8,8,0,0"
                                    IsEnabled="{Binding IsElevationEnabled}"/>
 
-            <settings:CheckboxCard x:Name="DoCacheAdminRights"
+            <settings:CheckboxCard SettingName="DoCacheAdminRights"
+                                   Text="{t:Translate Ask only once for administrator privileges}"
+                                   StateChangedCommand="{Binding RestartCacheCommand}"
                                    CornerRadius="0,0,8,8"
                                    IsEnabled="{Binding IsElevationEnabled}"/>
 
             <UserControl Height="16"/>
 
-            <settings:CheckboxCard x:Name="ProhibitElevator"
+            <settings:CheckboxCard SettingName="ProhibitElevation"
+                                   Text="{t:Translate Prohibit any kind of Elevation via UniGetUI Elevator or GSudo}"
+                                   StateChangedCommand="{Binding RefreshElevationStateCommand}"
                                    CornerRadius="8"/>
 
             <settings:TranslatedTextBlock Text="Restrictions on package operations"
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:SecureCheckboxCard x:Name="AllowCLIArguments"
+            <settings:SecureCheckboxCard SettingName="AllowCLIArguments"
+                                         Text="{t:Translate Allow custom command-line arguments}"
+                                         WarningText="{t:Translate Text='Custom command-line arguments can change the way in which programs are installed, upgraded or uninstalled, in a way UniGetUI cannot control. Using custom command-lines can break packages. Proceed with caution.'}"
+                                         StateChangedCommand="{Binding RefreshCLIStateCommand}"
                                          CornerRadius="8,8,0,0"/>
 
-            <settings:SecureCheckboxCard x:Name="AllowPrePostInstallCommands"
+            <settings:SecureCheckboxCard SettingName="AllowPrePostOpCommand"
+                                         Text="{t:Translate Text='Ignore custom pre-install and post-install commands when importing packages from a bundle'}"
+                                         WarningText="{t:Translate Text='Pre and post install commands will be run before and after a package gets installed, upgraded or uninstalled. Be aware that they may break things unless used carefully'}"
+                                         StateChangedCommand="{Binding RefreshPrePostStateCommand}"
                                          BorderThickness="1,0,1,1"
                                          CornerRadius="0,0,8,8"/>
 
@@ -80,17 +93,26 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:SecureCheckboxCard x:Name="AllowCustomManagerPaths"
+            <settings:SecureCheckboxCard SettingName="AllowCustomManagerPaths"
+                                         Text="{t:Translate Allow changing the paths for package manager executables}"
+                                         WarningText="{t:Translate Text='Turning this on enables changing the executable file used to interact with package managers. While this allows finer-grained customization of your install processes, it may also be dangerous'}"
+                                         StateChangedCommand="{Binding ShowRestartRequiredCommand}"
                                          CornerRadius="8"/>
 
             <settings:TranslatedTextBlock Text="Restrictions when importing package bundles"
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:SecureCheckboxCard x:Name="AllowImportingCLIArguments"
+            <settings:SecureCheckboxCard SettingName="AllowImportingCLIArguments"
+                                         Text="{t:Translate Allow importing custom command-line arguments when importing packages from a bundle}"
+                                         WarningText="{t:Translate Text='Malformed command-line arguments can break packages, or even allow a malicious actor to gain privileged execution. Therefore, importing custom command-line arguments is disabled by default'}"
+                                         IsEnabled="{Binding IsCLIArgumentsEnabled}"
                                          CornerRadius="8,8,0,0"/>
 
-            <settings:SecureCheckboxCard x:Name="AllowImportingPrePostInstallCommands"
+            <settings:SecureCheckboxCard SettingName="AllowImportPrePostOpCommands"
+                                         Text="{t:Translate Allow importing custom pre-install and post-install commands when importing packages from a bundle}"
+                                         WarningText="{t:Translate Text='Pre and post install commands can do very nasty things to your device, if designed to do so. It can be very dangerous to import the commands from a bundle, unless you trust the source of that package bundle'}"
+                                         IsEnabled="{Binding IsPrePostCommandsEnabled}"
                                          BorderThickness="1,0,1,1"
                                          CornerRadius="0,0,8,8"/>
 
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml.cs
index 2a4f3d48c..cf4a25fd5 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Administrator.axaml.cs
@@ -1,7 +1,5 @@
 using Avalonia.Controls;
 using UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
-using UniGetUI.Core.SettingsEngine;
-using UniGetUI.Core.SettingsEngine.SecureSettings;
 using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.Views.Pages.SettingsPages;
@@ -16,105 +14,10 @@ public sealed partial class Administrator : UserControl, ISettingsPage
     public event EventHandler? RestartRequired;
     public event EventHandler<Type>? NavigationRequested { add { } remove { } }
 
-    public void ShowRestartBanner(object? sender, EventArgs e) =>
-        RestartRequired?.Invoke(this, e);
-
-    public void RestartCache(object? sender, EventArgs e) =>
-        _ = CoreTools.ResetUACForCurrentProcess();
-
     public Administrator()
     {
         DataContext = new AdministratorViewModel();
         InitializeComponent();
-
-        // Populate the warning banner
-        WarningTitleText.Text = CoreTools.Translate("Warning") + "!";
-        WarningBodyLine1.Text =
-            CoreTools.Translate("The following settings may pose a security risk, hence they are disabled by default.")
-            + " "
-            + CoreTools.Translate("Enable the settings below if and only if you fully understand what they do, and the implications they may have.");
-        WarningBodyLine2.Text =
-            CoreTools.Translate("The settings will list, in their descriptions, the potential security issues they may have.");
-
-        // Admin rights section
-        DoCacheAdminRightsForBatches.SettingName = Settings.K.DoCacheAdminRightsForBatches;
-        DoCacheAdminRightsForBatches.Text = CoreTools.Translate("Ask for administrator privileges once for each batch of operations");
-        DoCacheAdminRightsForBatches.StateChanged += RestartCache;
-
-        DoCacheAdminRights.SettingName = Settings.K.DoCacheAdminRights;
-        DoCacheAdminRights.Text = CoreTools.Translate("Ask only once for administrator privileges");
-        DoCacheAdminRights.StateChanged += RestartCache;
-
-        ProhibitElevator.SettingName = Settings.K.ProhibitElevation;
-        ProhibitElevator.Text = CoreTools.Translate("Prohibit any kind of Elevation via UniGetUI Elevator or GSudo");
-        ProhibitElevator.StateChanged += ShowRestartBanner;
-
-        // Bind IsElevationEnabled to the ProhibitElevator toggle (inverted)
-        bool initialElevated = !(ProhibitElevator._checkbox.IsChecked ?? false);
-        VM.IsElevationEnabled = initialElevated;
-
-        ProhibitElevator._checkbox.IsCheckedChanged += (_, _) =>
-            VM.IsElevationEnabled = !(ProhibitElevator._checkbox.IsChecked ?? false);
-
-        // CLI arguments section
-        AllowCLIArguments.SettingName = SecureSettings.K.AllowCLIArguments;
-        AllowCLIArguments.Text = CoreTools.Translate("Allow custom command-line arguments");
-        AllowCLIArguments._warningBlock.Text = TwoLineWarning(
-            "Custom command-line arguments can change the way in which programs are installed, upgraded or uninstalled, in a way UniGetUI cannot control. Using custom command-lines can break packages. Proceed with caution.");
-        AllowCLIArguments._warningBlock.IsVisible = true;
-
-        AllowPrePostInstallCommands.SettingName = SecureSettings.K.AllowPrePostOpCommand;
-        AllowPrePostInstallCommands.Text = CoreTools.Translate("Ignore custom pre-install and post-install commands when importing packages from a bundle");
-        AllowPrePostInstallCommands._warningBlock.Text = TwoLineWarning(
-            "Pre and post install commands will be run before and after a package gets installed, upgraded or uninstalled. Be aware that they may break things unless used carefully");
-        AllowPrePostInstallCommands._warningBlock.IsVisible = true;
-
-        // Manager paths section
-        AllowCustomManagerPaths.SettingName = SecureSettings.K.AllowCustomManagerPaths;
-        AllowCustomManagerPaths.Text = CoreTools.Translate("Allow changing the paths for package manager executables");
-        AllowCustomManagerPaths._warningBlock.Text = TwoLineWarning(
-            "Turning this on enables changing the executable file used to interact with package managers. While this allows finer-grained customization of your install processes, it may also be dangerous");
-        AllowCustomManagerPaths._warningBlock.IsVisible = true;
-        AllowCustomManagerPaths.StateChanged += ShowRestartBanner;
-
-        // Bundle import restrictions
-        AllowImportingCLIArguments.SettingName = SecureSettings.K.AllowImportingCLIArguments;
-        AllowImportingCLIArguments.Text = CoreTools.Translate("Allow importing custom command-line arguments when importing packages from a bundle");
-        AllowImportingCLIArguments._warningBlock.Text = TwoLineWarning(
-            "Malformed command-line arguments can break packages, or even allow a malicious actor to gain privileged execution. Therefore, importing custom command-line arguments is disabled by default");
-        AllowImportingCLIArguments._warningBlock.IsVisible = true;
-
-        AllowImportingPrePostInstallCommands.SettingName = SecureSettings.K.AllowImportPrePostOpCommands;
-        AllowImportingPrePostInstallCommands.Text = CoreTools.Translate("Allow importing custom pre-install and post-install commands when importing packages from a bundle");
-        AllowImportingPrePostInstallCommands._warningBlock.Text = TwoLineWarning(
-            "Pre and post install commands can do very nasty things to your device, if designed to do so. It can be very dangerous to import the commands from a bundle, unless you trust the source of that package bundle");
-        AllowImportingPrePostInstallCommands._warningBlock.IsVisible = true;
-
-        // Bind import cards' enabled state directly to parent toggles (imperative, since
-        // SecureCheckboxCard.IsEnabled overrides the base property and can't use compiled bindings)
-        AllowImportingCLIArguments.IsEnabled = AllowCLIArguments._checkbox.IsChecked ?? false;
-        AllowImportingPrePostInstallCommands.IsEnabled = AllowPrePostInstallCommands._checkbox.IsChecked ?? false;
-
-        AllowCLIArguments._checkbox.IsCheckedChanged += (_, _) =>
-            AllowImportingCLIArguments.IsEnabled = AllowCLIArguments._checkbox.IsChecked ?? false;
-
-        AllowPrePostInstallCommands._checkbox.IsCheckedChanged += (_, _) =>
-            AllowImportingPrePostInstallCommands.IsEnabled = AllowPrePostInstallCommands._checkbox.IsChecked ?? false;
-    }
-
-    // Translates the full key (correct translation) then splits at the first sentence
-    // boundary so the warning always renders on two readable lines.
-    // Handles both Latin (". ") and CJK ("。") sentence separators.
-    private static string TwoLineWarning(string key)
-    {
-        var text = CoreTools.Translate(key);
-        // Try Latin period+space first, then CJK ideographic full stop
-        var idx = text.IndexOf(". ", StringComparison.Ordinal);
-        if (idx >= 0)
-            return text[..(idx + 1)] + "\n" + text[(idx + 2)..];
-        idx = text.IndexOf('。');
-        if (idx >= 0)
-            return text[..(idx + 1)] + "\n" + text[(idx + 1)..];
-        return text;
+        VM.RestartRequired += (s, e) => RestartRequired?.Invoke(s, e);
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml
index 01edc70a9..787e0a1e2 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml
@@ -23,7 +23,9 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:CheckboxCard x:Name="EnablePackageBackupCheckBox_LOCAL"
+            <settings:CheckboxCard SettingName="EnablePackageBackup_LOCAL"
+                                   Text="{t:Translate Periodically perform a local backup of the installed packages}"
+                                   StateChangedCommand="{Binding EnableLocalBackupChangedCommand}"
                                    CornerRadius="8,8,0,0"/>
 
             <settings:ButtonCard x:Name="BackupNowButton_LOCAL"
@@ -37,9 +39,9 @@
 
             <Border Height="16"/>
 
-            <settings:ButtonCard x:Name="ChangeBackupDirectory"
-                                 CornerRadius="8"
+            <settings:ButtonCard CornerRadius="8"
                                  Text="{t:Translate Change backup output directory}"
+                                 Description="{Binding BackupDirectoryLabel}"
                                  ButtonText="{t:Translate Select}"
                                  IsEnabled="{Binding IsLocalBackupEnabled}"
                                  Command="{Binding PickBackupDirectoryCommand}"
@@ -49,12 +51,14 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:TextboxCard x:Name="ChangeBackupFileNameTextBox"
-                                  CornerRadius="8,8,0,0"
+            <settings:TextboxCard SettingName="ChangeBackupFileName"
                                   Text="{t:Translate Set a custom backup file name}"
+                                  Placeholder="{t:Translate Leave empty for default}"
+                                  CornerRadius="8,8,0,0"
                                   IsEnabled="{Binding IsLocalBackupEnabled}"/>
 
-            <settings:CheckboxCard x:Name="EnableBackupTimestamping"
+            <settings:CheckboxCard SettingName="EnableBackupTimestamping"
+                                   Text="{t:Translate Add a timestamp to the backup file names}"
                                    CornerRadius="0,0,8,8"
                                    BorderThickness="1,0,1,1"
                                    IsEnabled="{Binding IsLocalBackupEnabled}"/>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml.cs
index 7bc2fa22a..c0c057b36 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Backup.axaml.cs
@@ -5,51 +5,26 @@
 using UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
 using UniGetUI.Avalonia.Views.Controls.Settings;
 using UniGetUI.Core.Tools;
-using CoreSettings = global::UniGetUI.Core.SettingsEngine.Settings;
 
 namespace UniGetUI.Avalonia.Views.Pages.SettingsPages;
 
 public sealed partial class Backup : UserControl, ISettingsPage
 {
-    private BackupViewModel VM => (BackupViewModel)DataContext!;
-
     public bool CanGoBack => true;
     public string ShortTitle => CoreTools.Translate("Backup and Restore");
 
     public event EventHandler? RestartRequired;
     public event EventHandler<Type>? NavigationRequested { add { } remove { } }
 
-    private void ShowRestartBanner(object? sender, EventArgs e) => RestartRequired?.Invoke(this, e);
-
     public Backup()
     {
         DataContext = new BackupViewModel();
         InitializeComponent();
 
-        ChangeBackupDirectory.Description = VM.BackupDirectoryLabel;
-        VM.PropertyChanged += (_, e) =>
-        {
-            if (e.PropertyName == nameof(VM.BackupDirectoryLabel))
-                ChangeBackupDirectory.Description = VM.BackupDirectoryLabel;
-        };
+        var vm = (BackupViewModel)DataContext;
+        vm.RestartRequired += (s, e) => RestartRequired?.Invoke(s, e);
 
         BuildBackupInfoCard();
-
-        EnablePackageBackupCheckBox_LOCAL.SettingName = CoreSettings.K.EnablePackageBackup_LOCAL;
-        EnablePackageBackupCheckBox_LOCAL.Text = CoreTools.Translate("Periodically perform a local backup of the installed packages");
-        EnablePackageBackupCheckBox_LOCAL.StateChanged += (_, _) =>
-        {
-            VM.IsLocalBackupEnabled = EnablePackageBackupCheckBox_LOCAL.Checked;
-            ShowRestartBanner(this, EventArgs.Empty);
-        };
-        VM.IsLocalBackupEnabled = EnablePackageBackupCheckBox_LOCAL.Checked;
-
-        ChangeBackupFileNameTextBox.SettingName = CoreSettings.K.ChangeBackupFileName;
-        ChangeBackupFileNameTextBox.Text = CoreTools.Translate("Set a custom backup file name");
-        ChangeBackupFileNameTextBox.Placeholder = CoreTools.Translate("Leave empty for default");
-
-        EnableBackupTimestamping.SettingName = CoreSettings.K.EnableBackupTimestamping;
-        EnableBackupTimestamping.Text = CoreTools.Translate("Add a timestamp to the backup file names");
     }
 
     private void BuildBackupInfoCard()
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml
index e24fd418e..6889c6241 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
@@ -12,49 +13,68 @@
         <StackPanel Orientation="Vertical">
 
             <settings:CheckboxCard x:Name="ShowVersionNumberOnTitlebar"
+                                   SettingName="ShowVersionNumberOnTitlebar"
+                                   StateChangedCommand="{Binding ShowRestartRequiredCommand}"
                                    CornerRadius="8"/>
 
             <UserControl Height="16"/>
 
-            <settings:CheckboxCard x:Name="DisableWidgetsApi"
+            <settings:CheckboxCard SettingName="DisableApi"
+                                   Text="{t:Translate Text='Enable background api (WingetUI Widgets and Sharing, port 7058)'}"
+                                   StateChangedCommand="{Binding ShowRestartRequiredCommand}"
                                    BorderThickness="1,1,1,0"
                                    CornerRadius="8,8,0,0"/>
 
-            <settings:CheckboxCard x:Name="DisableWaitForInternetConnection"
+            <settings:CheckboxCard SettingName="DisableWaitForInternetConnection"
+                                   Text="{t:Translate Wait for the device to be connected to the internet before attempting to do tasks that require internet connectivity.}"
+                                   StateChangedCommand="{Binding ShowRestartRequiredCommand}"
                                    CornerRadius="0,0,8,8"/>
 
             <UserControl Height="16"/>
 
-            <settings:CheckboxCard x:Name="DisableTimeoutOnPackageListingTasks"
+            <settings:CheckboxCard SettingName="DisableTimeoutOnPackageListingTasks"
+                                   ForceInversion="True"
+                                   Text="{t:Translate Disable the 1-minute timeout for package-related operations}"
                                    CornerRadius="8"/>
 
             <UserControl Height="16"/>
 
-            <settings:SecureCheckboxCard x:Name="UseUserGSudoToggle"
+            <settings:SecureCheckboxCard SettingName="ForceUserGSudo"
+                                         Text="{t:Translate Use installed GSudo instead of UniGetUI Elevator}"
+                                         StateChangedCommand="{Binding ShowRestartRequiredCommand}"
                                          CornerRadius="8"/>
 
             <UserControl Height="16"/>
 
-            <settings:CheckboxCard x:Name="DisableDownloadingNewTranslations"
+            <settings:CheckboxCard SettingName="DisableLangAutoUpdater"
+                                   Text="{t:Translate Download updated language files from GitHub automatically}"
+                                   StateChangedCommand="{Binding ShowRestartRequiredCommand}"
                                    BorderThickness="1,1,1,0"
                                    CornerRadius="8,8,0,0"/>
 
             <settings:TextboxCard x:Name="IconDatabaseURLCard"
+                                  SettingName="IconDataBaseURL"
+                                  Text="{t:Translate Use a custom icon and screenshot database URL}"
+                                  Placeholder="{t:Translate Leave empty for default}"
+                                  ValueChangedCommand="{Binding ShowRestartRequiredCommand}"
                                   CornerRadius="0,0,8,8"/>
 
             <UserControl Height="16"/>
 
-            <settings:CheckboxCard x:Name="DisableDMWThreadOptimizations"
+            <settings:CheckboxCard SettingName="DisableDMWThreadOptimizations"
+                                   Text="{t:Translate Enable background CPU Usage optimizations (see Pull Request #3278)}"
                                    CornerRadius="8"/>
 
             <UserControl Height="16"/>
 
-            <settings:CheckboxCard x:Name="DisableIntegrityChecks"
+            <settings:CheckboxCard SettingName="DisableIntegrityChecks"
+                                   Text="{t:Translate Perform integrity checks at startup}"
                                    CornerRadius="8"/>
 
             <UserControl Height="16"/>
 
-            <settings:CheckboxCard x:Name="InstallInstalledPackagesBundlesPage"
+            <settings:CheckboxCard SettingName="InstallInstalledPackagesBundlesPage"
+                                   Text="{t:Translate Text='When batch installing packages from a bundle, install also packages that are already installed'}"
                                    CornerRadius="8"/>
 
         </StackPanel>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml.cs
index 859ef1b11..c9f1a7f35 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Experimental.axaml.cs
@@ -1,7 +1,5 @@
 using Avalonia.Controls;
 using UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
-using UniGetUI.Core.SettingsEngine;
-using UniGetUI.Core.SettingsEngine.SecureSettings;
 using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.Views.Pages.SettingsPages;
@@ -14,51 +12,15 @@ public sealed partial class Experimental : UserControl, ISettingsPage
     public event EventHandler? RestartRequired;
     public event EventHandler<Type>? NavigationRequested { add { } remove { } }
 
-    public void ShowRestartBanner(object? sender, EventArgs e) =>
-        RestartRequired?.Invoke(this, e);
-
     public Experimental()
     {
         DataContext = new ExperimentalViewModel();
         InitializeComponent();
 
-        ShowVersionNumberOnTitlebar.SettingName = Settings.K.ShowVersionNumberOnTitlebar;
-        ShowVersionNumberOnTitlebar.Text = CoreTools.Translate("Show UniGetUI's version and build number on the titlebar.");
-        ShowVersionNumberOnTitlebar.StateChanged += ShowRestartBanner;
-
-        DisableWidgetsApi.SettingName = Settings.K.DisableApi;
-        DisableWidgetsApi.Text = CoreTools.Translate("Enable background api (WingetUI Widgets and Sharing, port 7058)");
-        DisableWidgetsApi.StateChanged += ShowRestartBanner;
-
-        DisableWaitForInternetConnection.SettingName = Settings.K.DisableWaitForInternetConnection;
-        DisableWaitForInternetConnection.Text = CoreTools.Translate("Wait for the device to be connected to the internet before attempting to do tasks that require internet connectivity.");
-        DisableWaitForInternetConnection.StateChanged += ShowRestartBanner;
-
-        DisableTimeoutOnPackageListingTasks.SettingName = Settings.K.DisableTimeoutOnPackageListingTasks;
-        DisableTimeoutOnPackageListingTasks.ForceInversion = true;
-        DisableTimeoutOnPackageListingTasks.Text = CoreTools.Translate("Disable the 1-minute timeout for package-related operations");
-
-        UseUserGSudoToggle.SettingName = SecureSettings.K.ForceUserGSudo;
-        UseUserGSudoToggle.Text = CoreTools.Translate("Use installed GSudo instead of UniGetUI Elevator");
-        UseUserGSudoToggle.StateChanged += ShowRestartBanner;
+        var vm = (ExperimentalViewModel)DataContext;
+        vm.RestartRequired += (s, e) => RestartRequired?.Invoke(s, e);
 
-        DisableDownloadingNewTranslations.SettingName = Settings.K.DisableLangAutoUpdater;
-        DisableDownloadingNewTranslations.Text = CoreTools.Translate("Download updated language files from GitHub automatically");
-        DisableDownloadingNewTranslations.StateChanged += ShowRestartBanner;
-
-        IconDatabaseURLCard.SettingName = Settings.K.IconDataBaseURL;
+        ShowVersionNumberOnTitlebar.Text = CoreTools.Translate("Show UniGetUI's version and build number on the titlebar.");
         IconDatabaseURLCard.HelpUrl = new Uri("https://www.marticliment.com/unigetui/help/icons-and-screenshots#custom-source");
-        IconDatabaseURLCard.Placeholder = CoreTools.Translate("Leave empty for default");
-        IconDatabaseURLCard.Text = CoreTools.Translate("Use a custom icon and screenshot database URL");
-        IconDatabaseURLCard.ValueChanged += ShowRestartBanner;
-
-        DisableDMWThreadOptimizations.SettingName = Settings.K.DisableDMWThreadOptimizations;
-        DisableDMWThreadOptimizations.Text = CoreTools.Translate("Enable background CPU Usage optimizations (see Pull Request #3278)");
-
-        DisableIntegrityChecks.SettingName = Settings.K.DisableIntegrityChecks;
-        DisableIntegrityChecks.Text = CoreTools.Translate("Perform integrity checks at startup");
-
-        InstallInstalledPackagesBundlesPage.SettingName = Settings.K.InstallInstalledPackagesBundlesPage;
-        InstallInstalledPackagesBundlesPage.Text = CoreTools.Translate("When batch installing packages from a bundle, install also packages that are already installed");
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml
index 9069eb63a..0076b9a61 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml
@@ -23,10 +23,14 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:CheckboxButtonCard x:Name="DisableAutoUpdateWingetUI"
+            <settings:CheckboxButtonCard SettingName="DisableAutoUpdateWingetUI"
+                                         CheckboxText="{t:Translate Update WingetUI automatically}"
+                                         ButtonText="{t:Translate Check for updates}"
+                                         ButtonAlwaysOn="True"
                                          CornerRadius="8,8,0,0"/>
 
-            <settings:CheckboxCard x:Name="EnableUniGetUIBeta"
+            <settings:CheckboxCard SettingName="EnableUniGetUIBeta"
+                                   Text="{t:Translate Install prerelease versions of UniGetUI}"
                                    CornerRadius="0,0,8,8"
                                    BorderThickness="1,0,1,1"/>
 
@@ -67,12 +71,12 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:SettingsPageButton x:Name="InterfaceSettingsButton"
-                                         CornerRadius="8"
+            <settings:SettingsPageButton CornerRadius="8"
                                          Margin="0,0,0,20"
                                          Icon="Interactive"
                                          Text="{t:Translate User interface preferences}"
-                                         UnderText="{t:Translate Text='Application theme, startup page, package icons, clear successful installs automatically'}"/>
+                                         UnderText="{t:Translate Text='Application theme, startup page, package icons, clear successful installs automatically'}"
+                                         Command="{Binding NavigateToInterfaceCommand}"/>
 
         </StackPanel>
     </ScrollViewer>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml.cs
index 1d961712d..cc06613c7 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/General.axaml.cs
@@ -18,17 +18,16 @@ public sealed partial class General : UserControl, ISettingsPage
     public event EventHandler? RestartRequired;
     public event EventHandler<Type>? NavigationRequested;
 
-    private void ShowRestartBanner(object? sender, EventArgs e) => RestartRequired?.Invoke(this, e);
-
     public General()
     {
         DataContext = new GeneralViewModel();
         InitializeComponent();
 
-        // ViewModel events that need to bubble up to the settings shell
-        ((GeneralViewModel)DataContext).RestartRequired += ShowRestartBanner;
+        var vm = (GeneralViewModel)DataContext;
+        vm.RestartRequired += (s, e) => RestartRequired?.Invoke(s, e);
+        vm.NavigationRequested += (s, t) => NavigationRequested?.Invoke(s, t);
 
-        // Populate language selector
+        // Populate language selector (complex dynamic content)
         var langDict = new Dictionary<string, string>(LanguageData.LanguageReference.AsEnumerable());
         foreach (string key in langDict.Keys.ToList())
         {
@@ -40,19 +39,8 @@ public General()
         LanguageSelector.SettingName = CoreSettings.K.PreferredLanguage;
         LanguageSelector.Text = CoreTools.Translate("WingetUI display language:");
         LanguageSelector.ShowAddedItems();
-        LanguageSelector.ValueChanged += ShowRestartBanner;
+        LanguageSelector.ValueChanged += (s, e) => RestartRequired?.Invoke(s, e);
         LanguageSelector.Description = BuildTranslatorDescription();
-
-        DisableAutoUpdateWingetUI.SettingName = CoreSettings.K.DisableAutoUpdateWingetUI;
-        DisableAutoUpdateWingetUI.CheckboxText = CoreTools.Translate("Update WingetUI automatically");
-        DisableAutoUpdateWingetUI.ButtonText = CoreTools.Translate("Check for updates");
-        DisableAutoUpdateWingetUI.ButtonAlwaysOn = true;
-        DisableAutoUpdateWingetUI.Click += (_, _) => { /* auto-updater not available in Avalonia port */ };
-
-        EnableUniGetUIBeta.SettingName = CoreSettings.K.EnableUniGetUIBeta;
-        EnableUniGetUIBeta.Text = CoreTools.Translate("Install prerelease versions of UniGetUI");
-
-        InterfaceSettingsButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Interface_P));
     }
 
     private static StackPanel BuildTranslatorDescription()
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml
index df587319d..c599711d5 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml
@@ -28,7 +28,8 @@
                                               FontWeight="SemiBold"
                                               Margin="44,32,4,8"/>
 
-                <settings:CheckboxCard x:Name="DisableSystemTray"
+                <settings:CheckboxCard SettingName="DisableSystemTray"
+                                       Text="{t:Translate Close UniGetUI to the system tray}"
                                        CornerRadius="8,8,0,0"/>
 
                 <settings:ButtonCard x:Name="EditAutostartSettings"
@@ -43,19 +44,24 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:CheckboxCard x:Name="DisableIconsOnPackageLists"
+            <settings:CheckboxCard SettingName="DisableIconsOnPackageLists"
+                                   Text="{t:Translate Show package icons on package lists}"
+                                   StateChangedCommand="{Binding ShowRestartRequiredCommand}"
                                    CornerRadius="8,8,0,0"/>
 
             <settings:ButtonCard x:Name="ResetIconCache"
                                  CornerRadius="0,0,8,8"
                                  BorderThickness="1,0,1,1"
+                                 Header="{Binding IconCacheSizeText}"
                                  ButtonText="{t:Translate Clear cache}"
                                  Command="{Binding ResetIconCacheCommand}"
                                  CommandParameter="{Binding $self}"/>
 
             <Border Height="16"/>
 
-            <settings:CheckboxCard x:Name="DisableSelectingUpdatesByDefault"
+            <settings:CheckboxCard SettingName="DisableSelectingUpdatesByDefault"
+                                   Text="{t:Translate Select upgradable packages by default}"
+                                   StateChangedCommand="{Binding ShowRestartRequiredCommand}"
                                    CornerRadius="8"/>
 
         </StackPanel>
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 a2ff87c87..a25213b76 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Interface_P.axaml.cs
@@ -15,8 +15,6 @@ public sealed partial class Interface_P : UserControl, ISettingsPage
     public event EventHandler? RestartRequired;
     public event EventHandler<Type>? NavigationRequested { add { } remove { } }
 
-    private void ShowRestartBanner(object? sender, EventArgs e) => RestartRequired?.Invoke(this, e);
-
     public Interface_P()
     {
         DataContext = new Interface_PViewModel();
@@ -25,12 +23,7 @@ public Interface_P()
         if (OperatingSystem.IsMacOS())
             SystemTraySection.IsVisible = false;
 
-        VM.RestartRequired += ShowRestartBanner;
-        VM.PropertyChanged += (_, e) =>
-        {
-            if (e.PropertyName == nameof(VM.IconCacheSizeText))
-                ResetIconCache.Header = VM.IconCacheSizeText;
-        };
+        VM.RestartRequired += (s, e) => RestartRequired?.Invoke(s, e);
         _ = VM.LoadIconCacheSize();
 
         if (CoreSettings.GetValue(CoreSettings.K.PreferredTheme) == "")
@@ -53,16 +46,5 @@ public Interface_P()
         StartupPageSelector.SettingName = CoreSettings.K.StartupPage;
         StartupPageSelector.Text = CoreTools.Translate("UniGetUI startup page:");
         StartupPageSelector.ShowAddedItems();
-
-        DisableSystemTray.SettingName = CoreSettings.K.DisableSystemTray;
-        DisableSystemTray.Text = CoreTools.Translate("Close UniGetUI to the system tray");
-
-        DisableIconsOnPackageLists.SettingName = CoreSettings.K.DisableIconsOnPackageLists;
-        DisableIconsOnPackageLists.Text = CoreTools.Translate("Show package icons on package lists");
-        DisableIconsOnPackageLists.StateChanged += ShowRestartBanner;
-
-        DisableSelectingUpdatesByDefault.SettingName = CoreSettings.K.DisableSelectingUpdatesByDefault;
-        DisableSelectingUpdatesByDefault.Text = CoreTools.Translate("Select upgradable packages by default");
-        DisableSelectingUpdatesByDefault.StateChanged += ShowRestartBanner;
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml
index 8c5267716..e4896a2c2 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
@@ -15,17 +16,26 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:CheckboxCard x:Name="EnableProxy"
+            <settings:CheckboxCard SettingName="EnableProxy"
+                                   Text="{t:Translate Connect the internet using a custom proxy}"
+                                   Description="{t:Translate Text='Please note that not all package managers may fully support this feature'}"
+                                   StateChangedCommand="{Binding RefreshProxyEnabledCommand}"
                                    CornerRadius="8,8,0,0"/>
 
-            <settings:TextboxCard x:Name="ProxyURLCard"
+            <settings:TextboxCard SettingName="ProxyURL"
+                                  Text="{t:Translate Proxy URL}"
+                                  Placeholder="{t:Translate Enter proxy URL here}"
+                                  ValueChangedCommand="{Binding ApplyProxyCommand}"
                                   CornerRadius="0,0,8,8"
                                   BorderThickness="1,0,1,1"
                                   IsEnabled="{Binding IsProxyEnabled}"/>
 
             <Border Height="16"/>
 
-            <settings:CheckboxCard x:Name="EnableProxyAuth"
+            <settings:CheckboxCard SettingName="EnableProxyAuth"
+                                   Text="{t:Translate Authenticate to the proxy with a user and a password}"
+                                   Description="{t:Translate Text='Please note that not all package managers may fully support this feature'}"
+                                   StateChangedCommand="{Binding RefreshProxyAuthEnabledCommand}"
                                    CornerRadius="8,8,0,0"
                                    IsEnabled="{Binding IsProxyEnabled}"/>
 
@@ -40,7 +50,9 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:CheckboxCard x:Name="DisableWaitForInternetConnection"
+            <settings:CheckboxCard SettingName="DisableWaitForInternetConnection"
+                                   Text="{t:Translate Wait for the device to be connected to the internet before attempting to do tasks that require internet connectivity.}"
+                                   StateChangedCommand="{Binding ShowRestartRequiredCommand}"
                                    CornerRadius="8"/>
 
         </StackPanel>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml.cs
index 0f1c51f11..7d31ee902 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml.cs
@@ -13,174 +13,23 @@ namespace UniGetUI.Avalonia.Views.Pages.SettingsPages;
 
 public sealed partial class Internet : UserControl, ISettingsPage
 {
-    private InternetViewModel VM => (InternetViewModel)DataContext!;
-
     public bool CanGoBack => true;
     public string ShortTitle => CoreTools.Translate("Internet and proxy settings");
 
     public event EventHandler? RestartRequired;
     public event EventHandler<Type>? NavigationRequested { add { } remove { } }
 
-    private TextBox? _usernameBox;
-    private TextBox? _passwordBox;
-    private ProgressBar? _savingIndicator;
+
 
     public Internet()
     {
         DataContext = new InternetViewModel();
         InitializeComponent();
 
-        EnableProxy.SettingName = CoreSettings.K.EnableProxy;
-        EnableProxy.Text = CoreTools.Translate("Connect the internet using a custom proxy");
-        EnableProxy.Description = CoreTools.Translate("Please note that not all package managers may fully support this feature");
-        EnableProxy.StateChanged += (_, _) =>
-        {
-            VM.IsProxyEnabled = EnableProxy.Checked;
-            InternetViewModel.ApplyProxyToProcess();
-        };
-        VM.IsProxyEnabled = EnableProxy.Checked;
-
-        ProxyURLCard.SettingName = CoreSettings.K.ProxyURL;
-        ProxyURLCard.Text = CoreTools.Translate("Proxy URL");
-        ProxyURLCard.Placeholder = CoreTools.Translate("Enter proxy URL here");
-        ProxyURLCard.ValueChanged += (_, _) => InternetViewModel.ApplyProxyToProcess();
-
-        EnableProxyAuth.SettingName = CoreSettings.K.EnableProxyAuth;
-        EnableProxyAuth.Text = CoreTools.Translate("Authenticate to the proxy with a user and a password");
-        EnableProxyAuth.Description = CoreTools.Translate("Please note that not all package managers may fully support this feature");
-        EnableProxyAuth.StateChanged += (_, _) =>
-        {
-            VM.IsProxyAuthEnabled = EnableProxyAuth.Checked;
-            InternetViewModel.ApplyProxyToProcess();
-        };
-        VM.IsProxyAuthEnabled = EnableProxyAuth.Checked;
-
-        CredentialsHolder.Content = BuildCredentialsCard();
-
-        ProxyCompatTableHolder.Content = BuildProxyCompatTable();
-
-        DisableWaitForInternetConnection.SettingName = CoreSettings.K.DisableWaitForInternetConnection;
-        DisableWaitForInternetConnection.Text = CoreTools.Translate("Wait for the device to be connected to the internet before attempting to do tasks that require internet connectivity.");
-        DisableWaitForInternetConnection.StateChanged += (_, _) => RestartRequired?.Invoke(this, EventArgs.Empty);
-    }
-
-    private SettingsCard BuildCredentialsCard()
-    {
-        _savingIndicator = new ProgressBar
-        {
-            IsIndeterminate = true,
-            Opacity = 0,
-            Margin = new Thickness(0, -8, 0, 0),
-        };
-
-        _usernameBox = new TextBox
-        {
-            Watermark = CoreTools.Translate("Username"),
-            MinWidth = 200,
-            Margin = new Thickness(0, 0, 0, 4),
-        };
-
-        _passwordBox = new TextBox
-        {
-            Watermark = CoreTools.Translate("Password"),
-            MinWidth = 200,
-            PasswordChar = '●',
-        };
-
-        var creds = CoreSettings.GetProxyCredentials();
-        if (creds is not null)
-        {
-            _usernameBox.Text = creds.UserName;
-            _passwordBox.Text = creds.Password;
-        }
-
-        _usernameBox.TextChanged += (_, _) => _ = SaveCredentialsAsync();
-        _passwordBox.TextChanged += (_, _) => _ = SaveCredentialsAsync();
-
-        var stack = new StackPanel { Orientation = Orientation.Vertical };
-        stack.Children.Add(_savingIndicator);
-        stack.Children.Add(_usernameBox);
-        stack.Children.Add(_passwordBox);
-
-        return new SettingsCard
-        {
-            CornerRadius = new CornerRadius(0, 0, 8, 8),
-            BorderThickness = new Thickness(1, 0, 1, 1),
-            Header = CoreTools.Translate("Credentials"),
-            Description = CoreTools.Translate("It is not guaranteed that the provided credentials will be stored safely"),
-            Content = stack,
-        };
-    }
-
-    private static Control BuildProxyCompatTable()
-    {
-        var noStr = CoreTools.Translate("No");
-        var yesStr = CoreTools.Translate("Yes");
-        var partStr = CoreTools.Translate("Partially");
-
-        var headerRow = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto,Auto,*"), Margin = new Thickness(0, 0, 0, 8) };
-        headerRow.Children.Add(WithCol(new TextBlock { Text = CoreTools.Translate("Package manager"), FontWeight = FontWeight.Bold, TextWrapping = TextWrapping.Wrap }, 1));
-        headerRow.Children.Add(WithCol(new TextBlock { Text = CoreTools.Translate("Compatible with proxy"), FontWeight = FontWeight.Bold, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(16, 0, 0, 0) }, 2));
-        headerRow.Children.Add(WithCol(new TextBlock { Text = CoreTools.Translate("Compatible with authentication"), FontWeight = FontWeight.Bold, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(16, 0, 0, 0) }, 3));
-
-        var managerCol = new StackPanel { Orientation = Orientation.Vertical, Spacing = 6 };
-        var proxyCol = new StackPanel { Orientation = Orientation.Vertical, Spacing = 6 };
-        var authCol = new StackPanel { Orientation = Orientation.Vertical, Spacing = 6 };
-
-        foreach (var manager in PEInterface.Managers)
-        {
-            managerCol.Children.Add(new TextBlock { Text = manager.DisplayName, TextAlignment = TextAlignment.Center });
-
-            var proxyLevel = manager.Capabilities.SupportsProxy;
-            proxyCol.Children.Add(StatusBadge(
-                proxyLevel is ProxySupport.No ? noStr : (proxyLevel is ProxySupport.Partially ? partStr : yesStr),
-                proxyLevel is ProxySupport.Yes ? Colors.Green : (proxyLevel is ProxySupport.Partially ? Colors.Orange : Colors.Red)));
-
-            authCol.Children.Add(StatusBadge(
-                manager.Capabilities.SupportsProxyAuth ? yesStr : noStr,
-                manager.Capabilities.SupportsProxyAuth ? Colors.Green : Colors.Red));
-        }
+        var vm = (InternetViewModel)DataContext;
+        vm.RestartRequired += (s, e) => RestartRequired?.Invoke(s, e);
 
-        var dataRow = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto,Auto,*"), ColumnSpacing = 16 };
-        dataRow.Children.Add(WithCol(managerCol, 1));
-        dataRow.Children.Add(WithCol(proxyCol, 2));
-        dataRow.Children.Add(WithCol(authCol, 3));
-
-        var tableStack = new StackPanel { Orientation = Orientation.Vertical };
-        tableStack.Children.Add(headerRow);
-        tableStack.Children.Add(dataRow);
-
-        return new SettingsCard
-        {
-            CornerRadius = new CornerRadius(8),
-            Header = CoreTools.Translate("Proxy compatibility table"),
-            Description = tableStack,
-        };
-    }
-
-    private static Border StatusBadge(string text, Color color) => new Border
-    {
-        CornerRadius = new CornerRadius(4),
-        Padding = new Thickness(4, 2),
-        BorderThickness = new Thickness(1),
-        Background = new SolidColorBrush(Color.FromArgb(60, color.R, color.G, color.B)),
-        BorderBrush = new SolidColorBrush(Color.FromArgb(120, color.R, color.G, color.B)),
-        Child = new TextBlock { Text = text, TextAlignment = TextAlignment.Center },
-    };
-
-    private static Control WithCol(Control c, int col) { Grid.SetColumn(c, col); return c; }
-
-    private async Task SaveCredentialsAsync()
-    {
-        if (_usernameBox is null || _passwordBox is null || _savingIndicator is null) return;
-        _savingIndicator.Opacity = 1;
-        string u = _usernameBox.Text ?? "";
-        string p = _passwordBox.Text ?? "";
-        await Task.Delay(500);
-        if ((_usernameBox.Text ?? "") != u) return;
-        if ((_passwordBox.Text ?? "") != p) return;
-        CoreSettings.SetProxyCredentials(u, p);
-        InternetViewModel.ApplyProxyToProcess();
-        _savingIndicator.Opacity = 0;
+        CredentialsHolder.Content = vm.BuildCredentialsCard();
+        ProxyCompatTableHolder.Content = vm.BuildProxyCompatTable();
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml
index b8949f673..5b9adc732 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages.SettingsPages"
              xmlns:settings="using:UniGetUI.Avalonia.Views.Controls.Settings"
+             xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d"
@@ -16,13 +17,15 @@
                                           Margin="44,32,4,8"/>
 
             <!-- Warning shown when system tray is disabled -->
-            <TextBlock x:Name="TrayWarningText"
+            <TextBlock Text="{t:Translate The system tray icon must be enabled in order for notifications to work}"
                        Margin="0,0,0,8"
                        HorizontalAlignment="Center"
                        Foreground="OrangeRed"
                        IsVisible="{Binding !IsSystemTrayEnabled}"/>
 
-            <settings:CheckboxCard x:Name="DisableNotifications"
+            <settings:CheckboxCard SettingName="DisableNotifications"
+                                   Text="{t:Translate Enable WingetUI notifications}"
+                                   StateChangedCommand="{Binding UpdateNotificationsEnabledCommand}"
                                    CornerRadius="8"
                                    IsEnabled="{Binding IsSystemTrayEnabled}"/>
 
@@ -30,20 +33,24 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:CheckboxCard x:Name="DisableUpdatesNotifications"
+            <settings:CheckboxCard SettingName="DisableUpdatesNotifications"
+                                   Text="{t:Translate Show a notification when there are available updates}"
                                    CornerRadius="8,8,0,0"
                                    IsEnabled="{Binding IsNotificationsEnabled}"/>
 
-            <settings:CheckboxCard x:Name="DisableProgressNotifications"
+            <settings:CheckboxCard SettingName="DisableProgressNotifications"
+                                   Text="{t:Translate Show a silent notification when an operation is running}"
                                    BorderThickness="1,0"
                                    CornerRadius="0"
                                    IsEnabled="{Binding IsNotificationsEnabled}"/>
 
-            <settings:CheckboxCard x:Name="DisableErrorNotifications"
+            <settings:CheckboxCard SettingName="DisableUpdatesNotifications"
+                                   Text="{t:Translate Show a notification when an operation fails}"
                                    CornerRadius="0"
                                    IsEnabled="{Binding IsNotificationsEnabled}"/>
 
-            <settings:CheckboxCard x:Name="DisableSuccessNotifications"
+            <settings:CheckboxCard SettingName="DisableSuccessNotifications"
+                                   Text="{t:Translate Show a notification when an operation finishes successfully}"
                                    BorderThickness="1,0,1,1"
                                    CornerRadius="0,0,8,8"
                                    IsEnabled="{Binding IsNotificationsEnabled}"/>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml.cs
index d8ec23bd4..6ea544fe9 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml.cs
@@ -1,14 +1,11 @@
 using Avalonia.Controls;
 using UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
-using UniGetUI.Core.SettingsEngine;
 using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.Views.Pages.SettingsPages;
 
 public sealed partial class Notifications : UserControl, ISettingsPage
 {
-    private NotificationsViewModel VM => (NotificationsViewModel)DataContext!;
-
     public bool CanGoBack => true;
     public string ShortTitle => CoreTools.Translate("Notification preferences");
 
@@ -19,31 +16,5 @@ public Notifications()
     {
         DataContext = new NotificationsViewModel();
         InitializeComponent();
-
-        // Assign setting names to named controls
-        DisableNotifications.SettingName = Settings.K.DisableNotifications;
-        DisableUpdatesNotifications.SettingName = Settings.K.DisableUpdatesNotifications;
-        DisableProgressNotifications.SettingName = Settings.K.DisableProgressNotifications;
-        DisableErrorNotifications.SettingName = Settings.K.DisableUpdatesNotifications;
-        DisableSuccessNotifications.SettingName = Settings.K.DisableSuccessNotifications;
-
-        DisableNotifications.Text = CoreTools.Translate("Enable WingetUI notifications");
-        DisableUpdatesNotifications.Text = CoreTools.Translate("Show a notification when there are available updates");
-        DisableProgressNotifications.Text = CoreTools.Translate("Show a silent notification when an operation is running");
-        DisableErrorNotifications.Text = CoreTools.Translate("Show a notification when an operation fails");
-        DisableSuccessNotifications.Text = CoreTools.Translate("Show a notification when an operation finishes successfully");
-
-        TrayWarningText.Text = CoreTools.Translate("The system tray icon must be enabled in order for notifications to work");
-
-        // Mirror WinUI OnNavigatedTo: disable all when tray is off
-        bool trayEnabled = !Settings.Get(Settings.K.DisableSystemTray);
-        VM.IsSystemTrayEnabled = trayEnabled;
-
-        // Set initial notifications-enabled state from the master toggle
-        VM.IsNotificationsEnabled = DisableNotifications._checkbox.IsChecked ?? false;
-
-        // React to changes on the master notifications toggle
-        DisableNotifications._checkbox.IsCheckedChanged += (_, _) =>
-            VM.IsNotificationsEnabled = DisableNotifications._checkbox.IsChecked ?? false;
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml
index abfffd318..8649bad5f 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml
@@ -17,15 +17,23 @@
                                           Margin="44,32,4,8"/>
 
             <settings:ComboboxCard x:Name="ParallelOperationCount"
+                                   SettingName="ParallelOperationCount"
+                                   Text="{t:Translate Choose how many operations should be performed in parallel}"
+                                   ValueChangedCommand="{Binding UpdateMaxOperationsCommand}"
                                    CornerRadius="8,8,0,0"/>
 
-            <settings:CheckboxCard x:Name="MaintainSuccessfulInstalls"
+            <settings:CheckboxCard SettingName="MaintainSuccessfulInstalls"
+                                   ForceInversion="True"
+                                   Text="{t:Translate Clear successful operations from the operation list after a 5 second delay}"
+                                   WarningText="{t:Translate Download operations are not affected by this setting}"
                                    BorderThickness="1,0,1,1"
                                    CornerRadius="0,0,8,8"/>
 
             <UserControl Height="16"/>
 
-            <settings:CheckboxCard x:Name="KillProcessesThatRefuseToDie"
+            <settings:CheckboxCard SettingName="KillProcessesThatRefuseToDie"
+                                   Text="{t:Translate Try to kill the processes that refuse to close when requested to}"
+                                   WarningText="{t:Translate You may lose unsaved data}"
                                    CornerRadius="8"/>
 
             <settings:TranslatedTextBlock Text="Automatic desktop shortcut remover"
@@ -33,22 +41,25 @@
                                           Margin="44,32,4,8"/>
 
             <settings:CheckboxButtonCard x:Name="AskToDeleteNewDesktopShortcuts"
+                                         SettingName="AskToDeleteNewDesktopShortcuts"
+                                         CheckboxText="{t:Translate Text='Ask to delete desktop shortcuts created during an install or upgrade.'}"
+                                         ButtonText="{t:Translate Manage shortcuts}"
                                          CornerRadius="8"/>
 
             <settings:TranslatedTextBlock Text="Related settings"
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:SettingsCard x:Name="UpdatesSettingsButton"
-                                   CornerRadius="8,8,0,0"
+            <settings:SettingsCard CornerRadius="8,8,0,0"
                                    IsClickEnabled="True"
+                                   Command="{Binding NavigateToUpdatesCommand}"
                                    Header="{t:Translate Package update preferences}"
                                    Description="{t:Translate Text='Update check frequency, automatically install updates, etc.'}"/>
 
-            <settings:SettingsCard x:Name="AdminButton"
-                                   BorderThickness="1,0,1,1"
+            <settings:SettingsCard BorderThickness="1,0,1,1"
                                    CornerRadius="0,0,8,8"
                                    IsClickEnabled="True"
+                                   Command="{Binding NavigateToAdministratorCommand}"
                                    Header="{t:Translate Administrator rights and other dangerous settings}"
                                    Description="{t:Translate Text='Reduce UAC prompts, elevate installations by default, unlock certain dangerous features, etc.'}"/>
 
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml.cs
index 155c457cc..042e79b1c 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Operations.axaml.cs
@@ -1,63 +1,29 @@
 using Avalonia.Controls;
 using UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
-using UniGetUI.Core.SettingsEngine;
 using UniGetUI.Core.Tools;
-using UniGetUI.PackageOperations;
 
 namespace UniGetUI.Avalonia.Views.Pages.SettingsPages;
 
 public sealed partial class Operations : UserControl, ISettingsPage
 {
+    private OperationsViewModel VM => (OperationsViewModel)DataContext!;
+
     public bool CanGoBack => true;
     public string ShortTitle => CoreTools.Translate("Package operation preferences");
 
     public event EventHandler? RestartRequired;
     public event EventHandler<Type>? NavigationRequested;
 
-    public void ShowRestartBanner(object? sender, EventArgs e) =>
-        RestartRequired?.Invoke(this, e);
-
     public Operations()
     {
         DataContext = new OperationsViewModel();
         InitializeComponent();
 
-        ParallelOperationCount.SettingName = Settings.K.ParallelOperationCount;
-        ParallelOperationCount.Text = CoreTools.Translate("Choose how many operations should be performed in parallel");
-        for (int i = 1; i <= 10; i++) ParallelOperationCount.AddItem(i.ToString(), i.ToString(), false);
-        foreach (var v in new[] { "15", "20", "30", "50", "75", "100" })
+        VM.RestartRequired += (s, e) => RestartRequired?.Invoke(s, e);
+        VM.NavigationRequested += (s, t) => NavigationRequested?.Invoke(s, t);
+
+        foreach (var v in VM.ParallelOpCounts)
             ParallelOperationCount.AddItem(v, v, false);
         ParallelOperationCount.ShowAddedItems();
-        ParallelOperationCount.ValueChanged += ParallelOperationCount_OnValueChanged;
-
-        MaintainSuccessfulInstalls.SettingName = Settings.K.MaintainSuccessfulInstalls;
-        MaintainSuccessfulInstalls.ForceInversion = true;
-        MaintainSuccessfulInstalls.WarningText = CoreTools.Translate("Download operations are not affected by this setting");
-        MaintainSuccessfulInstalls.Text = CoreTools.Translate("Clear successful operations from the operation list after a 5 second delay");
-
-        KillProcessesThatRefuseToDie.SettingName = Settings.K.KillProcessesThatRefuseToDie;
-        KillProcessesThatRefuseToDie.Text = CoreTools.Translate("Try to kill the processes that refuse to close when requested to");
-        KillProcessesThatRefuseToDie.WarningOpacity = 0.7;
-        KillProcessesThatRefuseToDie.WarningText = CoreTools.Translate("You may lose unsaved data");
-
-        AskToDeleteNewDesktopShortcuts.SettingName = Settings.K.AskToDeleteNewDesktopShortcuts;
-        AskToDeleteNewDesktopShortcuts.CheckboxText = CoreTools.Translate("Ask to delete desktop shortcuts created during an install or upgrade.");
-        AskToDeleteNewDesktopShortcuts.ButtonText = CoreTools.Translate("Manage shortcuts");
-        AskToDeleteNewDesktopShortcuts.Click += (_, _) =>
-        {
-            // DialogHelper.ManageDesktopShortcuts() — not yet ported; no-op on macOS
-        };
-
-        UpdatesSettingsButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Updates));
-        AdminButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Administrator));
-    }
-
-    private void ParallelOperationCount_OnValueChanged(object? sender, EventArgs e)
-    {
-        if (sender is UniGetUI.Avalonia.Views.Controls.Settings.ComboboxCard card &&
-            int.TryParse(card.SelectedValue(), out int value))
-        {
-            AbstractOperation.MAX_OPERATIONS = value;
-        }
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml
index 769371324..edc2eaa13 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml
@@ -15,7 +15,7 @@
                     Orientation="Horizontal"
                     VerticalAlignment="Center"
                     Margin="16,12,16,8">
-            <Button x:Name="BackButton"
+            <Button Command="{Binding BackCommand}"
                     Margin="0,0,12,0"
                     Padding="4"
                     Background="Transparent"
@@ -42,8 +42,8 @@
                 <TextBlock Text="{Binding RestartBannerText}"
                            VerticalAlignment="Center"
                            Margin="0,0,16,0"/>
-                <Button x:Name="RestartButton"
-                        Content="{Binding RestartButtonText}"
+                <Button Content="{Binding RestartButtonText}"
+                        Command="{Binding RestartAppCommand}"
                         HorizontalAlignment="Right"/>
             </StackPanel>
         </Border>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml.cs
index 6e25331a1..5703ebaf0 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsBasePage.axaml.cs
@@ -1,4 +1,3 @@
-using Avalonia;
 using Avalonia.Controls;
 using UniGetUI.Avalonia.ViewModels;
 using UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
@@ -31,8 +30,7 @@ public SettingsBasePage(bool isManagers)
         DataContext = new SettingsBasePageViewModel();
         InitializeComponent();
 
-        BackButton.Click += (_, _) => OnBackClicked();
-        RestartButton.Click += (_, _) => RestartApp();
+        VM.BackRequested += (_, _) => OnBackClicked();
 
         // Navigate to the appropriate homepage on first load
         NavigateToPage(isManagers ? GetManagersHomepage() : GetSettingsHomepage());
@@ -167,15 +165,4 @@ public void NavigateTo(Type page)
 
     private MainWindowViewModel? GetMainWindowViewModel() =>
         (TopLevel.GetTopLevel(this) is Window { DataContext: MainWindowViewModel vm }) ? vm : null;
-
-    private static void RestartApp()
-    {
-        var exe = Environment.ProcessPath;
-        if (exe is not null)
-            System.Diagnostics.Process.Start(
-                new System.Diagnostics.ProcessStartInfo(exe) { UseShellExecute = true });
-        (global::Avalonia.Application.Current?.ApplicationLifetime
-            as global::Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime)
-            ?.Shutdown();
-    }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml
index 66ce6aa63..bb1fd43b5 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml
@@ -13,82 +13,83 @@
         <StackPanel Orientation="Vertical" Margin="0,8">
 
             <!-- ── General ─────────────────────────────────────────────── -->
-            <settings:SettingsPageButton x:Name="GeneralButton"
-                CornerRadius="8"
+            <settings:SettingsPageButton CornerRadius="8"
                 Icon="Settings"
                 Text="{t:Translate General preferences}"
-                UnderText="{t:Translate Text='Language, theme and other miscellaneous preferences'}"/>
+                UnderText="{t:Translate Text='Language, theme and other miscellaneous preferences'}"
+                Command="{Binding NavigateToGeneralCommand}"/>
 
             <Border Height="16"/>
 
             <!-- ── Interface + Notifications ──────────────────────────── -->
-            <settings:SettingsPageButton x:Name="InterfaceButton"
-                CornerRadius="8,8,0,0"
+            <settings:SettingsPageButton CornerRadius="8,8,0,0"
                 Icon="Interactive"
                 Text="{t:Translate User interface preferences}"
-                UnderText="{t:Translate Text='Application theme, startup page, package icons, clear successful installs automatically'}"/>
-            <settings:SettingsPageButton x:Name="NotificationsButton"
-                BorderThickness="1,0,1,1"
+                UnderText="{t:Translate Text='Application theme, startup page, package icons, clear successful installs automatically'}"
+                Command="{Binding NavigateToInterfaceCommand}"/>
+            <settings:SettingsPageButton BorderThickness="1,0,1,1"
                 CornerRadius="0,0,8,8"
                 Icon="Megaphone"
                 Text="{t:Translate Notification preferences}"
-                UnderText="{t:Translate Show notifications on different events}"/>
+                UnderText="{t:Translate Show notifications on different events}"
+                Command="{Binding NavigateToNotificationsCommand}"/>
 
             <Border Height="16"/>
 
             <!-- ── Administrator ──────────────────────────────────────── -->
-            <settings:SettingsPageButton x:Name="AdministratorButton"
-                CornerRadius="8"
+            <settings:SettingsPageButton CornerRadius="8"
                 Icon="UAC"
                 Text="{t:Translate Administrator rights and other dangerous settings}"
-                UnderText="{t:Translate Text='Reduce UAC prompts, elevate installations by default, unlock certain dangerous features, etc.'}"/>
+                UnderText="{t:Translate Text='Reduce UAC prompts, elevate installations by default, unlock certain dangerous features, etc.'}"
+                Command="{Binding NavigateToAdministratorCommand}"/>
 
             <Border Height="16"/>
 
             <!-- ── Operations + Updates ───────────────────────────────── -->
-            <settings:SettingsPageButton x:Name="OperationsButton"
-                CornerRadius="8,8,0,0"
+            <settings:SettingsPageButton CornerRadius="8,8,0,0"
                 Icon="Package"
                 Text="{t:Translate Package operation preferences}"
-                UnderText="{t:Translate Text='Change how UniGetUI checks and installs available updates for your packages'}"/>
-            <settings:SettingsPageButton x:Name="UpdatesButton"
-                BorderThickness="1,0,1,1"
+                UnderText="{t:Translate Text='Change how UniGetUI checks and installs available updates for your packages'}"
+                Command="{Binding NavigateToOperationsCommand}"/>
+            <settings:SettingsPageButton BorderThickness="1,0,1,1"
                 CornerRadius="0,0,8,8"
                 Icon="Update"
                 Text="{t:Translate Package update preferences}"
-                UnderText="{t:Translate Text='Update check frequency, automatically install updates, etc.'}"/>
+                UnderText="{t:Translate Text='Update check frequency, automatically install updates, etc.'}"
+                Command="{Binding NavigateToUpdatesCommand}"/>
 
             <Border Height="16"/>
 
             <!-- ── Backup ─────────────────────────────────────────────── -->
-            <settings:SettingsPageButton x:Name="BackupButton"
-                CornerRadius="8"
+            <settings:SettingsPageButton CornerRadius="8"
                 Icon="Disk"
                 Text="{t:Translate Package backup}"
-                UnderText="{t:Translate Automatically save a list of all your installed packages to easily restore them.}"/>
+                UnderText="{t:Translate Automatically save a list of all your installed packages to easily restore them.}"
+                Command="{Binding NavigateToBackupCommand}"/>
 
             <Border Height="16"/>
 
             <!-- ── Managers ───────────────────────────────────────────── -->
-            <settings:SettingsPageButton x:Name="ManagersButton"
-                CornerRadius="8"
+            <settings:SettingsPageButton CornerRadius="8"
                 Icon="Search"
                 Text="{t:Translate Package manager preferences}"
-                UnderText="{t:Translate Text='Enable and disable package managers, change default install options, etc.'}"/>
+                UnderText="{t:Translate Text='Enable and disable package managers, change default install options, etc.'}"
+                Command="{Binding NavigateToManagersCommand}"/>
 
             <Border Height="16"/>
 
             <!-- ── Internet + Experimental ────────────────────────────── -->
-            <settings:SettingsPageButton x:Name="InternetButton"
-                CornerRadius="8,8,0,0"
+            <settings:SettingsPageButton CornerRadius="8,8,0,0"
                 Icon="Search"
                 Text="{t:Translate Internet connection settings}"
-                UnderText="{t:Translate Text='Proxy settings, etc.'}"/>
+                UnderText="{t:Translate Text='Proxy settings, etc.'}"
+                Command="{Binding NavigateToInternetCommand}"/>
             <settings:SettingsPageButton x:Name="ExperimentalButton"
                 BorderThickness="1,0,1,1"
                 CornerRadius="0,0,8,8"
                 Icon="Experimental"
-                Text="{t:Translate Experimental settings and developer options}"/>
+                Text="{t:Translate Experimental settings and developer options}"
+                Command="{Binding NavigateToExperimentalCommand}"/>
 
         </StackPanel>
     </ScrollViewer>
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml.cs
index e0107303d..dae777f45 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/SettingsHomepage.axaml.cs
@@ -17,16 +17,9 @@ public SettingsHomepage()
         DataContext = new SettingsHomepageViewModel();
         InitializeComponent();
 
-        GeneralButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(General));
-        InterfaceButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Interface_P));
-        NotificationsButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Notifications));
-        UpdatesButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Updates));
-        OperationsButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Operations));
-        InternetButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Internet));
-        BackupButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Backup));
-        AdministratorButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Administrator));
-        ExperimentalButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Experimental));
+        var vm = (SettingsHomepageViewModel)DataContext;
+        vm.NavigationRequested += (s, t) => NavigationRequested?.Invoke(s, t);
+
         ExperimentalButton.UnderText = CoreTools.Translate("Beta features and other options that shouldn't be touched");
-        ManagersButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(ManagersHomepage));
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml
index dee2d9736..6cf5449a7 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml
@@ -16,10 +16,15 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:CheckboxCard x:Name="DisableAutoCheckForUpdates"
+            <settings:CheckboxCard SettingName="DisableAutoCheckforUpdates"
+                                   Text="{t:Translate Check for package updates periodically}"
+                                   StateChangedCommand="{Binding UpdateAutoCheckEnabledCommand}"
                                    CornerRadius="8,8,0,0"/>
 
             <settings:ComboboxCard x:Name="UpdatesCheckIntervalSelector"
+                                   SettingName="UpdatesCheckInterval"
+                                   Text="{t:Translate Check for updates every:}"
+                                   ValueChangedCommand="{Binding ShowRestartRequiredCommand}"
                                    BorderThickness="1,0"
                                    CornerRadius="0,0,8,8"
                                    IsEnabled="{Binding IsAutoCheckEnabled}"/>
@@ -28,21 +33,28 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:CheckboxCard x:Name="AutomaticallyUpdatePackages"
+            <settings:CheckboxCard SettingName="AutomaticallyUpdatePackages"
+                                   Text="{t:Translate Install available updates automatically}"
                                    CornerRadius="8,8,0,0"
                                    IsEnabled="{Binding IsAutoCheckEnabled}"/>
 
-            <settings:CheckboxCard x:Name="DisableAUPOnMeteredConnections"
+            <settings:CheckboxCard SettingName="DisableAUPOnMeteredConnections"
+                                   ForceInversion="True"
+                                   Text="{t:Translate Do not automatically install updates when the network connection is metered}"
                                    BorderThickness="1,0"
                                    CornerRadius="0"
                                    IsEnabled="{Binding IsAutoCheckEnabled}"/>
 
-            <settings:CheckboxCard x:Name="DisableAUPOnBattery"
+            <settings:CheckboxCard SettingName="DisableAUPOnBattery"
+                                   ForceInversion="True"
+                                   Text="{t:Translate Do not automatically install updates when the device runs on battery}"
                                    BorderThickness="1,1,1,0"
                                    CornerRadius="0"
                                    IsEnabled="{Binding IsAutoCheckEnabled}"/>
 
-            <settings:CheckboxCard x:Name="DisableAUPOnBatterySaver"
+            <settings:CheckboxCard SettingName="DisableAUPOnBatterySaver"
+                                   ForceInversion="True"
+                                   Text="{t:Translate Do not automatically install updates when the battery saver is on}"
                                    CornerRadius="0,0,8,8"
                                    IsEnabled="{Binding IsAutoCheckEnabled}"/>
 
@@ -50,16 +62,16 @@
                                           FontWeight="SemiBold"
                                           Margin="44,32,4,8"/>
 
-            <settings:SettingsCard x:Name="OperationsSettingsButton"
-                                   BorderThickness="1,1,1,0"
+            <settings:SettingsCard BorderThickness="1,1,1,0"
                                    CornerRadius="8,8,0,0"
                                    IsClickEnabled="True"
+                                   Command="{Binding NavigateToOperationsCommand}"
                                    Header="{t:Translate Package operation preferences}"
                                    Description="{t:Translate Text='Change how UniGetUI handles install, update and uninstall operations.'}"/>
 
-            <settings:SettingsCard x:Name="AdminButton"
-                                   CornerRadius="0,0,8,8"
+            <settings:SettingsCard CornerRadius="0,0,8,8"
                                    IsClickEnabled="True"
+                                   Command="{Binding NavigateToAdministratorCommand}"
                                    Header="{t:Translate Administrator rights and other dangerous settings}"
                                    Description="{t:Translate Text='Reduce UAC prompts, elevate installations by default, unlock certain dangerous features, etc.'}"/>
 
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml.cs
index abb8d7945..f12c9e0c1 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Updates.axaml.cs
@@ -1,6 +1,5 @@
 using Avalonia.Controls;
 using UniGetUI.Avalonia.ViewModels.Pages.SettingsPages;
-using UniGetUI.Core.SettingsEngine;
 using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.Views.Pages.SettingsPages;
@@ -15,64 +14,16 @@ public sealed partial class Updates : UserControl, ISettingsPage
     public event EventHandler? RestartRequired;
     public event EventHandler<Type>? NavigationRequested;
 
-    public void ShowRestartBanner(object? sender, EventArgs e) =>
-        RestartRequired?.Invoke(this, e);
-
     public Updates()
     {
         DataContext = new UpdatesViewModel();
         InitializeComponent();
 
-        // Assign setting names and labels
-        DisableAutoCheckForUpdates.SettingName = Settings.K.DisableAutoCheckforUpdates;
-        DisableAutoCheckForUpdates.Text = CoreTools.Translate("Check for package updates periodically");
-
-        UpdatesCheckIntervalSelector.SettingName = Settings.K.UpdatesCheckInterval;
-        UpdatesCheckIntervalSelector.Text = CoreTools.Translate("Check for updates every:");
-        UpdatesCheckIntervalSelector.ValueChanged += ShowRestartBanner;
+        VM.RestartRequired += (s, e) => RestartRequired?.Invoke(s, e);
+        VM.NavigationRequested += (s, t) => NavigationRequested?.Invoke(s, t);
 
-        var updates_dict = new Dictionary<string, string>
-        {
-            { CoreTools.Translate("{0} minutes", 10), "600"    },
-            { CoreTools.Translate("{0} minutes", 30), "1800"   },
-            { CoreTools.Translate("1 hour"),           "3600"  },
-            { CoreTools.Translate("{0} hours", 2),    "7200"   },
-            { CoreTools.Translate("{0} hours", 4),    "14400"  },
-            { CoreTools.Translate("{0} hours", 8),    "28800"  },
-            { CoreTools.Translate("{0} hours", 12),   "43200"  },
-            { CoreTools.Translate("1 day"),            "86400" },
-            { CoreTools.Translate("{0} days", 2),    "172800"  },
-            { CoreTools.Translate("{0} days", 3),    "259200"  },
-            { CoreTools.Translate("1 week"),          "604800" },
-        };
-        foreach (var (name, val) in updates_dict)
+        foreach (var (name, val) in VM.IntervalItems)
             UpdatesCheckIntervalSelector.AddItem(name, val, false);
         UpdatesCheckIntervalSelector.ShowAddedItems();
-
-        AutomaticallyUpdatePackages.SettingName = Settings.K.AutomaticallyUpdatePackages;
-        AutomaticallyUpdatePackages.Text = CoreTools.Translate("Install available updates automatically");
-
-        DisableAUPOnMeteredConnections.SettingName = Settings.K.DisableAUPOnMeteredConnections;
-        DisableAUPOnMeteredConnections.ForceInversion = true;
-        DisableAUPOnMeteredConnections.Text = CoreTools.Translate("Do not automatically install updates when the network connection is metered");
-
-        DisableAUPOnBattery.SettingName = Settings.K.DisableAUPOnBattery;
-        DisableAUPOnBattery.ForceInversion = true;
-        DisableAUPOnBattery.Text = CoreTools.Translate("Do not automatically install updates when the device runs on battery");
-
-        DisableAUPOnBatterySaver.SettingName = Settings.K.DisableAUPOnBatterySaver;
-        DisableAUPOnBatterySaver.ForceInversion = true;
-        DisableAUPOnBatterySaver.Text = CoreTools.Translate("Do not automatically install updates when the battery saver is on");
-
-        // Wire navigation cards
-        OperationsSettingsButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Operations));
-        AdminButton.Click += (_, _) => NavigationRequested?.Invoke(this, typeof(Administrator));
-
-        // Set initial VM state from the auto-check toggle
-        VM.IsAutoCheckEnabled = DisableAutoCheckForUpdates._checkbox.IsChecked ?? false;
-
-        // Keep VM in sync with the toggle
-        DisableAutoCheckForUpdates._checkbox.IsCheckedChanged += (_, _) =>
-            VM.IsAutoCheckEnabled = DisableAutoCheckForUpdates._checkbox.IsChecked ?? false;
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/SidebarView.axaml b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
index 7aedc963d..5c7dba381 100644
--- a/src/UniGetUI.Avalonia/Views/SidebarView.axaml
+++ b/src/UniGetUI.Avalonia/Views/SidebarView.axaml
@@ -152,8 +152,8 @@
         <StackPanel Grid.Row="1" Margin="8,0,8,12" Spacing="2">
             <Separator Margin="8,4"/>
 
-            <Button x:Name="SettingsNavBtn"
-                    Click="SettingsNavBtn_Click"
+            <Button Command="{Binding RequestNavigationCommand}"
+                    CommandParameter="Settings"
                     HorizontalContentAlignment="Left"
                     HorizontalAlignment="Stretch"
                     Background="Transparent"
@@ -168,8 +168,8 @@
                 </StackPanel>
             </Button>
 
-            <Button x:Name="ManagersNavBtn"
-                    Click="ManagersNavBtn_Click"
+            <Button Command="{Binding RequestNavigationCommand}"
+                    CommandParameter="Managers"
                     HorizontalContentAlignment="Left"
                     HorizontalAlignment="Stretch"
                     Background="Transparent"
@@ -198,17 +198,17 @@
                 </StackPanel>
                 <Button.Flyout>
                     <MenuFlyout Placement="RightEdgeAlignedTop">
-                        <MenuItem Header="{t:Translate WingetUI Log}" Click="UniGetUILogs_Click"/>
-                        <MenuItem Header="{t:Translate Package Manager logs}" Click="ManagerLogsMenu_Click"/>
-                        <MenuItem Header="{t:Translate Operation history}" Click="OperationHistoryMenu_Click"/>
+                        <MenuItem Header="{t:Translate WingetUI Log}" Command="{Binding RequestNavigationCommand}" CommandParameter="OwnLog"/>
+                        <MenuItem Header="{t:Translate Package Manager logs}" Command="{Binding RequestNavigationCommand}" CommandParameter="ManagerLog"/>
+                        <MenuItem Header="{t:Translate Operation history}" Command="{Binding RequestNavigationCommand}" CommandParameter="OperationHistory"/>
                         <Separator/>
-                        <MenuItem x:Name="VersionMenuItem" Header="{t:Translate Version}" IsEnabled="False"/>
-                        <MenuItem Header="{t:Translate Release notes}" Click="ReleaseNotesMenu_Click"/>
+                        <MenuItem Header="{Binding VersionLabel}" IsEnabled="False"/>
+                        <MenuItem Header="{t:Translate Release notes}" Command="{Binding RequestNavigationCommand}" CommandParameter="ReleaseNotes"/>
                         <Separator/>
-                        <MenuItem Header="{t:Translate Help}" Click="HelpMenu_Click"/>
-                        <MenuItem Header="{t:Translate About}" Click="AboutNavButton_Click"/>
+                        <MenuItem Header="{t:Translate Help}" Command="{Binding RequestNavigationCommand}" CommandParameter="Help"/>
+                        <MenuItem Header="{t:Translate About}" Command="{Binding RequestNavigationCommand}" CommandParameter="About"/>
                         <Separator/>
-                        <MenuItem Header="{t:Translate Quit UniGetUI}" Click="QuitUniGetUI_Click"/>
+                        <MenuItem Header="{t:Translate Quit UniGetUI}" Command="{Binding RequestNavigationCommand}" CommandParameter="Quit"/>
                     </MenuFlyout>
                 </Button.Flyout>
             </Button>
diff --git a/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs b/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs
index b11331329..4d73c5d76 100644
--- a/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SidebarView.axaml.cs
@@ -1,8 +1,5 @@
 using Avalonia.Controls;
-using Avalonia.Interactivity;
 using UniGetUI.Avalonia.ViewModels;
-using UniGetUI.Core.Data;
-using UniGetUI.Core.Tools;
 
 namespace UniGetUI.Avalonia.Views;
 
@@ -13,7 +10,6 @@ public partial class SidebarView : BaseView<SidebarViewModel>
     public SidebarView()
     {
         InitializeComponent();
-        VersionMenuItem.Header = CoreTools.Translate("WingetUI Version {0}", CoreData.VersionName);
     }
 
     protected override void OnDataContextChanged(EventArgs e)
@@ -46,33 +42,6 @@ private void NavListBox_SelectionChanged(object? sender, SelectionChangedEventAr
         if (_lastNavItemSelectionWasAuto) return;
         if (NavListBox.SelectedItem is ListBoxItem item && item.Tag is string tag
             && Enum.TryParse<PageType>(tag, out var pageType))
-            ViewModel?.RequestNavigation(pageType);
+            ViewModel?.RequestNavigation(pageType.ToString());
     }
-
-    private void SettingsNavBtn_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel?.RequestNavigation(PageType.Settings);
-
-    private void ManagersNavBtn_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel?.RequestNavigation(PageType.Managers);
-
-    private void UniGetUILogs_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel?.RequestNavigation(PageType.OwnLog);
-
-    private void ManagerLogsMenu_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel?.RequestNavigation(PageType.ManagerLog);
-
-    private void OperationHistoryMenu_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel?.RequestNavigation(PageType.OperationHistory);
-
-    private void ReleaseNotesMenu_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel?.RequestNavigation(PageType.ReleaseNotes);
-
-    private void HelpMenu_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel?.RequestNavigation(PageType.Help);
-
-    private void AboutNavButton_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel?.RequestNavigation(PageType.About);
-
-    private void QuitUniGetUI_Click(object? sender, RoutedEventArgs e) =>
-        ViewModel?.RequestNavigation(PageType.Quit);
 }
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index cea649f33..173145534 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -108,14 +108,14 @@
                         </StackPanel>
                         <Button.Flyout>
                             <MenuFlyout Placement="BottomEdgeAlignedLeft">
-                                <MenuItem x:Name="OrderByName_Menu"       Header="{t:Translate Name}"        Click="OrderByName_Click"/>
-                                <MenuItem x:Name="OrderById_Menu"         Header="{t:Translate Id}"          Click="OrderById_Click"/>
-                                <MenuItem x:Name="OrderByVersion_Menu"    Header="{t:Translate Version}"     Click="OrderByVersion_Click"/>
-                                <MenuItem x:Name="OrderByNewVersion_Menu" Header="{t:Translate New version}" Click="OrderByNewVersion_Click"/>
-                                <MenuItem x:Name="OrderBySource_Menu"     Header="{t:Translate Source}"      Click="OrderBySource_Click"/>
+                                <MenuItem x:Name="OrderByName_Menu"       Header="{t:Translate Name}"        Command="{Binding SortByNameCommand}"/>
+                                <MenuItem x:Name="OrderById_Menu"         Header="{t:Translate Id}"          Command="{Binding SortByIdCommand}"/>
+                                <MenuItem x:Name="OrderByVersion_Menu"    Header="{t:Translate Version}"     Command="{Binding SortByVersionCommand}"/>
+                                <MenuItem x:Name="OrderByNewVersion_Menu" Header="{t:Translate New version}" Command="{Binding SortByNewVersionCommand}"/>
+                                <MenuItem x:Name="OrderBySource_Menu"     Header="{t:Translate Source}"      Command="{Binding SortBySourceCommand}"/>
                                 <Separator/>
-                                <MenuItem x:Name="OrderByAscending_Menu"  Header="{t:Translate Ascendant}"   Click="OrderByAscending_Click"/>
-                                <MenuItem x:Name="OrderByDescending_Menu" Header="{t:Translate Descendant}"  Click="OrderByDescending_Click"/>
+                                <MenuItem x:Name="OrderByAscending_Menu"  Header="{t:Translate Ascendant}"   Command="{Binding SetSortAscendingCommand}"/>
+                                <MenuItem x:Name="OrderByDescending_Menu" Header="{t:Translate Descendant}"  Command="{Binding SetSortDescendingCommand}"/>
                             </MenuFlyout>
                         </Button.Flyout>
                     </Button>
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
index 2266e0cb2..b3bf665f0 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml.cs
@@ -2,14 +2,12 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
-using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
 using UniGetUI.Avalonia.ViewModels.Pages;
 using UniGetUI.Avalonia.Views;
 using UniGetUI.Avalonia.Views.Controls;
 using UniGetUI.Core.Tools;
-using UniGetUI.PackageEngine.Classes.Manager.Classes;
 using UniGetUI.PackageEngine.Interfaces;
 using UniGetUI.PackageEngine.PackageClasses;
 
@@ -30,12 +28,40 @@ protected AbstractPackagesPage(PackagesPageData data)
 
         // Wire ViewModel events that need UI access
         ViewModel.FocusListRequested += OnFocusListRequested;
+        ViewModel.HelpRequested += () => GetMainWindow()?.Navigate(PageType.Help);
+        ViewModel.ManageIgnoredRequested += async () =>
+        {
+            if (GetMainWindow() is { } win)
+                await new ManageIgnoredUpdatesWindow().ShowDialog(win);
+        };
+        ViewModel.SharePackageRequested += async (pkgName, url) =>
+        {
+            if (GetMainWindow() is not { } win) return;
+            if (url is null)
+            {
+                await ViewModel.ShowInfoDialog(win,
+                    CoreTools.Translate("Nothing to share"),
+                    CoreTools.Translate("Please select a package first."));
+                return;
+            }
+            var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
+            if (clipboard is not null) await clipboard.SetTextAsync(url);
+            await ViewModel.ShowInfoDialog(win,
+                CoreTools.Translate("Share link copied"),
+                CoreTools.Translate("The share link for {0} has been copied to the clipboard.", pkgName ?? ""));
+        };
 
         // "New version" sort option is only relevant on the updates page
         OrderByNewVersion_Menu.IsVisible = ViewModel.RoleIsUpdateLike;
 
-        // Stamp initial checkmarks
+        // Stamp initial checkmarks, then keep them in sync with sort-property changes
         UpdateSortMenuChecks();
+        ViewModel.PropertyChanged += (_, args) =>
+        {
+            if (args.PropertyName is nameof(PackagesPageViewModel.SortFieldIndex)
+                                  or nameof(PackagesPageViewModel.SortAscending))
+                UpdateSortMenuChecks();
+        };
 
         // Build the toolbar now that both AXAML controls and the ViewModel are ready
         GenerateToolBar(ViewModel);
@@ -60,10 +86,7 @@ protected AbstractPackagesPage(PackagesPageData data)
     }
 
     // ─── UI-only: focus the package list ─────────────────────────────────────
-    private void OnFocusListRequested()
-    {
-        PackageList.Focus();
-    }
+    private void OnFocusListRequested() => PackageList.Focus();
 
     public void FocusPackageList() => ViewModel.RequestFocusList();
     public void FilterPackages() => ViewModel.FilterPackages();
@@ -106,59 +129,6 @@ protected void SetMainButtonDropdown(MenuFlyout flyout)
         MainToolbarButtonDropdown.Flyout = flyout;
     }
 
-    // ─── Toolbar builder helpers ───────────────────────────────────────────────
-    /// <summary>
-    /// Adds a button to the toolbar.
-    /// When <paramref name="showLabel"/> is false the label is shown only as a tooltip.
-    /// </summary>
-    protected Button AddToolbarButton(string svgName, string label, Action onClick, bool showLabel = true)
-    {
-        var icon = new SvgIcon
-        {
-            Path = $"avares://UniGetUI.Avalonia/Assets/Symbols/{svgName}.svg",
-            Width = 16,
-            Height = 16,
-            VerticalAlignment = VerticalAlignment.Center,
-        };
-
-        var content = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4 };
-        content.Children.Add(icon);
-        if (showLabel)
-        {
-            content.Children.Add(new TextBlock
-            {
-                Text = label,
-                FontSize = 12,
-                VerticalAlignment = VerticalAlignment.Center,
-            });
-        }
-
-        var btn = new Button
-        {
-            Height = 36,
-            Padding = new global::Avalonia.Thickness(8, 4),
-            CornerRadius = new global::Avalonia.CornerRadius(4),
-            Content = content,
-        };
-        ToolTip.SetTip(btn, label);
-        btn.Click += (_, _) => onClick();
-        ViewModel.ToolBarItems.Add(btn);
-        return btn;
-    }
-
-    /// <summary>Adds a thin vertical separator to the toolbar.</summary>
-    protected void AddToolbarSeparator()
-    {
-        ViewModel.ToolBarItems.Add(new Separator
-        {
-            Width = 1,
-            Height = 30,
-            Margin = new global::Avalonia.Thickness(4, 4),
-            Background = Application.Current?.FindResource("AppBorderBrush") as IBrush
-                         ?? new SolidColorBrush(Color.FromArgb(60, 255, 255, 255)),
-        });
-    }
-
     // ─── Package selection ────────────────────────────────────────────────────
     /// <summary>
     /// Returns the focused row's package, or the single checked package if
@@ -187,15 +157,7 @@ protected static Task LaunchInstall(
         bool? no_integrity = null)
         => PackagesPageViewModel.LaunchInstall(packages, elevated, interactive, no_integrity);
 
-    // ─── Order-by menu items (UI → ViewModel.SortFieldIndex / SortAscending) ───
-    private void OrderByName_Click(object? sender, RoutedEventArgs e) { ViewModel.SortFieldIndex = 0; UpdateSortMenuChecks(); }
-    private void OrderById_Click(object? sender, RoutedEventArgs e) { ViewModel.SortFieldIndex = 1; UpdateSortMenuChecks(); }
-    private void OrderByVersion_Click(object? sender, RoutedEventArgs e) { ViewModel.SortFieldIndex = 2; UpdateSortMenuChecks(); }
-    private void OrderByNewVersion_Click(object? sender, RoutedEventArgs e) { ViewModel.SortFieldIndex = 3; UpdateSortMenuChecks(); }
-    private void OrderBySource_Click(object? sender, RoutedEventArgs e) { ViewModel.SortFieldIndex = 4; UpdateSortMenuChecks(); }
-    private void OrderByAscending_Click(object? sender, RoutedEventArgs e) { ViewModel.SortAscending = true; UpdateSortMenuChecks(); }
-    private void OrderByDescending_Click(object? sender, RoutedEventArgs e) { ViewModel.SortAscending = false; UpdateSortMenuChecks(); }
-
+    // ─── Sort menu checkmarks (UI reacts to ViewModel sort changes) ───────────
     private static TextBlock? Check(bool show) =>
         show ? new TextBlock { Text = "✓", FontSize = 12 } : null;
 
@@ -264,93 +226,4 @@ private void PackageList_KeyDown(object? sender, KeyEventArgs e)
     protected static MainWindow? GetMainWindow()
         => Application.Current?.ApplicationLifetime
             is IClassicDesktopStyleApplicationLifetime { MainWindow: MainWindow w } ? w : null;
-
-    protected static void OpenHelp()
-        => GetMainWindow()?.Navigate(PageType.Help);
-
-    protected async Task ShowManageIgnoredAsync()
-    {
-        if (GetMainWindow() is not { } win) return;
-        await new ManageIgnoredUpdatesWindow().ShowDialog(win);
-    }
-
-    protected async Task SharePackage(IPackage? package)
-    {
-        if (GetMainWindow() is not { } win) return;
-
-        if (package is null || package.Source.IsVirtualManager)
-        {
-            await ShowInfoDialog(win,
-                CoreTools.Translate("Nothing to share"),
-                CoreTools.Translate("Please select a package first."));
-            return;
-        }
-
-        var url = "https://marticliment.com/unigetui/share?"
-            + "name=" + System.Web.HttpUtility.UrlEncode(package.Name)
-            + "&id=" + System.Web.HttpUtility.UrlEncode(package.Id)
-            + "&sourceName=" + System.Web.HttpUtility.UrlEncode(package.Source.Name)
-            + "&managerName=" + System.Web.HttpUtility.UrlEncode(package.Manager.Name);
-
-        var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
-        if (clipboard is not null) await clipboard.SetTextAsync(url);
-
-        await ShowInfoDialog(win,
-            CoreTools.Translate("Share link copied"),
-            CoreTools.Translate("The share link for {0} has been copied to the clipboard.", package.Name));
-    }
-
-    private static async Task ShowInfoDialog(Window owner, string title, string message)
-    {
-        object? bgResource = null;
-        Application.Current?.Resources.TryGetResource("AppWindowBackground", Application.Current.ActualThemeVariant, out bgResource);
-        var dialog = new Window
-        {
-            Width = 460,
-            Height = 180,
-            CanResize = false,
-            ShowInTaskbar = false,
-            WindowStartupLocation = WindowStartupLocation.CenterOwner,
-            Title = title,
-            Background = bgResource as IBrush,
-        };
-
-        var okBtn = new Button
-        {
-            Content = CoreTools.Translate("OK"),
-            MinWidth = 80,
-            CornerRadius = new CornerRadius(4),
-            HorizontalAlignment = HorizontalAlignment.Right,
-        };
-        okBtn.Classes.Add("accent");
-        okBtn.Click += (_, _) => dialog.Close();
-
-        var root = new Grid
-        {
-            Margin = new global::Avalonia.Thickness(20),
-            RowDefinitions = new RowDefinitions("Auto,*,Auto"),
-            RowSpacing = 12,
-        };
-        var titleBlock = new TextBlock
-        {
-            Text = title,
-            FontSize = 16,
-            FontWeight = FontWeight.SemiBold,
-        };
-        var msgBlock = new TextBlock
-        {
-            Text = message,
-            TextWrapping = TextWrapping.Wrap,
-            Opacity = 0.85,
-        };
-        Grid.SetRow(titleBlock, 0);
-        Grid.SetRow(msgBlock, 1);
-        Grid.SetRow(okBtn, 2);
-        root.Children.Add(titleBlock);
-        root.Children.Add(msgBlock);
-        root.Children.Add(okBtn);
-        dialog.Content = root;
-
-        await dialog.ShowDialog(owner);
-    }
 }
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/DiscoverSoftwarePage.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/DiscoverSoftwarePage.cs
index faefaa234..abe710e6c 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/DiscoverSoftwarePage.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/DiscoverSoftwarePage.cs
@@ -67,20 +67,20 @@ protected override void GenerateToolBar(PackagesPageViewModel vm)
         downloadInstallers.Click += (_, _) => { /* TODO: download-only operation not yet ported */ };
 
         // ── Toolbar buttons ─────────────────────────────────────────────────
-        AddToolbarSeparator();
-        AddToolbarButton("options", CoreTools.Translate("Install options"),
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("options", CoreTools.Translate("Install options"),
             () => _ = ShowInstallationOptionsForPackage(SelectedItem));
-        AddToolbarSeparator();
-        AddToolbarButton("info_round", CoreTools.Translate("Package details"),
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("info_round", CoreTools.Translate("Package details"),
             () => _ = ShowDetailsForPackage(SelectedItem), showLabel: false);
-        AddToolbarButton("share", CoreTools.Translate("Share"),
-            () => _ = SharePackage(SelectedItem), showLabel: false);
-        AddToolbarSeparator();
-        AddToolbarButton("add_to", CoreTools.Translate("Add selection to bundle"),
+        ViewModel.AddToolbarButton("share", CoreTools.Translate("Share"),
+            () => vm.RequestShareCommand.Execute(SelectedItem), showLabel: false);
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("add_to", CoreTools.Translate("Add selection to bundle"),
             () => _ = ExportSelectionToBundleAsync(vm));
-        AddToolbarSeparator();
-        AddToolbarButton("help", CoreTools.Translate("Help"),
-            OpenHelp);
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("help", CoreTools.Translate("Help"),
+            () => vm.RequestHelpCommand.Execute(null));
     }
 
     // ─── Context menu ─────────────────────────────────────────────────────────
@@ -121,7 +121,7 @@ protected override void GenerateToolBar(PackagesPageViewModel vm)
         menuInstallOptions.Click += (_, _) => _ = ShowInstallationOptionsForPackage(SelectedItem);
 
         var menuShare = new MenuItem { Header = CoreTools.AutoTranslated("Share this package"), Icon = LoadMenuIcon("share") };
-        menuShare.Click += (_, _) => _ = SharePackage(SelectedItem);
+        menuShare.Click += (_, _) => ViewModel.RequestShareCommand.Execute(SelectedItem);
 
         var menuDetails = new MenuItem { Header = CoreTools.AutoTranslated("Package details"), Icon = LoadMenuIcon("info_round") };
         menuDetails.Click += (_, _) => _ = ShowDetailsForPackage(SelectedItem);
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/InstalledPackagesPage.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/InstalledPackagesPage.cs
index c34b279b1..7e3bb9012 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/InstalledPackagesPage.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/InstalledPackagesPage.cs
@@ -71,16 +71,16 @@ protected override void GenerateToolBar(PackagesPageViewModel vm)
         downloadInstallers.Click += (_, _) => { /* TODO: download-only operation not yet ported */ };
 
         // ── Toolbar buttons ─────────────────────────────────────────────────
-        AddToolbarSeparator();
-        AddToolbarButton("options", CoreTools.Translate("Uninstall options"),
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("options", CoreTools.Translate("Uninstall options"),
             () => _ = ShowInstallationOptionsForPackage(SelectedItem), showLabel: false);
-        AddToolbarSeparator();
-        AddToolbarButton("info_round", CoreTools.Translate("Package details"),
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("info_round", CoreTools.Translate("Package details"),
             () => _ = ShowDetailsForPackage(SelectedItem), showLabel: false);
-        AddToolbarButton("share", CoreTools.Translate("Share"),
-            () => _ = SharePackage(SelectedItem), showLabel: false);
-        AddToolbarSeparator();
-        AddToolbarButton("pin", CoreTools.Translate("Ignore selected packages"), async () =>
+        ViewModel.AddToolbarButton("share", CoreTools.Translate("Share"),
+            () => vm.RequestShareCommand.Execute(SelectedItem), showLabel: false);
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("pin", CoreTools.Translate("Ignore selected packages"), async () =>
         {
             foreach (var pkg in vm.FilteredPackages.GetCheckedPackages())
             {
@@ -91,13 +91,14 @@ protected override void GenerateToolBar(PackagesPageViewModel vm)
                 }
             }
         });
-        AddToolbarButton("clipboard_list", CoreTools.Translate("Manage ignored updates"),
-            () => _ = ShowManageIgnoredAsync());
-        AddToolbarSeparator();
-        AddToolbarButton("add_to", CoreTools.Translate("Add selection to bundle"),
+        ViewModel.AddToolbarButton("clipboard_list", CoreTools.Translate("Manage ignored updates"),
+            () => vm.RequestManageIgnoredCommand.Execute(null));
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("add_to", CoreTools.Translate("Add selection to bundle"),
             () => _ = ExportSelectionToBundleAsync(vm));
-        AddToolbarSeparator();
-        AddToolbarButton("help", CoreTools.Translate("Help"), OpenHelp);
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("help", CoreTools.Translate("Help"),
+            () => vm.RequestHelpCommand.Execute(null));
     }
 
     // ─── Context menu ─────────────────────────────────────────────────────────
@@ -178,7 +179,7 @@ protected override void GenerateToolBar(PackagesPageViewModel vm)
             Header = CoreTools.AutoTranslated("Share this package"),
             Icon = LoadMenuIcon("share"),
         };
-        _menuShare.Click += (_, _) => _ = SharePackage(SelectedItem);
+        _menuShare.Click += (_, _) => ViewModel.RequestShareCommand.Execute(SelectedItem);
 
         _menuDetails = new MenuItem
         {
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/PackageBundlesPage.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/PackageBundlesPage.cs
index 43f2c642e..382b5bc98 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/PackageBundlesPage.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/PackageBundlesPage.cs
@@ -97,26 +97,27 @@ protected override void GenerateToolBar(PackagesPageViewModel vm)
         installSkipHash.Click += (_, _) => _ = ImportAndInstallPackage(GetCheckedNonInstalledPackages(vm), skiphash: true);
         downloadInstallers.Click += (_, _) => { /* TODO: download-only operation not yet ported */ };
 
-        AddToolbarSeparator();
-        AddToolbarButton("add_to", CoreTools.Translate("New"),
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("add_to", CoreTools.Translate("New"),
             () => _ = AskForNewBundle());
-        AddToolbarButton("open_folder", CoreTools.Translate("Open"),
+        ViewModel.AddToolbarButton("open_folder", CoreTools.Translate("Open"),
             () => _ = AskOpenFromFile());
-        AddToolbarButton("save_as", CoreTools.Translate("Save as"),
+        ViewModel.AddToolbarButton("save_as", CoreTools.Translate("Save as"),
             () => _ = SaveFile());
-        AddToolbarSeparator();
-        AddToolbarButton("delete", CoreTools.Translate("Remove selection from bundle"), () =>
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("delete", CoreTools.Translate("Remove selection from bundle"), () =>
         {
             HasUnsavedChanges = true;
             _loader.RemoveRange(vm.FilteredPackages.GetCheckedPackages());
         });
-        AddToolbarSeparator();
-        AddToolbarButton("info_round", CoreTools.Translate("Package details"),
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("info_round", CoreTools.Translate("Package details"),
             () => _ = ShowDetailsForPackage(SelectedItem), showLabel: false);
-        AddToolbarButton("share", CoreTools.Translate("Share"),
-            () => _ = SharePackage(SelectedItem), showLabel: false);
-        AddToolbarSeparator();
-        AddToolbarButton("help", CoreTools.Translate("Help"), OpenHelp);
+        ViewModel.AddToolbarButton("share", CoreTools.Translate("Share"),
+            () => vm.RequestShareCommand.Execute(SelectedItem), showLabel: false);
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("help", CoreTools.Translate("Help"),
+            () => vm.RequestHelpCommand.Execute(null));
     }
 
     private static IReadOnlyList<IPackage> GetCheckedNonInstalledPackages(PackagesPageViewModel vm)
@@ -168,7 +169,7 @@ private static IReadOnlyList<IPackage> GetCheckedNonInstalledPackages(PackagesPa
         };
 
         _menuShare = new MenuItem { Header = CoreTools.AutoTranslated("Share this package"), Icon = LoadMenuIcon("share") };
-        _menuShare.Click += (_, _) => _ = SharePackage(SelectedItem);
+        _menuShare.Click += (_, _) => ViewModel.RequestShareCommand.Execute(SelectedItem);
 
         _menuDetails = new MenuItem { Header = CoreTools.AutoTranslated("Package details"), Icon = LoadMenuIcon("info_round") };
         _menuDetails.Click += (_, _) => _ = ShowDetailsForPackage(SelectedItem);
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareUpdatesPage.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareUpdatesPage.cs
index 886d80b68..0715b7b58 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareUpdatesPage.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareUpdatesPage.cs
@@ -77,16 +77,16 @@ protected override void GenerateToolBar(PackagesPageViewModel vm)
         uninstallSelected.Click += (_, _) => _ = LaunchUninstallFromUpdates(vm.FilteredPackages.GetCheckedPackages());
 
         // ── Toolbar buttons ─────────────────────────────────────────────────
-        AddToolbarSeparator();
-        AddToolbarButton("options", CoreTools.Translate("Update options"),
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("options", CoreTools.Translate("Update options"),
             () => _ = ShowInstallationOptionsForPackage(SelectedItem), showLabel: false);
-        AddToolbarSeparator();
-        AddToolbarButton("info_round", CoreTools.Translate("Package details"),
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("info_round", CoreTools.Translate("Package details"),
             () => _ = ShowDetailsForPackage(SelectedItem), showLabel: false);
-        AddToolbarButton("share", CoreTools.Translate("Share"),
-            () => _ = SharePackage(SelectedItem), showLabel: false);
-        AddToolbarSeparator();
-        AddToolbarButton("pin", CoreTools.Translate("Ignore selected packages"), async () =>
+        ViewModel.AddToolbarButton("share", CoreTools.Translate("Share"),
+            () => vm.RequestShareCommand.Execute(SelectedItem), showLabel: false);
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("pin", CoreTools.Translate("Ignore selected packages"), async () =>
         {
             foreach (var pkg in vm.FilteredPackages.GetCheckedPackages())
             {
@@ -95,10 +95,11 @@ protected override void GenerateToolBar(PackagesPageViewModel vm)
                 UpgradablePackagesLoader.Instance.IgnoredPackages[pkg.Id] = pkg;
             }
         });
-        AddToolbarButton("clipboard_list", CoreTools.Translate("Manage ignored updates"),
-            () => _ = ShowManageIgnoredAsync());
-        AddToolbarSeparator();
-        AddToolbarButton("help", CoreTools.Translate("Help"), OpenHelp);
+        ViewModel.AddToolbarButton("clipboard_list", CoreTools.Translate("Manage ignored updates"),
+            () => vm.RequestManageIgnoredCommand.Execute(null));
+        ViewModel.AddToolbarSeparator();
+        ViewModel.AddToolbarButton("help", CoreTools.Translate("Help"),
+            () => vm.RequestHelpCommand.Execute(null));
     }
 
     // ─── Context menu ─────────────────────────────────────────────────────────
@@ -231,7 +232,7 @@ protected override void GenerateToolBar(PackagesPageViewModel vm)
             Header = CoreTools.AutoTranslated("Share this package"),
             Icon = LoadMenuIcon("share"),
         };
-        menuShare.Click += (_, _) => _ = SharePackage(SelectedItem);
+        menuShare.Click += (_, _) => ViewModel.RequestShareCommand.Execute(SelectedItem);
 
         var menuDetails = new MenuItem
         {

From 62136c8066a221cddfa0771d513997b182d06f0f Mon Sep 17 00:00:00 2001
From: Gabriel Dufresne <gabrielduf@hotmail.com>
Date: Wed, 25 Mar 2026 15:49:41 -0400
Subject: [PATCH 7/8] Removed extra blank lines

---
 .../Views/Pages/SettingsPages/Internet.axaml.cs                 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml.cs b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml.cs
index 7d31ee902..aa473fbe3 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Internet.axaml.cs
@@ -19,8 +19,6 @@ public sealed partial class Internet : UserControl, ISettingsPage
     public event EventHandler? RestartRequired;
     public event EventHandler<Type>? NavigationRequested { add { } remove { } }
 
-
-
     public Internet()
     {
         DataContext = new InternetViewModel();

From 5fa8809c3e8e7d847d4e526116a7fa0b351db405 Mon Sep 17 00:00:00 2001
From: Gabriel Dufresne <gabrielduf@hotmail.com>
Date: Thu, 26 Mar 2026 08:42:38 -0400
Subject: [PATCH 8/8] made some changes mentioned by Copilot.

---
 .../ViewModels/SidebarViewModel.cs              |  4 ++--
 .../Views/Controls/Settings/SettingsCard.cs     | 17 +++++++++--------
 .../Pages/SettingsPages/Notifications.axaml     |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs
index 468e10427..b51b9769e 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SidebarViewModel.cs
@@ -47,11 +47,11 @@ partial void OnBundlesBadgeVisibleChanged(bool _)
 
     // ─── Pane open/closed ─────────────────────────────────────────────────────
     [ObservableProperty]
-    private bool _isPaneOpen = false;
+    private bool isPaneOpen = !Settings.Get(Settings.K.CollapseNavMenuOnWideScreen);
 
     partial void OnIsPaneOpenChanged(bool value)
     {
-        Settings.Set(Settings.K.CollapseNavMenuOnWideScreen, value);
+        Settings.Set(Settings.K.CollapseNavMenuOnWideScreen, !value);
         OnPropertyChanged(nameof(PaneWidth));
         OnPropertyChanged(nameof(UpdatesBadgeExpandedVisible));
         OnPropertyChanged(nameof(UpdatesBadgeCompactVisible));
diff --git a/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs b/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs
index 24ebcffbb..4f716b2f8 100644
--- a/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs
+++ b/src/UniGetUI.Avalonia/Views/Controls/Settings/SettingsCard.cs
@@ -233,13 +233,14 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
 
     private void OnPointerPressed(object? sender, PointerPressedEventArgs e)
     {
-        if (_isClickEnabled)
-        {
-            Click?.Invoke(this, new RoutedEventArgs());
-            var cmd = Command;
-            var param = CommandParameter;
-            if (cmd?.CanExecute(param) == true)
-                cmd.Execute(param);
-        }
+        if (!_isClickEnabled) return;
+        if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
+
+        e.Handled = true;
+        Click?.Invoke(this, new RoutedEventArgs());
+        var cmd = Command;
+        var param = CommandParameter;
+        if (cmd?.CanExecute(param) == true)
+            cmd.Execute(param);
     }
 }
diff --git a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml
index 5b9adc732..614a6a607 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/SettingsPages/Notifications.axaml
@@ -44,7 +44,7 @@
                                    CornerRadius="0"
                                    IsEnabled="{Binding IsNotificationsEnabled}"/>
 
-            <settings:CheckboxCard SettingName="DisableUpdatesNotifications"
+            <settings:CheckboxCard SettingName="DisableErrorNotifications"
                                    Text="{t:Translate Show a notification when an operation fails}"
                                    CornerRadius="0"
                                    IsEnabled="{Binding IsNotificationsEnabled}"/>