diff --git a/CHANGELOG.md b/CHANGELOG.md
index b81501b3..ed4000d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,20 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - **Traceroute live output** — ConsoleView with hop-by-hop results and explanations
   (gateway detection, ISP backbone, filtered nodes, destination reached).
 
+### Fixed
+- **DashboardView** — replaced 30+ hardcoded hex colors with StaticResource tokens
+  (Surface1, Surface2, Border1, TextPrimary, TextSecondary, Info).
+- **AppBlockerView** — full structural modernization (Display header, Card wrappers,
+  button styles, DataGrid accessibility, Background, margins).
+- **DnsHostsView** — DataGrid grid-lines removed, accessibility name added, text token.
+- **ObservableCollection → BulkObservableCollection** — AppAlerts, AppBlocker,
+  ShortcutCleaner now use single-notification ReplaceWith() instead of N Add() events.
+- **Missing toast notifications** — added on Drivers, Services, ShortcutCleaner,
+  DeepCleanup (3 operations), NetworkRepair.
+- **UninstallerView** — hardcoded `#6366F1` replaced with `{StaticResource Accent}`.
+
+## [1.10.1] - 2026-05-26
+
 ### Fixed
 - **UI uniformity audit** — replaced all remaining CheckBoxes with purple ToggleSwitch on:
   Performance (5 toggles), Logs (5 severity filters), Ping targets, Process Manager,
@@ -38,6 +52,13 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - **Startup Manager hide system** — toggle to filter out Windows/Microsoft system entries.
 - **Filter chip styles** — reusable green/amber/red radio pill components.
 
+## [1.9.1] - 2026-05-26
+
+### Fixed
+- **Startup Manager columns** — reduced fixed widths to prevent last column overflow.
+- **Startup Manager icons** — use extracted executable path for more accurate icon resolution.
+- **Windows Update live output** — increased MinHeight/MaxHeight for better visibility.
+
 ## [1.9.0] - 2026-05-26
 
 ### Added
diff --git a/SysManager/SysManager/ViewModels/AppAlertsViewModel.cs b/SysManager/SysManager/ViewModels/AppAlertsViewModel.cs
index 93aa4e09..35c8b4cf 100644
--- a/SysManager/SysManager/ViewModels/AppAlertsViewModel.cs
+++ b/SysManager/SysManager/ViewModels/AppAlertsViewModel.cs
@@ -2,12 +2,12 @@
 // Author: laurentiu021 · https://github.com/laurentiu021/SystemManager
 // License: MIT
 
-using System.Collections.ObjectModel;
 using System.Windows;
 using System.Windows.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Serilog;
+using SysManager.Helpers;
 using SysManager.Models;
 using SysManager.Services;
 
@@ -22,7 +22,7 @@ public sealed partial class AppAlertsViewModel : ViewModelBase
     private readonly AppAlertService _service;
     private readonly Dispatcher _dispatcher;
 
-    public ObservableCollection<AppInstallEntry> Alerts { get; } = new();
+    public BulkObservableCollection<AppInstallEntry> Alerts { get; } = new();
 
     [ObservableProperty] private bool _isMonitoring;
     [ObservableProperty] private string _monitorStatus = "Click Start to begin monitoring for new installations.";
@@ -90,13 +90,13 @@ private void RefreshInstalledApps()
         try
         {
             var apps = AppAlertService.GetRegistryApps();
-            Alerts.Clear();
-            foreach (var app in apps.OrderBy(a => a.Name))
+            var sorted = apps.OrderBy(a => a.Name).ToList();
+            foreach (var app in sorted)
             {
                 app.DetectedAt = DateTime.Now;
                 app.IsAcknowledged = true;
-                Alerts.Add(app);
             }
+            Alerts.ReplaceWith(sorted);
             AlertCount = Alerts.Count;
             UnacknowledgedCount = 0;
             MonitorStatus = $"Loaded {AlertCount} currently installed applications.";
diff --git a/SysManager/SysManager/ViewModels/AppBlockerViewModel.cs b/SysManager/SysManager/ViewModels/AppBlockerViewModel.cs
index 95d5ee18..3bd78864 100644
--- a/SysManager/SysManager/ViewModels/AppBlockerViewModel.cs
+++ b/SysManager/SysManager/ViewModels/AppBlockerViewModel.cs
@@ -2,7 +2,6 @@
 // Author: laurentiu021 · https://github.com/laurentiu021/SystemManager
 // License: MIT
 
-using System.Collections.ObjectModel;
 using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -19,7 +18,7 @@ namespace SysManager.ViewModels;
 /// </summary>
 public sealed partial class AppBlockerViewModel : ViewModelBase
 {
-    public ObservableCollection<BlockedApp> BlockedApps { get; } = new();
+    public BulkObservableCollection<BlockedApp> BlockedApps { get; } = new();
 
     [ObservableProperty] private string _newExeName = "";
     [ObservableProperty] private string _blockStatus = "Enter an executable name and click Block to prevent it from running.";
@@ -42,10 +41,8 @@ private void RelaunchAsAdmin()
     [RelayCommand]
     private void RefreshList()
     {
-        BlockedApps.Clear();
         var apps = AppBlockerService.GetBlockedApps();
-        foreach (var a in apps)
-            BlockedApps.Add(a);
+        BlockedApps.ReplaceWith(apps);
         BlockedCount = BlockedApps.Count;
         BlockStatus = BlockedCount == 0
             ? "No applications are currently blocked."
diff --git a/SysManager/SysManager/ViewModels/DeepCleanupViewModel.cs b/SysManager/SysManager/ViewModels/DeepCleanupViewModel.cs
index eee0f49e..03f5d08f 100644
--- a/SysManager/SysManager/ViewModels/DeepCleanupViewModel.cs
+++ b/SysManager/SysManager/ViewModels/DeepCleanupViewModel.cs
@@ -187,6 +187,7 @@ private async Task ScanCoreAsync()
             var total = cats.Sum(c => c.TotalSizeBytes);
             ScanSummary = $"Found {FormatHelper.FormatSize(total)} across {cats.Count} categories. Untick anything you want to keep.";
             ScanStatusLine = "Scan complete.";
+            ToastService.Instance.Show("Deep cleanup scan complete", $"{FormatHelper.FormatSize(total)} across {cats.Count} categories");
             Log.Information("Deep cleanup scan completed: {Size} across {Count} categories",
                 FormatHelper.FormatSize(total), cats.Count);
             OnPropertyChanged(nameof(TotalSelectedBytes));
@@ -227,6 +228,7 @@ private async Task CleanAsync()
             var result = await _cleanup.CleanAsync(Categories, progress, _cleanCts.Token);
             CleanSummary = result.Summary;
             CleanStatusLine = "Clean complete.";
+            ToastService.Instance.Show("Deep cleanup complete", result.Summary);
             Log.Information("Deep cleanup completed");
             await ScanCoreAsync();
         }
@@ -293,6 +295,7 @@ private async Task ScanLargeFilesAsync()
                 ct: _largeCts.Token);
             LargeFiles.ReplaceWith(list);
             LargeScanStatus = $"Found {list.Count} files ≥ {MinSizeMB} MB in {SelectedLocation.Label.Trim()}.";
+            ToastService.Instance.Show("Large file scan complete", $"{list.Count} files found ≥ {MinSizeMB} MB");
             Log.Information("Large file scan completed: {Count} files ≥ {MinSize} MB",
                 list.Count, MinSizeMB);
         }
diff --git a/SysManager/SysManager/ViewModels/DriversViewModel.cs b/SysManager/SysManager/ViewModels/DriversViewModel.cs
index 7bc1d2b0..eeeac420 100644
--- a/SysManager/SysManager/ViewModels/DriversViewModel.cs
+++ b/SysManager/SysManager/ViewModels/DriversViewModel.cs
@@ -2,7 +2,6 @@
 // Author: laurentiu021 · https://github.com/laurentiu021/SystemManager
 // License: MIT
 
-using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Text.Json;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -69,6 +68,7 @@ await _runner.RunScriptViaPwshAsync(@"
             Summary = $"{_allDrivers.Count} drivers found" +
                       (HideSystemDrivers ? $" ({DriverCount} shown, system drivers hidden)." : ".");
             StatusMessage = "Done";
+            ToastService.Instance.Show("Driver scan complete", $"{_allDrivers.Count} drivers found");
         }
         catch (OperationCanceledException) { StatusMessage = "Cancelled."; }
         catch (InvalidOperationException ex) { StatusMessage = ex.Message; }
diff --git a/SysManager/SysManager/ViewModels/NetworkRepairViewModel.cs b/SysManager/SysManager/ViewModels/NetworkRepairViewModel.cs
index 43ba47b8..3f646406 100644
--- a/SysManager/SysManager/ViewModels/NetworkRepairViewModel.cs
+++ b/SysManager/SysManager/ViewModels/NetworkRepairViewModel.cs
@@ -92,7 +92,10 @@ private async Task RunRepairAsync(
                 ? $"✓ {r.ToolName} completed successfully."
                 : $"✗ {r.ToolName} failed: {r.Output}";
             if (r.Success)
+            {
+                ToastService.Instance.Show("Network repair complete", $"{r.ToolName} completed successfully");
                 Log.Information("Network repair completed: {Tool}", r.ToolName);
+            }
             else
                 Log.Warning("Network repair failed: {Tool}", r.ToolName);
             if (r.NeedsReboot && r.Success)
diff --git a/SysManager/SysManager/ViewModels/ServicesViewModel.cs b/SysManager/SysManager/ViewModels/ServicesViewModel.cs
index 6b89e7e6..ae15ac0b 100644
--- a/SysManager/SysManager/ViewModels/ServicesViewModel.cs
+++ b/SysManager/SysManager/ViewModels/ServicesViewModel.cs
@@ -2,7 +2,6 @@
 // Author: laurentiu021 · https://github.com/laurentiu021/SystemManager
 // License: MIT
 
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -89,6 +88,7 @@ private void ApplyFilterCore()
         RunningCount = _allServices.Count(s => s.Status == "Running");
         ApplyFilter();
         StatusMessage = $"Loaded {TotalCount} services ({RunningCount} running).";
+        ToastService.Instance.Show("Services refreshed", $"{TotalCount} services ({RunningCount} running)");
     }
 
     [RelayCommand]
diff --git a/SysManager/SysManager/ViewModels/ShortcutCleanerViewModel.cs b/SysManager/SysManager/ViewModels/ShortcutCleanerViewModel.cs
index 9aa8ccd2..d829593c 100644
--- a/SysManager/SysManager/ViewModels/ShortcutCleanerViewModel.cs
+++ b/SysManager/SysManager/ViewModels/ShortcutCleanerViewModel.cs
@@ -2,11 +2,11 @@
 // Author: laurentiu021 · https://github.com/laurentiu021/SystemManager
 // License: MIT
 
-using System.Collections.ObjectModel;
 using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Serilog;
+using SysManager.Helpers;
 using SysManager.Models;
 using SysManager.Services;
 
@@ -20,7 +20,7 @@ public sealed partial class ShortcutCleanerViewModel : ViewModelBase
     private readonly ShortcutCleanerService _service;
     private CancellationTokenSource? _cts;
 
-    public ObservableCollection<BrokenShortcut> BrokenShortcuts { get; } = new();
+    public BulkObservableCollection<BrokenShortcut> BrokenShortcuts { get; } = new();
 
     [ObservableProperty] private string _scanStatus = "Click Scan to find broken shortcuts.";
     [ObservableProperty] private string _currentLocation = "";
@@ -53,7 +53,7 @@ private async Task ScanAsync()
         // PropertyChanged lambda leaks across rescans.
         foreach (var old in BrokenShortcuts)
             old.PropertyChanged -= OnShortcutPropertyChanged;
-        BrokenShortcuts.Clear();
+        BrokenShortcuts.ReplaceWith(Array.Empty<BrokenShortcut>());
         BrokenCount = 0;
         SelectedCount = 0;
         ScanStatus = "Scanning...";
@@ -66,10 +66,8 @@ private async Task ScanAsync()
             var results = await _service.ScanAsync(progress, _cts.Token);
 
             foreach (var s in results)
-            {
                 s.PropertyChanged += OnShortcutPropertyChanged;
-                BrokenShortcuts.Add(s);
-            }
+            BrokenShortcuts.ReplaceWith(results);
 
             BrokenCount = BrokenShortcuts.Count;
             SelectedCount = BrokenShortcuts.Count(x => x.IsSelected);
@@ -78,6 +76,7 @@ private async Task ScanAsync()
                 : $"Found {BrokenCount} broken shortcut{(BrokenCount == 1 ? "" : "s")}.";
             CurrentLocation = "";
             Log.Information("Shortcut scan completed: {Count} broken shortcuts found", BrokenCount);
+            ToastService.Instance.Show("Shortcut scan complete", $"{BrokenCount} broken shortcut{(BrokenCount == 1 ? "" : "s")} found");
         }
         catch (OperationCanceledException) { ScanStatus = "Scan cancelled."; }
         catch (System.IO.IOException ex) { ScanStatus = $"Scan failed: {ex.Message}"; }
@@ -116,6 +115,7 @@ private void DeleteSelected()
         BrokenCount = BrokenShortcuts.Count;
         SelectedCount = BrokenShortcuts.Count(x => x.IsSelected);
         ScanStatus = $"Deleted {deleted} shortcut{(deleted == 1 ? "" : "s")}. {BrokenCount} remaining.";
+        ToastService.Instance.Show("Shortcuts deleted", $"{deleted} shortcut{(deleted == 1 ? "" : "s")} removed");
         Log.Information("Deleted {Count} broken shortcuts (recycle bin: {RecycleBin})", deleted, MoveToRecycleBin);
     }
 
diff --git a/SysManager/SysManager/Views/AppBlockerView.xaml b/SysManager/SysManager/Views/AppBlockerView.xaml
index 75b096f9..5e7ec98b 100644
--- a/SysManager/SysManager/Views/AppBlockerView.xaml
+++ b/SysManager/SysManager/Views/AppBlockerView.xaml
@@ -6,9 +6,10 @@
              d:DataContext="{d:DesignInstance vm:AppBlockerViewModel}"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d">
+             mc:Ignorable="d"
+             Background="{StaticResource Surface0}">
 
-    <Grid Margin="24">
+    <Grid Margin="28,24,28,0">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -20,10 +21,8 @@
 
         <!-- Header -->
         <StackPanel Grid.Row="0" Margin="0,0,0,16">
-            <TextBlock Text="Application Blocker" FontSize="20" FontWeight="SemiBold"
-                       Foreground="{StaticResource TextPrimary}" />
-            <TextBlock Text="{Binding BlockStatus}" Opacity="0.7" Margin="0,4,0,0"
-                       Foreground="{StaticResource TextSecondary}" />
+            <TextBlock Text="Application Blocker" Style="{StaticResource Display}" />
+            <TextBlock Text="{Binding BlockStatus}" Style="{StaticResource Subtle}" Margin="0,4,0,0" />
         </StackPanel>
 
         <!-- Elevation banner: not elevated -->
@@ -61,17 +60,17 @@
         <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="0,0,0,12">
             <TextBox Text="{Binding NewExeName, UpdateSourceTrigger=PropertyChanged}" Width="250" Padding="6,4"
                      VerticalAlignment="Center" Margin="0,0,8,0" />
-            <Button Content="Block" Command="{Binding BlockAppCommand}" Padding="12,6" Margin="0,0,8,0" />
-            <Button Content="Browse..." Command="{Binding BrowseForExeCommand}" Padding="8,6" />
+            <Button Content="Block" Command="{Binding BlockAppCommand}" Style="{StaticResource PrimaryButton}" Padding="12,6" Margin="0,0,8,0" />
+            <Button Content="Browse..." Command="{Binding BrowseForExeCommand}" Style="{StaticResource SecondaryButton}" Padding="8,6" />
         </StackPanel>
 
         <!-- Toolbar -->
         <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,0,0,12">
-            <Button Content="Unblock Selected" Command="{Binding UnblockSelectedCommand}" Padding="12,6" Margin="0,0,8,0" />
-            <Button Content="Refresh" Command="{Binding RefreshListCommand}" Padding="8,6" Margin="0,0,16,0" />
+            <Button Content="Unblock Selected" Command="{Binding UnblockSelectedCommand}" Style="{StaticResource SecondaryButton}" Padding="12,6" Margin="0,0,8,0" />
+            <Button Content="Refresh" Command="{Binding RefreshListCommand}" Style="{StaticResource GhostButton}" Padding="8,6" Margin="0,0,16,0" />
             <Separator Margin="0,0,16,0" />
-            <Button Content="Select All" Command="{Binding SelectAllCommand}" Padding="8,6" Margin="0,0,4,0" />
-            <Button Content="Deselect All" Command="{Binding DeselectAllCommand}" Padding="8,6" />
+            <Button Content="Select All" Command="{Binding SelectAllCommand}" Style="{StaticResource GhostButton}" Padding="8,6" Margin="0,0,4,0" />
+            <Button Content="Deselect All" Command="{Binding DeselectAllCommand}" Style="{StaticResource GhostButton}" Padding="8,6" />
         </StackPanel>
 
         <!-- Blocked apps list -->
@@ -79,8 +78,10 @@
                   AutoGenerateColumns="False" IsReadOnly="False"
                   CanUserAddRows="False" CanUserDeleteRows="False"
                   CanUserResizeColumns="True"
-                  HeadersVisibility="Column" GridLinesVisibility="Horizontal"
+                  HeadersVisibility="Column" GridLinesVisibility="None"
                   BorderThickness="1" BorderBrush="{StaticResource Border1}"
+                  Background="Transparent"
+                  AutomationProperties.Name="Data table"
                   VirtualizingPanel.IsVirtualizing="True"
                   VirtualizingPanel.VirtualizationMode="Recycling">
             <DataGrid.Columns>
diff --git a/SysManager/SysManager/Views/DashboardView.xaml b/SysManager/SysManager/Views/DashboardView.xaml
index 898dd698..41fd3f40 100644
--- a/SysManager/SysManager/Views/DashboardView.xaml
+++ b/SysManager/SysManager/Views/DashboardView.xaml
@@ -11,7 +11,7 @@
         </Grid.RowDefinitions>
 
         <StackPanel Orientation="Horizontal" Grid.Row="0">
-            <TextBlock Text="System overview" FontSize="22" FontWeight="SemiBold"/>
+            <TextBlock Text="System overview" Style="{StaticResource Display}" FontWeight="SemiBold"/>
             <Border CornerRadius="10" Padding="10,5" Margin="16,2,0,0"
                     Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
                     Visibility="{Binding IsElevated, Converter={StaticResource BoolToVis}}">
@@ -88,8 +88,8 @@
         <ScrollViewer Grid.Row="2" VerticalScrollBarVisibility="Auto">
             <StackPanel>
                 <!-- Health Score card -->
-                <Border CornerRadius="8" Padding="16" Background="#0D1117" Margin="0,0,0,12"
-                        BorderBrush="#30363D" BorderThickness="1"
+                <Border CornerRadius="8" Padding="16" Background="{StaticResource Surface1}" Margin="0,0,0,12"
+                        BorderBrush="{StaticResource Border1}" BorderThickness="1"
                         Visibility="{Binding HasHealthScore, Converter={StaticResource BoolToVis}}">
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -104,9 +104,9 @@
                                 BorderBrush="{Binding HealthResult.ColorHex, Converter={StaticResource HexBrush}}">
                             <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
                                 <TextBlock Text="{Binding HealthResult.Score}" FontSize="32" FontWeight="Bold"
-                                           HorizontalAlignment="Center" Foreground="White"/>
+                                           HorizontalAlignment="Center" Foreground="{StaticResource TextPrimary}"/>
                                 <TextBlock Text="{Binding HealthResult.Label}" FontSize="11"
-                                           HorizontalAlignment="Center" Foreground="#9AA0A6"/>
+                                           HorizontalAlignment="Center" Foreground="{StaticResource TextSecondary}"/>
                             </StackPanel>
                         </Border>
 
@@ -116,22 +116,22 @@
 
                             <!-- Component breakdown -->
                             <WrapPanel Margin="0,0,0,8">
-                                <TextBlock Margin="0,0,12,0" Foreground="#9AA0A6" FontSize="12">
+                                <TextBlock Margin="0,0,12,0" Foreground="{StaticResource TextSecondary}" FontSize="12">
                                     <Run Text="Disk "/>
-                                    <Run Text="{Binding HealthResult.DiskScore, Mode=OneWay}" FontWeight="SemiBold" Foreground="#C9D1D9"/>
+                                    <Run Text="{Binding HealthResult.DiskScore, Mode=OneWay}" FontWeight="SemiBold" Foreground="{StaticResource TextPrimary}"/>
                                 </TextBlock>
-                                <TextBlock Margin="0,0,12,0" Foreground="#9AA0A6" FontSize="12">
+                                <TextBlock Margin="0,0,12,0" Foreground="{StaticResource TextSecondary}" FontSize="12">
                                     <Run Text="RAM "/>
-                                    <Run Text="{Binding HealthResult.RamScore, Mode=OneWay}" FontWeight="SemiBold" Foreground="#C9D1D9"/>
+                                    <Run Text="{Binding HealthResult.RamScore, Mode=OneWay}" FontWeight="SemiBold" Foreground="{StaticResource TextPrimary}"/>
                                 </TextBlock>
-                                <TextBlock Margin="0,0,12,0" Foreground="#9AA0A6" FontSize="12">
+                                <TextBlock Margin="0,0,12,0" Foreground="{StaticResource TextSecondary}" FontSize="12">
                                     <Run Text="Uptime "/>
-                                    <Run Text="{Binding HealthResult.UptimeScore, Mode=OneWay}" FontWeight="SemiBold" Foreground="#C9D1D9"/>
+                                    <Run Text="{Binding HealthResult.UptimeScore, Mode=OneWay}" FontWeight="SemiBold" Foreground="{StaticResource TextPrimary}"/>
                                 </TextBlock>
-                                <TextBlock Foreground="#9AA0A6" FontSize="12"
+                                <TextBlock Foreground="{StaticResource TextSecondary}" FontSize="12"
                                            Visibility="{Binding HealthResult.HasBattery, Converter={StaticResource BoolToVis}}">
                                     <Run Text="Battery "/>
-                                    <Run Text="{Binding HealthResult.BatteryScore, Mode=OneWay}" FontWeight="SemiBold" Foreground="#C9D1D9"/>
+                                    <Run Text="{Binding HealthResult.BatteryScore, Mode=OneWay}" FontWeight="SemiBold" Foreground="{StaticResource TextPrimary}"/>
                                 </TextBlock>
                             </WrapPanel>
 
@@ -154,32 +154,32 @@
                 </Border>
 
                 <!-- Health Score loading indicator -->
-                <Border CornerRadius="8" Padding="14" Background="#0D1117" Margin="0,0,0,8"
-                        BorderBrush="#30363D" BorderThickness="1"
+                <Border CornerRadius="8" Padding="14" Background="{StaticResource Surface1}" Margin="0,0,0,8"
+                        BorderBrush="{StaticResource Border1}" BorderThickness="1"
                         Visibility="{Binding IsHealthScoreLoading, Converter={StaticResource BoolToVis}}">
                     <StackPanel Orientation="Horizontal">
                         <ProgressBar AutomationProperties.Name="Health score loading" IsIndeterminate="True"
                                      Width="80" Height="4" Margin="0,0,10,0" VerticalAlignment="Center"/>
-                        <TextBlock Text="Computing health score…" Foreground="#9AA0A6" FontSize="12"
+                        <TextBlock Text="Computing health score…" Foreground="{StaticResource TextSecondary}" FontSize="12"
                                    VerticalAlignment="Center"/>
                     </StackPanel>
                 </Border>
 
                 <!-- Tune-Up progress panel -->
-                <Border CornerRadius="8" Padding="14" Background="#0D1117" Margin="0,0,0,8"
+                <Border CornerRadius="8" Padding="14" Background="{StaticResource Surface1}" Margin="0,0,0,8"
                         BorderBrush="{StaticResource Accent}" BorderThickness="1"
                         Visibility="{Binding IsTuneUpRunning, Converter={StaticResource BoolToVis}}">
                     <StackPanel>
                         <TextBlock Text="Quick Tune-Up in progress…" FontWeight="SemiBold" FontSize="14"
-                                   Foreground="#58A6FF"/>
-                        <TextBlock Text="{Binding TuneUpStep}" Foreground="#9AA0A6" Margin="0,6,0,6"/>
+                                   Foreground="{StaticResource Info}"/>
+                        <TextBlock Text="{Binding TuneUpStep}" Foreground="{StaticResource TextSecondary}" Margin="0,6,0,6"/>
                         <ProgressBar AutomationProperties.Name="Tune-Up progress" Height="6" Minimum="0" Maximum="100"
                                      Value="{Binding TuneUpProgress}"/>
                     </StackPanel>
                 </Border>
 
                 <!-- Tune-Up result summary card -->
-                <Border CornerRadius="8" Padding="14" Background="#0D1117" Margin="0,0,0,12"
+                <Border CornerRadius="8" Padding="14" Background="{StaticResource Surface1}" Margin="0,0,0,12"
                         BorderBrush="{StaticResource Accent}" BorderThickness="1"
                         Visibility="{Binding HasTuneUpResult, Converter={StaticResource BoolToVis}}">
                     <StackPanel>
@@ -190,7 +190,7 @@
                             </Grid.ColumnDefinitions>
                             <StackPanel Grid.Column="0" Orientation="Horizontal">
                                 <TextBlock Text="&#xE930;" FontFamily="Segoe Fluent Icons" FontSize="18"
-                                           VerticalAlignment="Center" Margin="0,0,8,0" Foreground="#58A6FF"/>
+                                           VerticalAlignment="Center" Margin="0,0,8,0" Foreground="{StaticResource Info}"/>
                                 <TextBlock Text="Tune-Up Summary" FontWeight="SemiBold" FontSize="15"
                                            VerticalAlignment="Center"/>
                             </StackPanel>
@@ -200,15 +200,15 @@
                                     AutomationProperties.Name="Dismiss tune-up results"/>
                         </Grid>
 
-                        <Separator Margin="0,8" Background="#21262D"/>
+                        <Separator Margin="0,8" Background="{StaticResource Border1}"/>
 
                         <!-- Freed space -->
                         <StackPanel Orientation="Horizontal" Margin="0,4,0,0">
                             <TextBlock Text="&#xE74D;" FontFamily="Segoe Fluent Icons" FontSize="14"
-                                       Margin="0,0,8,0" Foreground="#9AA0A6" VerticalAlignment="Center"/>
-                            <TextBlock Foreground="#C9D1D9" VerticalAlignment="Center">
+                                       Margin="0,0,8,0" Foreground="{StaticResource TextSecondary}" VerticalAlignment="Center"/>
+                            <TextBlock Foreground="{StaticResource TextPrimary}" VerticalAlignment="Center">
                                 <Run Text="Freed "/>
-                                <Run Text="{Binding TuneUpResult.FreedDisplay, Mode=OneWay}" FontWeight="SemiBold" Foreground="#58A6FF"/>
+                                <Run Text="{Binding TuneUpResult.FreedDisplay, Mode=OneWay}" FontWeight="SemiBold" Foreground="{StaticResource Info}"/>
                                 <Run Text=" ("/>
                                 <Run Text="{Binding TuneUpResult.TempFilesDeleted, Mode=OneWay, StringFormat='{}{0:N0}'}"/>
                                 <Run Text=" files)"/>
@@ -218,8 +218,8 @@
                         <!-- Recycle Bin -->
                         <StackPanel Orientation="Horizontal" Margin="0,4,0,0">
                             <TextBlock Text="&#xE74D;" FontFamily="Segoe Fluent Icons" FontSize="14"
-                                       Margin="0,0,8,0" Foreground="#9AA0A6" VerticalAlignment="Center"/>
-                            <TextBlock Foreground="#C9D1D9" VerticalAlignment="Center">
+                                       Margin="0,0,8,0" Foreground="{StaticResource TextSecondary}" VerticalAlignment="Center"/>
+                            <TextBlock Foreground="{StaticResource TextPrimary}" VerticalAlignment="Center">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock">
                                         <Setter Property="Text" Value="Recycle Bin emptied"/>
@@ -236,8 +236,8 @@
                         <!-- Broken shortcuts -->
                         <StackPanel Orientation="Horizontal" Margin="0,4,0,0">
                             <TextBlock Text="&#xE71B;" FontFamily="Segoe Fluent Icons" FontSize="14"
-                                       Margin="0,0,8,0" Foreground="#9AA0A6" VerticalAlignment="Center"/>
-                            <TextBlock Foreground="#C9D1D9" VerticalAlignment="Center">
+                                       Margin="0,0,8,0" Foreground="{StaticResource TextSecondary}" VerticalAlignment="Center"/>
+                            <TextBlock Foreground="{StaticResource TextPrimary}" VerticalAlignment="Center">
                                 <Run Text="{Binding TuneUpResult.BrokenShortcutsFound, Mode=OneWay}"/>
                                 <Run Text=" broken shortcuts found"/>
                             </TextBlock>
@@ -262,8 +262,8 @@
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal" Margin="0,2,0,0">
                                         <TextBlock Text="&#xEDA2;" FontFamily="Segoe Fluent Icons" FontSize="14"
-                                                   Margin="0,0,8,0" Foreground="#9AA0A6" VerticalAlignment="Center"/>
-                                        <TextBlock Text="{Binding Name}" Foreground="#C9D1D9" Margin="0,0,6,0"
+                                                   Margin="0,0,8,0" Foreground="{StaticResource TextSecondary}" VerticalAlignment="Center"/>
+                                        <TextBlock Text="{Binding Name}" Foreground="{StaticResource TextPrimary}" Margin="0,0,6,0"
                                                    VerticalAlignment="Center"/>
                                         <TextBlock Text="{Binding Verdict}" FontWeight="SemiBold"
                                                    VerticalAlignment="Center"
@@ -276,8 +276,8 @@
                         <!-- Uptime -->
                         <StackPanel Orientation="Horizontal" Margin="0,4,0,0">
                             <TextBlock Text="&#xE916;" FontFamily="Segoe Fluent Icons" FontSize="14"
-                                       Margin="0,0,8,0" Foreground="#9AA0A6" VerticalAlignment="Center"/>
-                            <TextBlock Foreground="#C9D1D9" VerticalAlignment="Center">
+                                       Margin="0,0,8,0" Foreground="{StaticResource TextSecondary}" VerticalAlignment="Center"/>
+                            <TextBlock Foreground="{StaticResource TextPrimary}" VerticalAlignment="Center">
                                 <Run Text="Uptime: "/>
                                 <Run Text="{Binding TuneUpResult.Uptime.Days, Mode=OneWay}"/>
                                 <Run Text="d "/>
@@ -294,8 +294,8 @@
                         <!-- RAM -->
                         <StackPanel Orientation="Horizontal" Margin="0,4,0,0">
                             <TextBlock Text="&#xE950;" FontFamily="Segoe Fluent Icons" FontSize="14"
-                                       Margin="0,0,8,0" Foreground="#9AA0A6" VerticalAlignment="Center"/>
-                            <TextBlock Foreground="#C9D1D9" VerticalAlignment="Center">
+                                       Margin="0,0,8,0" Foreground="{StaticResource TextSecondary}" VerticalAlignment="Center"/>
+                            <TextBlock Foreground="{StaticResource TextPrimary}" VerticalAlignment="Center">
                                 <Run Text="RAM: "/>
                                 <Run Text="{Binding TuneUpResult.RamUsedGB, Mode=OneWay, StringFormat='{}{0:0.0}'}"/>
                                 <Run Text=" / "/>
@@ -310,40 +310,40 @@
                         </StackPanel>
 
                         <!-- Overall verdict -->
-                        <Separator Margin="0,8" Background="#21262D"/>
+                        <Separator Margin="0,8" Background="{StaticResource Border1}"/>
                         <TextBlock Text="{Binding TuneUpResult.OverallVerdict}" FontWeight="SemiBold" FontSize="13"
                                    Foreground="{Binding TuneUpResult.OverallColorHex, Converter={StaticResource HexBrush}}"/>
                     </StackPanel>
                 </Border>
 
                 <!-- Existing system info cards -->
-                <Border CornerRadius="8" Padding="14" Background="#161B22" Margin="0,0,0,8">
+                <Border CornerRadius="8" Padding="14" Background="{StaticResource Surface2}" Margin="0,0,0,8">
                     <StackPanel>
-                        <TextBlock Text="Operating System" Foreground="#9AA0A6" FontSize="12"/>
+                        <TextBlock Text="Operating System" Foreground="{StaticResource TextSecondary}" FontSize="12"/>
                         <TextBlock Text="{Binding OsLine}" FontSize="15" Margin="0,4,0,0"/>
-                        <TextBlock Text="{Binding UptimeLine}" Foreground="#9AA0A6" Margin="0,6,0,0"/>
+                        <TextBlock Text="{Binding UptimeLine}" Foreground="{StaticResource TextSecondary}" Margin="0,6,0,0"/>
                     </StackPanel>
                 </Border>
 
-                <Border CornerRadius="8" Padding="14" Background="#161B22" Margin="0,0,0,8">
+                <Border CornerRadius="8" Padding="14" Background="{StaticResource Surface2}" Margin="0,0,0,8">
                     <StackPanel>
-                        <TextBlock Text="CPU" Foreground="#9AA0A6" FontSize="12"/>
+                        <TextBlock Text="CPU" Foreground="{StaticResource TextSecondary}" FontSize="12"/>
                         <TextBlock Text="{Binding CpuLine}" FontSize="15" Margin="0,4,0,0" TextWrapping="Wrap"/>
                     </StackPanel>
                 </Border>
 
-                <Border CornerRadius="8" Padding="14" Background="#161B22" Margin="0,0,0,8">
+                <Border CornerRadius="8" Padding="14" Background="{StaticResource Surface2}" Margin="0,0,0,8">
                     <StackPanel>
-                        <TextBlock Text="Memory" Foreground="#9AA0A6" FontSize="12"/>
+                        <TextBlock Text="Memory" Foreground="{StaticResource TextSecondary}" FontSize="12"/>
                         <TextBlock Text="{Binding MemLine}" FontSize="15" Margin="0,4,0,6"/>
                         <ProgressBar AutomationProperties.Name="Progress" Height="8" Minimum="0" Maximum="100"
                                      Value="{Binding Snapshot.Memory.UsedPercent}"/>
                     </StackPanel>
                 </Border>
 
-                <Border CornerRadius="8" Padding="14" Background="#161B22" Margin="0,0,0,8">
+                <Border CornerRadius="8" Padding="14" Background="{StaticResource Surface2}" Margin="0,0,0,8">
                     <StackPanel>
-                        <TextBlock Text="Storage" Foreground="#9AA0A6" FontSize="12"/>
+                        <TextBlock Text="Storage" Foreground="{StaticResource TextSecondary}" FontSize="12"/>
                         <TextBlock Text="{Binding DiskLine}" FontSize="14" Margin="0,4,0,0" TextWrapping="Wrap"/>
                     </StackPanel>
                 </Border>
@@ -358,7 +358,7 @@
             <ProgressBar AutomationProperties.Name="Progress" Grid.Column="0" Height="4"
                          IsIndeterminate="{Binding IsProgressIndeterminate}"
                          Visibility="{Binding IsBusy, Converter={StaticResource BoolToVis}}"/>
-            <TextBlock Grid.Column="1" Margin="12,0,0,0" Text="{Binding StatusMessage}" Foreground="#9AA0A6"/>
+            <TextBlock Grid.Column="1" Margin="12,0,0,0" Text="{Binding StatusMessage}" Foreground="{StaticResource TextSecondary}"/>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/SysManager/SysManager/Views/DnsHostsView.xaml b/SysManager/SysManager/Views/DnsHostsView.xaml
index 8edde912..a5091cf5 100644
--- a/SysManager/SysManager/Views/DnsHostsView.xaml
+++ b/SysManager/SysManager/Views/DnsHostsView.xaml
@@ -117,9 +117,10 @@
                           AutoGenerateColumns="False" CanUserAddRows="False"
                           CanUserDeleteRows="False" HeadersVisibility="Column"
                           CanUserResizeColumns="True"
-                          GridLinesVisibility="Horizontal" BorderThickness="0"
+                          GridLinesVisibility="None" BorderThickness="0"
                           Background="Transparent"
-                          Foreground="#E2E8F0" FontSize="12"
+                          AutomationProperties.Name="Data table"
+                          Foreground="{StaticResource TextPrimary}" FontSize="12"
                           HorizontalGridLinesBrush="#1E293B"
                           SelectionMode="Single" IsReadOnly="False"
                           VirtualizingPanel.IsVirtualizing="True"
diff --git a/SysManager/SysManager/Views/UninstallerView.xaml b/SysManager/SysManager/Views/UninstallerView.xaml
index 16dbef54..b09baeea 100644
--- a/SysManager/SysManager/Views/UninstallerView.xaml
+++ b/SysManager/SysManager/Views/UninstallerView.xaml
@@ -181,7 +181,7 @@
                                                 Margin="-8,-4,0,-4">
                                             <Border.Style>
                                                 <Style TargetType="Border">
-                                                    <Setter Property="Background" Value="#6366F1"/>
+                                                    <Setter Property="Background" Value="{StaticResource Accent}"/>
                                                     <Style.Triggers>
                                                         <DataTrigger Binding="{Binding Source}" Value="">
                                                             <Setter Property="Background" Value="#FBBF24"/>