From 77137ef894284282af7eddbd4cdce6d52385a6b7 Mon Sep 17 00:00:00 2001
From: laurentiu021 <laurentiu021@users.noreply.github.com>
Date: Wed, 3 Jun 2026 17:41:33 +0300
Subject: [PATCH] feat: uniform UI margins and theme-aware warning brushes

- 13 views migrated from Margin="32,24" to canonical "28,24,28,16" (BatteryHealth, BulkInstaller, ContextMenu, DiskAnalyzer, Drivers, DuplicateFile, Performance, Privacy, ProcessManager, Services, Startup, Uninstaller, WindowsFeatures)
- 15 views: drop hardcoded LinearGradientBrush PageBg, use {DynamicResource Surface0} on root Grid (removes 5 lines per file, theme-aware)
- 17 views: replace hardcoded amber hex (#1AFBBF24, #40FBBF24, #FBBF24, #FCD34D) with new App.xaml theme brushes WarningBgSubtle, WarningBg, WarningStripe, WarningText
---
 CHANGELOG.md                                    |  7 +++++++
 SysManager/SysManager/App.xaml                  |  6 ++++++
 SysManager/SysManager/SysManager.csproj         |  6 +++---
 SysManager/SysManager/Views/AboutView.xaml      |  9 +--------
 SysManager/SysManager/Views/AppBlockerView.xaml |  6 +++---
 SysManager/SysManager/Views/AppUpdatesView.xaml | 15 ++++-----------
 .../SysManager/Views/BatteryHealthView.xaml     |  2 +-
 .../SysManager/Views/BulkInstallerView.xaml     |  8 ++++----
 SysManager/SysManager/Views/CleanupView.xaml    | 17 +++++------------
 .../SysManager/Views/ContextMenuView.xaml       |  8 ++++----
 SysManager/SysManager/Views/DashboardView.xaml  |  2 +-
 .../SysManager/Views/DeepCleanupView.xaml       |  9 +--------
 .../SysManager/Views/DiskAnalyzerView.xaml      |  2 +-
 SysManager/SysManager/Views/DnsHostsView.xaml   | 15 ++++-----------
 SysManager/SysManager/Views/DriversView.xaml    |  2 +-
 .../SysManager/Views/DuplicateFileView.xaml     |  2 +-
 .../SysManager/Views/FileShredderView.xaml      |  7 +------
 SysManager/SysManager/Views/LogsView.xaml       | 16 +++++-----------
 .../SysManager/Views/NetworkRepairView.xaml     | 15 ++++-----------
 .../SysManager/Views/PerformanceView.xaml       |  8 ++++----
 SysManager/SysManager/Views/PingView.xaml       | 13 +++----------
 .../SysManager/Views/PlaceholderView.xaml       |  9 +--------
 SysManager/SysManager/Views/PrivacyView.xaml    | 14 +++++++-------
 .../SysManager/Views/ProcessManagerView.xaml    |  2 +-
 SysManager/SysManager/Views/ServicesView.xaml   |  8 ++++----
 .../SysManager/Views/ShortcutCleanerView.xaml   | 10 +---------
 SysManager/SysManager/Views/SpeedTestView.xaml  |  9 +--------
 SysManager/SysManager/Views/StartupView.xaml    |  2 +-
 .../SysManager/Views/SystemHealthView.xaml      | 15 ++++-----------
 SysManager/SysManager/Views/TracerouteView.xaml |  9 +--------
 .../SysManager/Views/UninstallerView.xaml       | 12 ++++++------
 .../SysManager/Views/WindowsFeaturesView.xaml   | 14 +++++++-------
 .../SysManager/Views/WindowsUpdateView.xaml     | 17 +++++------------
 33 files changed, 103 insertions(+), 193 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0632a5..46b0a7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [1.19.0] - 2026-06-03
+
+### Changed
+- **Uniform outer margins across 13 views.** BatteryHealth, BulkInstaller, ContextMenu, DiskAnalyzer, Drivers, DuplicateFile, Performance, Privacy, ProcessManager, Services, Startup, Uninstaller, WindowsFeatures all migrated from `Margin="32,24"` to the canonical `Margin="28,24,28,16"` already used by Dashboard and AppAlerts. Layout is now consistent across the whole nav.
+- **Page background — theme-aware.** 15 views were defining a hardcoded `LinearGradientBrush PageBg` (`#070A0F`/`#0B1220`/`#090D16`) and using `{StaticResource PageBg}` for their root `Grid.Background`. Replaced with `{DynamicResource Surface0}`. The gradient resource definitions are gone, the views are smaller, and a future light-theme switch will work without per-view edits.
+- **Admin elevation banner colors — theme-aware.** Replaced 4 hardcoded amber hex values (`#1AFBBF24`, `#40FBBF24`, `#FBBF24`, `#FCD34D`) used by elevation banners and warning pills across 17 views with new theme brushes: `WarningBgSubtle`, `WarningBg`, `WarningStripe`, `WarningText`. Defined once in `App.xaml`, used everywhere.
+
 ## [1.18.2] - 2026-06-03
 
 ### Fixed
diff --git a/SysManager/SysManager/App.xaml b/SysManager/SysManager/App.xaml
index 4147bd9..45aec84 100644
--- a/SysManager/SysManager/App.xaml
+++ b/SysManager/SysManager/App.xaml
@@ -72,6 +72,12 @@
             <SolidColorBrush x:Key="Danger" Color="#EF4444"/>
             <SolidColorBrush x:Key="Info" Color="#38BDF8"/>
 
+            <!-- Warning category surface (admin elevation banner, etc.) -->
+            <SolidColorBrush x:Key="WarningBgSubtle" Color="#1AFBBF24"/>
+            <SolidColorBrush x:Key="WarningBg" Color="#40FBBF24"/>
+            <SolidColorBrush x:Key="WarningStripe" Color="#FBBF24"/>
+            <SolidColorBrush x:Key="WarningText" Color="#FCD34D"/>
+
             <!-- Console output coloring (legacy) -->
             <SolidColorBrush x:Key="OutErrorBrush"   Color="#F87171" />
             <SolidColorBrush x:Key="OutWarnBrush"    Color="#FBBF24" />
diff --git a/SysManager/SysManager/SysManager.csproj b/SysManager/SysManager/SysManager.csproj
index 4d3b0fa..8c1b7a2 100644
--- a/SysManager/SysManager/SysManager.csproj
+++ b/SysManager/SysManager/SysManager.csproj
@@ -10,9 +10,9 @@
     <RootNamespace>SysManager</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>NU1603;NU1701</NoWarn>
-    <Version>1.18.2</Version>
-    <FileVersion>1.18.2.0</FileVersion>
-    <AssemblyVersion>1.18.2.0</AssemblyVersion>
+    <Version>1.19.0</Version>
+    <FileVersion>1.19.0.0</FileVersion>
+    <AssemblyVersion>1.19.0.0</AssemblyVersion>
     <Product>SysManager</Product>
     <Description>SysManager — Windows system monitoring toolkit by laurentiu021. Network, updates, health, logs, safe deep cleanup.</Description>
     <PackageProjectUrl>https://github.com/laurentiu021/SystemManager</PackageProjectUrl>
diff --git a/SysManager/SysManager/Views/AboutView.xaml b/SysManager/SysManager/Views/AboutView.xaml
index 234d1bb..3ca7543 100644
--- a/SysManager/SysManager/Views/AboutView.xaml
+++ b/SysManager/SysManager/Views/AboutView.xaml
@@ -3,15 +3,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:helpers="clr-namespace:SysManager.Helpers">
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
 
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <ScrollViewer VerticalScrollBarVisibility="Auto">
             <StackPanel Margin="28,24,28,28">
 
diff --git a/SysManager/SysManager/Views/AppBlockerView.xaml b/SysManager/SysManager/Views/AppBlockerView.xaml
index af0b88d..ff28e8f 100644
--- a/SysManager/SysManager/Views/AppBlockerView.xaml
+++ b/SysManager/SysManager/Views/AppBlockerView.xaml
@@ -42,16 +42,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="1" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="1" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="0,0,0,12"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — you can block and unblock applications."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
diff --git a/SysManager/SysManager/Views/AppUpdatesView.xaml b/SysManager/SysManager/Views/AppUpdatesView.xaml
index 0486766..61d69a9 100644
--- a/SysManager/SysManager/Views/AppUpdatesView.xaml
+++ b/SysManager/SysManager/Views/AppUpdatesView.xaml
@@ -3,15 +3,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:v="clr-namespace:SysManager.Views">
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
 
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -44,16 +37,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="1" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="1" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="28,12,28,0"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — all packages can be upgraded."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
diff --git a/SysManager/SysManager/Views/BatteryHealthView.xaml b/SysManager/SysManager/Views/BatteryHealthView.xaml
index 10d21f9..731ac96 100644
--- a/SysManager/SysManager/Views/BatteryHealthView.xaml
+++ b/SysManager/SysManager/Views/BatteryHealthView.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d"
              Background="{DynamicResource Surface0}">
 
-    <Grid Margin="32,24">
+    <Grid Margin="28,24,28,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
diff --git a/SysManager/SysManager/Views/BulkInstallerView.xaml b/SysManager/SysManager/Views/BulkInstallerView.xaml
index ca7adef..aebe10f 100644
--- a/SysManager/SysManager/Views/BulkInstallerView.xaml
+++ b/SysManager/SysManager/Views/BulkInstallerView.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d"
              Background="{DynamicResource Surface0}">
 
-    <Grid Margin="32,24">
+    <Grid Margin="28,24,28,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -43,16 +43,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="1" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="1" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="0,0,0,12"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — all applications can be installed."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
diff --git a/SysManager/SysManager/Views/CleanupView.xaml b/SysManager/SysManager/Views/CleanupView.xaml
index 47649c6..27068d0 100644
--- a/SysManager/SysManager/Views/CleanupView.xaml
+++ b/SysManager/SysManager/Views/CleanupView.xaml
@@ -3,15 +3,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:v="clr-namespace:SysManager.Views">
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
 
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -43,16 +36,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="1" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="1" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="28,12,28,0"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — you can run system file checks and repairs."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
@@ -76,7 +69,7 @@
                         <StackPanel>
                             <TextBlock Text="RECYCLE BIN" Style="{StaticResource Caption}"/>
                             <TextBlock Text="{Binding RecycleBinLabel}" FontSize="16" FontWeight="SemiBold"
-                                       Foreground="#FBBF24" Margin="0,4,0,0"/>
+                                       Foreground="{DynamicResource WarningStripe}" Margin="0,4,0,0"/>
                         </StackPanel>
                     </Border>
                 </Grid>
diff --git a/SysManager/SysManager/Views/ContextMenuView.xaml b/SysManager/SysManager/Views/ContextMenuView.xaml
index 1d15d11..ebbe9ef 100644
--- a/SysManager/SysManager/Views/ContextMenuView.xaml
+++ b/SysManager/SysManager/Views/ContextMenuView.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d"
              Background="{DynamicResource Surface0}">
 
-    <Grid Margin="32,24">
+    <Grid Margin="28,24,28,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -43,16 +43,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="1" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="1" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="0,0,0,12"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — full access to all context menu entries."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
diff --git a/SysManager/SysManager/Views/DashboardView.xaml b/SysManager/SysManager/Views/DashboardView.xaml
index 353ad8a..c9d49b8 100644
--- a/SysManager/SysManager/Views/DashboardView.xaml
+++ b/SysManager/SysManager/Views/DashboardView.xaml
@@ -215,7 +215,7 @@
                                 </Button.Template>
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Text="🛡️" FontSize="9" Margin="0,0,4,0" VerticalAlignment="Center"/>
-                                    <TextBlock Text="Run as admin for all sensors" Foreground="#FCD34D"
+                                    <TextBlock Text="Run as admin for all sensors" Foreground="{DynamicResource WarningText}"
                                                FontSize="10" VerticalAlignment="Center"/>
                                 </StackPanel>
                             </Button>
diff --git a/SysManager/SysManager/Views/DeepCleanupView.xaml b/SysManager/SysManager/Views/DeepCleanupView.xaml
index 6f27e82..75ffa88 100644
--- a/SysManager/SysManager/Views/DeepCleanupView.xaml
+++ b/SysManager/SysManager/Views/DeepCleanupView.xaml
@@ -2,15 +2,8 @@
 <UserControl x:Class="SysManager.Views.DeepCleanupView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
 
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <ScrollViewer VerticalScrollBarVisibility="Auto">
             <StackPanel Margin="28,24,28,28">
 
diff --git a/SysManager/SysManager/Views/DiskAnalyzerView.xaml b/SysManager/SysManager/Views/DiskAnalyzerView.xaml
index a2b4330..6e57874 100644
--- a/SysManager/SysManager/Views/DiskAnalyzerView.xaml
+++ b/SysManager/SysManager/Views/DiskAnalyzerView.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d"
              Background="{DynamicResource Surface0}">
 
-    <Grid Margin="32,24">
+    <Grid Margin="28,24,28,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
diff --git a/SysManager/SysManager/Views/DnsHostsView.xaml b/SysManager/SysManager/Views/DnsHostsView.xaml
index bc69ad2..2cac617 100644
--- a/SysManager/SysManager/Views/DnsHostsView.xaml
+++ b/SysManager/SysManager/Views/DnsHostsView.xaml
@@ -2,14 +2,7 @@
 <UserControl x:Class="SysManager.Views.DnsHostsView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -41,16 +34,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="1" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="1" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="28,12,28,0"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — you can change DNS settings and edit the hosts file."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
diff --git a/SysManager/SysManager/Views/DriversView.xaml b/SysManager/SysManager/Views/DriversView.xaml
index 49ff306..5088f09 100644
--- a/SysManager/SysManager/Views/DriversView.xaml
+++ b/SysManager/SysManager/Views/DriversView.xaml
@@ -10,7 +10,7 @@
              Background="{DynamicResource Surface0}">
 
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
-        <Grid Margin="32,24">
+        <Grid Margin="28,24,28,16">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
diff --git a/SysManager/SysManager/Views/DuplicateFileView.xaml b/SysManager/SysManager/Views/DuplicateFileView.xaml
index 82ad8a7..d7f6d05 100644
--- a/SysManager/SysManager/Views/DuplicateFileView.xaml
+++ b/SysManager/SysManager/Views/DuplicateFileView.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d"
              Background="{DynamicResource Surface0}">
 
-    <Grid Margin="32,24">
+    <Grid Margin="28,24,28,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
diff --git a/SysManager/SysManager/Views/FileShredderView.xaml b/SysManager/SysManager/Views/FileShredderView.xaml
index 02ba968..9e0dfa9 100644
--- a/SysManager/SysManager/Views/FileShredderView.xaml
+++ b/SysManager/SysManager/Views/FileShredderView.xaml
@@ -10,11 +10,6 @@
              mc:Ignorable="d">
 
     <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
         <ObjectDataProvider x:Key="ShredMethods" MethodName="GetValues" ObjectType="{x:Type svc:ShredMethod}">
             <ObjectDataProvider.MethodParameters>
                 <x:Type TypeName="svc:ShredMethod"/>
@@ -22,7 +17,7 @@
         </ObjectDataProvider>
     </UserControl.Resources>
 
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
diff --git a/SysManager/SysManager/Views/LogsView.xaml b/SysManager/SysManager/Views/LogsView.xaml
index aa3303d..2e45703 100644
--- a/SysManager/SysManager/Views/LogsView.xaml
+++ b/SysManager/SysManager/Views/LogsView.xaml
@@ -3,12 +3,6 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-
         <Style x:Key="SevDot" TargetType="Ellipse">
             <Setter Property="Width" Value="8"/>
             <Setter Property="Height" Value="8"/>
@@ -23,7 +17,7 @@
         </Style>
     </UserControl.Resources>
 
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -87,12 +81,12 @@
             <!-- Warnings -->
             <Border Style="{StaticResource GlassCard}" Background="#14FBBF24" Margin="0,0,12,0">
                 <Grid>
-                    <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                    <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                             Margin="-16,-12,0,-12"/>
                     <StackPanel Orientation="Horizontal" Margin="4,0,0,0">
-                        <Ellipse Style="{StaticResource SevDot}" Fill="#FBBF24">
+                        <Ellipse Style="{StaticResource SevDot}" Fill="{DynamicResource WarningStripe}">
                             <Ellipse.Effect>
-                                <DropShadowEffect Color="#FBBF24" BlurRadius="8" ShadowDepth="0" Opacity="0.6"/>
+                                <DropShadowEffect Color="{DynamicResource WarningStripe}" BlurRadius="8" ShadowDepth="0" Opacity="0.6"/>
                             </Ellipse.Effect>
                         </Ellipse>
                         <TextBlock Text="{Binding WarningCount}" FontSize="20" FontWeight="Bold"
@@ -166,7 +160,7 @@
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Margin="0,0,14,0">
                         <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding ShowWarning}" VerticalAlignment="Center"/>
-                        <Ellipse Style="{StaticResource SevDot}" Fill="#FBBF24" Margin="8,0,6,0"/>
+                        <Ellipse Style="{StaticResource SevDot}" Fill="{DynamicResource WarningStripe}" Margin="8,0,6,0"/>
                         <TextBlock Text="Warning" Foreground="{DynamicResource TextPrimary}" VerticalAlignment="Center"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Margin="0,0,14,0">
diff --git a/SysManager/SysManager/Views/NetworkRepairView.xaml b/SysManager/SysManager/Views/NetworkRepairView.xaml
index dab5710..772ca70 100644
--- a/SysManager/SysManager/Views/NetworkRepairView.xaml
+++ b/SysManager/SysManager/Views/NetworkRepairView.xaml
@@ -2,14 +2,7 @@
 <UserControl x:Class="SysManager.Views.NetworkRepairView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -38,16 +31,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="1" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="1" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="28,12,28,0"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — you can reset network settings."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
diff --git a/SysManager/SysManager/Views/PerformanceView.xaml b/SysManager/SysManager/Views/PerformanceView.xaml
index 2edf012..fef2ef1 100644
--- a/SysManager/SysManager/Views/PerformanceView.xaml
+++ b/SysManager/SysManager/Views/PerformanceView.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d"
              Background="{DynamicResource Surface0}">
 
-    <Grid Margin="32,24">
+    <Grid Margin="28,24,28,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -43,16 +43,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="1" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="1" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="0,0,0,12"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — you can apply performance tweaks and create restore points."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
diff --git a/SysManager/SysManager/Views/PingView.xaml b/SysManager/SysManager/Views/PingView.xaml
index d122d93..a6f6b35 100644
--- a/SysManager/SysManager/Views/PingView.xaml
+++ b/SysManager/SysManager/Views/PingView.xaml
@@ -4,15 +4,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"
              xmlns:v="clr-namespace:SysManager.Views">
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
 
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -74,7 +67,7 @@
                         <StackPanel>
                             <TextBlock Text="WORST LOSS" Style="{StaticResource Caption}"/>
                             <TextBlock Text="{Binding Shared.Health.WorstLossPercent, StringFormat={}{0:F1}%}"
-                                       Style="{StaticResource Metric}" Foreground="#FBBF24"/>
+                                       Style="{StaticResource Metric}" Foreground="{DynamicResource WarningStripe}"/>
                         </StackPanel>
                     </Border>
                     <Border Style="{StaticResource CardInner}" Margin="8,0" Padding="16,8" MinWidth="110">
@@ -146,7 +139,7 @@
                                             </StackPanel>
                                             <StackPanel HorizontalAlignment="Center">
                                                 <TextBlock Text="{Binding LossPercent, StringFormat={}{0:F0}%}"
-                                                           Foreground="#FBBF24" FontWeight="Bold" FontSize="13" HorizontalAlignment="Center"/>
+                                                           Foreground="{DynamicResource WarningStripe}" FontWeight="Bold" FontSize="13" HorizontalAlignment="Center"/>
                                                 <TextBlock Text="LOSS" Foreground="#475569" FontSize="9" HorizontalAlignment="Center" Margin="0,2,0,0"/>
                                             </StackPanel>
                                         </StackPanel>
diff --git a/SysManager/SysManager/Views/PlaceholderView.xaml b/SysManager/SysManager/Views/PlaceholderView.xaml
index b3524b2..8d18059 100644
--- a/SysManager/SysManager/Views/PlaceholderView.xaml
+++ b/SysManager/SysManager/Views/PlaceholderView.xaml
@@ -2,15 +2,8 @@
 <UserControl x:Class="SysManager.Views.PlaceholderView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
 
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" MaxWidth="500">
             <!-- WIP Icon -->
             <TextBlock Text="&#xE9F5;" FontFamily="Segoe Fluent Icons,Segoe MDL2 Assets"
diff --git a/SysManager/SysManager/Views/PrivacyView.xaml b/SysManager/SysManager/Views/PrivacyView.xaml
index d0c0e73..0e1860d 100644
--- a/SysManager/SysManager/Views/PrivacyView.xaml
+++ b/SysManager/SysManager/Views/PrivacyView.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d"
              Background="{DynamicResource Surface0}">
 
-    <Grid Margin="32,24">
+    <Grid Margin="28,24,28,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -42,16 +42,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="1" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="1" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="0,0,0,12"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — all privacy toggles are available."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
@@ -78,14 +78,14 @@
                           Width="140" Margin="0,0,12,0"/>
 
                 <Border CornerRadius="10" Padding="10,4" Margin="4,0"
-                        Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+                        Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                         Visibility="{Binding IsElevated, Converter={StaticResource BoolToVis}}">
                     <Grid>
-                        <Border Background="#FBBF24" Width="3" HorizontalAlignment="Left" CornerRadius="2"
+                        <Border Background="{DynamicResource WarningStripe}" Width="3" HorizontalAlignment="Left" CornerRadius="2"
                                 Margin="-10,-4,0,-4"/>
                         <StackPanel Orientation="Horizontal" Margin="4,0,0,0">
                             <TextBlock Text="&#x1F6E1;" FontSize="11" VerticalAlignment="Center"/>
-                            <TextBlock Text="Administrator" FontSize="11" Foreground="#FCD34D"
+                            <TextBlock Text="Administrator" FontSize="11" Foreground="{DynamicResource WarningText}"
                                        FontWeight="SemiBold" Margin="6,0,0,0" VerticalAlignment="Center"/>
                         </StackPanel>
                     </Grid>
diff --git a/SysManager/SysManager/Views/ProcessManagerView.xaml b/SysManager/SysManager/Views/ProcessManagerView.xaml
index a6e2a6d..9756c10 100644
--- a/SysManager/SysManager/Views/ProcessManagerView.xaml
+++ b/SysManager/SysManager/Views/ProcessManagerView.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d"
              Background="{DynamicResource Surface0}">
 
-    <Grid Margin="32,24">
+    <Grid Margin="28,24,28,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
diff --git a/SysManager/SysManager/Views/ServicesView.xaml b/SysManager/SysManager/Views/ServicesView.xaml
index 09e4863..95d2f7a 100644
--- a/SysManager/SysManager/Views/ServicesView.xaml
+++ b/SysManager/SysManager/Views/ServicesView.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d"
              Background="{DynamicResource Surface0}">
 
-    <Grid Margin="32,24">
+    <Grid Margin="28,24,28,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -42,16 +42,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="1" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="1" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="0,0,0,12"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — you can start, stop, and configure services."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
diff --git a/SysManager/SysManager/Views/ShortcutCleanerView.xaml b/SysManager/SysManager/Views/ShortcutCleanerView.xaml
index 9ba9ff1..2df9a66 100644
--- a/SysManager/SysManager/Views/ShortcutCleanerView.xaml
+++ b/SysManager/SysManager/Views/ShortcutCleanerView.xaml
@@ -8,15 +8,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d">
 
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
-
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
diff --git a/SysManager/SysManager/Views/SpeedTestView.xaml b/SysManager/SysManager/Views/SpeedTestView.xaml
index 4b3f3f3..25895e0 100644
--- a/SysManager/SysManager/Views/SpeedTestView.xaml
+++ b/SysManager/SysManager/Views/SpeedTestView.xaml
@@ -2,15 +2,8 @@
 <UserControl x:Class="SysManager.Views.SpeedTestView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
 
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
diff --git a/SysManager/SysManager/Views/StartupView.xaml b/SysManager/SysManager/Views/StartupView.xaml
index ec88763..2e5d50c 100644
--- a/SysManager/SysManager/Views/StartupView.xaml
+++ b/SysManager/SysManager/Views/StartupView.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d"
              Background="{DynamicResource Surface0}">
 
-    <Grid Margin="32,24">
+    <Grid Margin="28,24,28,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
diff --git a/SysManager/SysManager/Views/SystemHealthView.xaml b/SysManager/SysManager/Views/SystemHealthView.xaml
index 64719d5..eaf2896 100644
--- a/SysManager/SysManager/Views/SystemHealthView.xaml
+++ b/SysManager/SysManager/Views/SystemHealthView.xaml
@@ -3,15 +3,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:v="clr-namespace:SysManager.Views">
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
 
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <ScrollViewer VerticalScrollBarVisibility="Auto">
             <StackPanel Margin="28,24,28,28">
 
@@ -43,16 +36,16 @@
                 </Border>
 
                 <!-- Elevation banner: elevated -->
-                <Border Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+                <Border Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                         CornerRadius="10" Padding="12,8" Margin="0,12,0,0"
                         Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
                     <Grid>
-                        <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                        <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                                 Margin="-12,-8,0,-8"/>
                         <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                             <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                             <TextBlock Text="Running as administrator — you can run disk integrity checks."
-                                       Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                                       Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                         </StackPanel>
                     </Grid>
                 </Border>
diff --git a/SysManager/SysManager/Views/TracerouteView.xaml b/SysManager/SysManager/Views/TracerouteView.xaml
index 8e9a78d..c615ce3 100644
--- a/SysManager/SysManager/Views/TracerouteView.xaml
+++ b/SysManager/SysManager/Views/TracerouteView.xaml
@@ -4,15 +4,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"
              xmlns:v="clr-namespace:SysManager.Views">
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
 
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
diff --git a/SysManager/SysManager/Views/UninstallerView.xaml b/SysManager/SysManager/Views/UninstallerView.xaml
index a6d5239..b78a0e1 100644
--- a/SysManager/SysManager/Views/UninstallerView.xaml
+++ b/SysManager/SysManager/Views/UninstallerView.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d"
              Background="{DynamicResource Surface0}">
 
-    <Grid Margin="32,24">
+    <Grid Margin="28,24,28,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -43,16 +43,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="1" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="1" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="0,0,0,12"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — you can uninstall any application."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
@@ -184,7 +184,7 @@
                                                     <Setter Property="Background" Value="{DynamicResource Accent}"/>
                                                     <Style.Triggers>
                                                         <DataTrigger Binding="{Binding Source}" Value="">
-                                                            <Setter Property="Background" Value="#FBBF24"/>
+                                                            <Setter Property="Background" Value="{DynamicResource WarningStripe}"/>
                                                         </DataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
@@ -197,7 +197,7 @@
                                                         <Setter Property="Fill" Value="#6366F1"/>
                                                         <Style.Triggers>
                                                             <DataTrigger Binding="{Binding Source}" Value="">
-                                                                <Setter Property="Fill" Value="#FBBF24"/>
+                                                                <Setter Property="Fill" Value="{DynamicResource WarningStripe}"/>
                                                             </DataTrigger>
                                                         </Style.Triggers>
                                                     </Style>
diff --git a/SysManager/SysManager/Views/WindowsFeaturesView.xaml b/SysManager/SysManager/Views/WindowsFeaturesView.xaml
index 6fe21f3..5157732 100644
--- a/SysManager/SysManager/Views/WindowsFeaturesView.xaml
+++ b/SysManager/SysManager/Views/WindowsFeaturesView.xaml
@@ -9,7 +9,7 @@
              mc:Ignorable="d"
              Background="{DynamicResource Surface0}">
 
-    <Grid Margin="32,24">
+    <Grid Margin="28,24,28,16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -48,14 +48,14 @@
                     <TextBlock Text="⚠ Reboot pending" FontSize="11" Foreground="{DynamicResource Warning}"/>
                 </Border>
                 <Border CornerRadius="10" Padding="10,5" Margin="4,0"
-                        Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+                        Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                         Visibility="{Binding IsElevated, Converter={StaticResource BoolToVis}}">
                     <Grid>
-                        <Border Background="#FBBF24" Width="3" HorizontalAlignment="Left" CornerRadius="2"
+                        <Border Background="{DynamicResource WarningStripe}" Width="3" HorizontalAlignment="Left" CornerRadius="2"
                                 Margin="-10,-5,0,-5"/>
                         <StackPanel Orientation="Horizontal" Margin="4,0,0,0">
                             <TextBlock Text="&#x1F6E1;" FontSize="11" VerticalAlignment="Center"/>
-                            <TextBlock Text="Administrator" Foreground="#FCD34D" FontSize="11"
+                            <TextBlock Text="Administrator" Foreground="{DynamicResource WarningText}" FontSize="11"
                                        FontWeight="SemiBold" Margin="6,0,0,0" VerticalAlignment="Center"/>
                         </StackPanel>
                     </Grid>
@@ -80,16 +80,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="2" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="2" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="0,0,0,12"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — you can enable and disable Windows features."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
diff --git a/SysManager/SysManager/Views/WindowsUpdateView.xaml b/SysManager/SysManager/Views/WindowsUpdateView.xaml
index 2395169..d48e4c4 100644
--- a/SysManager/SysManager/Views/WindowsUpdateView.xaml
+++ b/SysManager/SysManager/Views/WindowsUpdateView.xaml
@@ -8,15 +8,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d">
-    <UserControl.Resources>
-        <LinearGradientBrush x:Key="PageBg" StartPoint="0,0" EndPoint="1,1">
-            <GradientStop Color="#070A0F" Offset="0"/>
-            <GradientStop Color="#0B1220" Offset="0.5"/>
-            <GradientStop Color="#090D16" Offset="1"/>
-        </LinearGradientBrush>
-    </UserControl.Resources>
 
-    <Grid Background="{StaticResource PageBg}">
+    <Grid Background="{DynamicResource Surface0}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -52,16 +45,16 @@
         </Border>
 
         <!-- Elevation banner: elevated -->
-        <Border Grid.Row="1" Background="#1AFBBF24" BorderBrush="#40FBBF24" BorderThickness="1"
+        <Border Grid.Row="1" Background="{DynamicResource WarningBgSubtle}" BorderBrush="{DynamicResource WarningBg}" BorderThickness="1"
                 CornerRadius="10" Padding="12,8" Margin="28,12,28,0"
                 Visibility="{Binding IsElevated, Converter={StaticResource FlexVis}}">
             <Grid>
-                <Border Background="#FBBF24" Width="4" HorizontalAlignment="Left" CornerRadius="2"
+                <Border Background="{DynamicResource WarningStripe}" Width="4" HorizontalAlignment="Left" CornerRadius="2"
                         Margin="-12,-8,0,-8"/>
                 <StackPanel Orientation="Horizontal" Margin="6,0,0,0">
                     <TextBlock Text="&#x1F6E1;" FontSize="13" VerticalAlignment="Center"/>
                     <TextBlock Text="Running as administrator — you can list and install updates."
-                               Foreground="#FCD34D" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource WarningText}" FontSize="13" FontWeight="SemiBold" Margin="8,0,0,0" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Border>
@@ -258,7 +251,7 @@
                                                         <Setter Property="Foreground" Value="#FCA5A5"/>
                                                     </DataTrigger>
                                                     <DataTrigger Binding="{Binding Category}" Value="Cumulative">
-                                                        <Setter Property="Foreground" Value="#FCD34D"/>
+                                                        <Setter Property="Foreground" Value="{DynamicResource WarningText}"/>
                                                     </DataTrigger>
                                                     <DataTrigger Binding="{Binding Category}" Value="Defender">
                                                         <Setter Property="Foreground" Value="#86EFAC"/>