diff --git a/CHANGELOG.md b/CHANGELOG.md
index 642e3de1..4a2fc962 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,18 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Fixed
+- **UI uniformity audit** — replaced all remaining CheckBoxes with purple ToggleSwitch on:
+  Performance (5 toggles), Logs (5 severity filters), Ping targets, Process Manager,
+  Deep Cleanup categories.
+- **Hover consistency** — all interactive elements now use `#186366F1` purple tint.
+  Fixed: LogsView, DiskAnalyzer, NetworkRepair (3 cards), DuplicateFile (added missing hover).
+- **Dashboard** — replaced green Tune-Up button with PrimaryButton (purple), green borders
+  with Accent.
+- **Ping targets** — green tint background replaced with purple.
+- **Hardcoded colors → StaticResource** — ~30 instances replaced across 8 views
+  (Danger, Success, Warning, Info, Accent tokens).
+
 ## [1.10.0] - 2026-05-26
 
 ### Added
diff --git a/SysManager/SysManager/Views/BatteryHealthView.xaml b/SysManager/SysManager/Views/BatteryHealthView.xaml
index f13667c4..93f29a60 100644
--- a/SysManager/SysManager/Views/BatteryHealthView.xaml
+++ b/SysManager/SysManager/Views/BatteryHealthView.xaml
@@ -97,7 +97,7 @@
                                 <StackPanel Grid.Column="1">
                                     <TextBlock Text="Wear" Style="{StaticResource Subtle}" FontSize="12"/>
                                     <TextBlock FontSize="24" FontWeight="Bold" Margin="0,4,0,0"
-                                               Foreground="#EF4444">
+                                               Foreground="{StaticResource Danger}">
                                         <Run Text="{Binding Battery.WearPercent, Mode=OneWay}"/><Run Text="%"/>
                                     </TextBlock>
                                 </StackPanel>
diff --git a/SysManager/SysManager/Views/CleanupView.xaml b/SysManager/SysManager/Views/CleanupView.xaml
index a9de23d7..fff83f54 100644
--- a/SysManager/SysManager/Views/CleanupView.xaml
+++ b/SysManager/SysManager/Views/CleanupView.xaml
@@ -69,7 +69,7 @@
                         <StackPanel>
                             <TextBlock Text="TEMP FOLDERS" Style="{StaticResource Caption}"/>
                             <TextBlock Text="{Binding TempSizeLabel}" FontSize="16" FontWeight="SemiBold"
-                                       Foreground="#60A5FA" Margin="0,4,0,0"/>
+                                       Foreground="{StaticResource Info}" Margin="0,4,0,0"/>
                         </StackPanel>
                     </Border>
                     <Border Grid.Column="1" Style="{StaticResource CardInner}" Margin="6,0,0,0">
@@ -99,8 +99,8 @@
                      are running so the user can navigate away freely. -->
                 <StackPanel Orientation="Horizontal" Margin="0,10,0,0"
                             Visibility="{Binding IsSfcRunning, Converter={StaticResource FlexVis}}">
-                    <Ellipse Width="10" Height="10" VerticalAlignment="Center" Margin="0,0,8,0" Fill="#22C55E"/>
-                    <TextBlock Text="SFC /scannow is running in background — " Foreground="#22C55E" FontWeight="SemiBold" VerticalAlignment="Center"/>
+                    <Ellipse Width="10" Height="10" VerticalAlignment="Center" Margin="0,0,8,0" Fill="{StaticResource Success}"/>
+                    <TextBlock Text="SFC /scannow is running in background — " Foreground="{StaticResource Success}" FontWeight="SemiBold" VerticalAlignment="Center"/>
                     <TextBlock Text="{Binding SfcStatus}" Foreground="{StaticResource TextSecondary}" VerticalAlignment="Center"/>
                 </StackPanel>
                 <!-- SFC verdict (shown after completion) -->
@@ -118,8 +118,8 @@
                 </Border>
                 <StackPanel Orientation="Horizontal" Margin="0,6,0,0"
                             Visibility="{Binding IsDismRunning, Converter={StaticResource FlexVis}}">
-                    <Ellipse Width="10" Height="10" VerticalAlignment="Center" Margin="0,0,8,0" Fill="#60A5FA"/>
-                    <TextBlock Text="DISM is running in background — " Foreground="#60A5FA" FontWeight="SemiBold" VerticalAlignment="Center"/>
+                    <Ellipse Width="10" Height="10" VerticalAlignment="Center" Margin="0,0,8,0" Fill="{StaticResource Info}"/>
+                    <TextBlock Text="DISM is running in background — " Foreground="{StaticResource Info}" FontWeight="SemiBold" VerticalAlignment="Center"/>
                     <TextBlock Text="{Binding DismStatus}" Foreground="{StaticResource TextSecondary}" VerticalAlignment="Center"/>
                 </StackPanel>
                 <!-- DISM verdict (shown after completion) -->
diff --git a/SysManager/SysManager/Views/DashboardView.xaml b/SysManager/SysManager/Views/DashboardView.xaml
index 4b4a047f..898dd698 100644
--- a/SysManager/SysManager/Views/DashboardView.xaml
+++ b/SysManager/SysManager/Views/DashboardView.xaml
@@ -70,14 +70,8 @@
 
             <Button Margin="12,0,0,0" Padding="16,8" FontWeight="SemiBold"
                     FontSize="14" Command="{Binding RunTuneUpCommand}"
+                    Style="{StaticResource PrimaryButton}"
                     AutomationProperties.Name="Quick Tune-Up">
-                <Button.Style>
-                    <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-                        <Setter Property="Background" Value="#238636"/>
-                        <Setter Property="Foreground" Value="White"/>
-                        <Setter Property="BorderBrush" Value="#2EA043"/>
-                    </Style>
-                </Button.Style>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="&#xE945;" FontFamily="Segoe Fluent Icons" FontSize="16"
                                VerticalAlignment="Center" Margin="0,0,8,0"/>
@@ -173,7 +167,7 @@
 
                 <!-- Tune-Up progress panel -->
                 <Border CornerRadius="8" Padding="14" Background="#0D1117" Margin="0,0,0,8"
-                        BorderBrush="#238636" BorderThickness="1"
+                        BorderBrush="{StaticResource Accent}" BorderThickness="1"
                         Visibility="{Binding IsTuneUpRunning, Converter={StaticResource BoolToVis}}">
                     <StackPanel>
                         <TextBlock Text="Quick Tune-Up in progress…" FontWeight="SemiBold" FontSize="14"
@@ -186,7 +180,7 @@
 
                 <!-- Tune-Up result summary card -->
                 <Border CornerRadius="8" Padding="14" Background="#0D1117" Margin="0,0,0,12"
-                        BorderBrush="#238636" BorderThickness="1"
+                        BorderBrush="{StaticResource Accent}" BorderThickness="1"
                         Visibility="{Binding HasTuneUpResult, Converter={StaticResource BoolToVis}}">
                     <StackPanel>
                         <Grid>
diff --git a/SysManager/SysManager/Views/DiskAnalyzerView.xaml b/SysManager/SysManager/Views/DiskAnalyzerView.xaml
index 59ce5e35..20e8a897 100644
--- a/SysManager/SysManager/Views/DiskAnalyzerView.xaml
+++ b/SysManager/SysManager/Views/DiskAnalyzerView.xaml
@@ -85,7 +85,7 @@
                                     </Border>
                                     <ControlTemplate.Triggers>
                                         <Trigger Property="IsMouseOver" Value="True">
-                                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource Surface2}"/>
+                                            <Setter TargetName="Bd" Property="Background" Value="#186366F1"/>
                                         </Trigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
diff --git a/SysManager/SysManager/Views/DnsHostsView.xaml b/SysManager/SysManager/Views/DnsHostsView.xaml
index c8270a48..8edde912 100644
--- a/SysManager/SysManager/Views/DnsHostsView.xaml
+++ b/SysManager/SysManager/Views/DnsHostsView.xaml
@@ -64,7 +64,7 @@
                     <TextBlock Text="Current DNS:" VerticalAlignment="Center" Margin="0,0,8,0"
                                Style="{StaticResource Subtle}"/>
                     <TextBlock Text="{Binding CurrentDns}" VerticalAlignment="Center"
-                               FontWeight="SemiBold" Foreground="#60A5FA"/>
+                               FontWeight="SemiBold" Foreground="{StaticResource Accent}"/>
                 </DockPanel>
 
                 <DockPanel Margin="0,0,0,12">
diff --git a/SysManager/SysManager/Views/DuplicateFileView.xaml b/SysManager/SysManager/Views/DuplicateFileView.xaml
index 68ad0cc2..96d7b197 100644
--- a/SysManager/SysManager/Views/DuplicateFileView.xaml
+++ b/SysManager/SysManager/Views/DuplicateFileView.xaml
@@ -66,6 +66,11 @@
                         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
                         <Setter Property="Padding" Value="0"/>
                         <Setter Property="Margin" Value="0"/>
+                        <Style.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="#186366F1"/>
+                            </Trigger>
+                        </Style.Triggers>
                     </Style>
                 </ListView.ItemContainerStyle>
                 <ListView.ItemTemplate>
diff --git a/SysManager/SysManager/Views/LogsView.xaml b/SysManager/SysManager/Views/LogsView.xaml
index 9e8698be..9fbc1c0c 100644
--- a/SysManager/SysManager/Views/LogsView.xaml
+++ b/SysManager/SysManager/Views/LogsView.xaml
@@ -153,29 +153,29 @@
                 <StackPanel Orientation="Horizontal" Margin="0,12,0,0">
                     <TextBlock Text="Show" Style="{StaticResource Subtle}" VerticalAlignment="Center" Margin="0,0,10,0"/>
 
-                    <!-- Each checkbox has its own colored dot next to the label -->
+                    <!-- Each toggle has its own colored dot next to the label -->
                     <StackPanel Orientation="Horizontal" Margin="0,0,14,0">
-                        <CheckBox IsChecked="{Binding ShowCritical}" VerticalAlignment="Center"/>
+                        <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding ShowCritical}" VerticalAlignment="Center"/>
                         <Ellipse Style="{StaticResource SevDot}" Fill="#FF3B30" Margin="8,0,6,0"/>
                         <TextBlock Text="Critical" Foreground="{StaticResource TextPrimary}" VerticalAlignment="Center"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Margin="0,0,14,0">
-                        <CheckBox IsChecked="{Binding ShowError}" VerticalAlignment="Center"/>
+                        <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding ShowError}" VerticalAlignment="Center"/>
                         <Ellipse Style="{StaticResource SevDot}" Fill="#F87171" Margin="8,0,6,0"/>
                         <TextBlock Text="Error" Foreground="{StaticResource TextPrimary}" VerticalAlignment="Center"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Margin="0,0,14,0">
-                        <CheckBox IsChecked="{Binding ShowWarning}" VerticalAlignment="Center"/>
+                        <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding ShowWarning}" VerticalAlignment="Center"/>
                         <Ellipse Style="{StaticResource SevDot}" Fill="#FBBF24" Margin="8,0,6,0"/>
                         <TextBlock Text="Warning" Foreground="{StaticResource TextPrimary}" VerticalAlignment="Center"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Margin="0,0,14,0">
-                        <CheckBox IsChecked="{Binding ShowInfo}" VerticalAlignment="Center"/>
+                        <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding ShowInfo}" VerticalAlignment="Center"/>
                         <Ellipse Style="{StaticResource SevDot}" Fill="#38BDF8" Margin="8,0,6,0"/>
                         <TextBlock Text="Info" Foreground="{StaticResource TextPrimary}" VerticalAlignment="Center"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Margin="0,0,22,0">
-                        <CheckBox IsChecked="{Binding ShowVerbose}" VerticalAlignment="Center"/>
+                        <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding ShowVerbose}" VerticalAlignment="Center"/>
                         <Ellipse Style="{StaticResource SevDot}" Fill="#9AA0A6" Margin="8,0,6,0"/>
                         <TextBlock Text="Verbose" Foreground="{StaticResource TextPrimary}" VerticalAlignment="Center"/>
                     </StackPanel>
@@ -233,9 +233,6 @@
                             <Setter Property="Foreground" Value="{StaticResource TextPrimary}"/>
                             <Setter Property="BorderThickness" Value="0"/>
                             <Style.Triggers>
-                                <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Background" Value="{StaticResource Surface2}"/>
-                                </Trigger>
                                 <Trigger Property="IsSelected" Value="True">
                                     <Setter Property="Background" Value="{StaticResource Surface3}"/>
                                     <Setter Property="Foreground" Value="{StaticResource TextPrimary}"/>
diff --git a/SysManager/SysManager/Views/NetworkRepairView.xaml b/SysManager/SysManager/Views/NetworkRepairView.xaml
index b5ece5bc..8f0404d8 100644
--- a/SysManager/SysManager/Views/NetworkRepairView.xaml
+++ b/SysManager/SysManager/Views/NetworkRepairView.xaml
@@ -64,7 +64,7 @@
                             <Setter Property="BorderBrush" Value="{StaticResource Border1}"/>
                             <Style.Triggers>
                                 <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Background" Value="#10141D"/>
+                                    <Setter Property="Background" Value="#186366F1"/>
                                     <Setter Property="BorderBrush" Value="#2A3244"/>
                                 </Trigger>
                             </Style.Triggers>
@@ -88,7 +88,7 @@
                             <Setter Property="BorderBrush" Value="{StaticResource Border1}"/>
                             <Style.Triggers>
                                 <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Background" Value="#10141D"/>
+                                    <Setter Property="Background" Value="#186366F1"/>
                                     <Setter Property="BorderBrush" Value="#2A3244"/>
                                 </Trigger>
                             </Style.Triggers>
@@ -112,7 +112,7 @@
                             <Setter Property="BorderBrush" Value="{StaticResource Border1}"/>
                             <Style.Triggers>
                                 <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Background" Value="#10141D"/>
+                                    <Setter Property="Background" Value="#186366F1"/>
                                     <Setter Property="BorderBrush" Value="#2A3244"/>
                                 </Trigger>
                             </Style.Triggers>
@@ -132,7 +132,7 @@
                 <TextBlock Text="{Binding RepairStatus}" Style="{StaticResource Subtle}" Margin="0,4,0,0"
                            Visibility="{Binding RepairStatus, Converter={StaticResource FlexVis}}"/>
                 <TextBlock Text="⚠ A reboot is required for changes to take effect."
-                           Foreground="#EF4444" FontSize="12" Margin="0,8,0,0"
+                           Foreground="{StaticResource Danger}" FontSize="12" Margin="0,8,0,0"
                            Visibility="{Binding RepairNeedsReboot, Converter={StaticResource BoolToVis}}"/>
             </StackPanel>
         </Border>
diff --git a/SysManager/SysManager/Views/PerformanceView.xaml b/SysManager/SysManager/Views/PerformanceView.xaml
index ad1b17e4..216c0724 100644
--- a/SysManager/SysManager/Views/PerformanceView.xaml
+++ b/SysManager/SysManager/Views/PerformanceView.xaml
@@ -73,10 +73,10 @@
             <StackPanel>
                 <TextBlock Text="{Binding Summary}" FontWeight="SemiBold" FontSize="13"/>
                 <TextBlock Text="⚠ GPU changes require a reboot to take effect."
-                           Foreground="#EF4444" FontSize="12" Margin="0,4,0,0"
+                           Foreground="{StaticResource Danger}" FontSize="12" Margin="0,4,0,0"
                            Visibility="{Binding NeedsReboot, Converter={StaticResource BoolToVis}}"/>
                 <TextBlock Text="✓ Original settings snapshot saved — Restore All is available."
-                           Foreground="#22C55E" FontSize="12" Margin="0,4,0,0"
+                           Foreground="{StaticResource Success}" FontSize="12" Margin="0,4,0,0"
                            Visibility="{Binding HasSnapshot, Converter={StaticResource BoolToVis}}"/>
             </StackPanel>
         </Border>
@@ -111,8 +111,10 @@
                     <TextBlock Text="Visual Effects" FontWeight="Bold" FontSize="15" Margin="0,0,0,8"/>
                     <Border Style="{StaticResource Card}" Padding="16" Margin="0,0,0,16">
                         <StackPanel>
-                            <CheckBox Content="Reduce visual effects (disable animations, fades, shadows)"
-                                      IsChecked="{Binding WantVisualEffectsReduced}" Margin="0,0,0,4"/>
+                            <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
+                                <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding WantVisualEffectsReduced}" VerticalAlignment="Center"/>
+                                <TextBlock Text="Reduce visual effects (disable animations, fades, shadows)" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                            </StackPanel>
                             <TextBlock Text="Uses SystemParametersInfo — takes effect instantly, no logout needed."
                                        Style="{StaticResource Subtle}" FontSize="11" Margin="20,0,0,8"/>
                             <Button Content="Apply Visual Effects" Command="{Binding ApplyVisualEffectsCommand}"
@@ -124,8 +126,10 @@
                     <TextBlock Text="Game Mode" FontWeight="Bold" FontSize="15" Margin="0,0,0,8"/>
                     <Border Style="{StaticResource Card}" Padding="16" Margin="0,0,0,16">
                         <StackPanel>
-                            <CheckBox Content="Disable Game Mode (stop Windows from prioritizing game processes)"
-                                      IsChecked="{Binding WantGameModeOff}" Margin="0,0,0,8"/>
+                            <StackPanel Orientation="Horizontal" Margin="0,0,0,8">
+                                <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding WantGameModeOff}" VerticalAlignment="Center"/>
+                                <TextBlock Text="Disable Game Mode (stop Windows from prioritizing game processes)" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                            </StackPanel>
                             <Button Content="Apply Game Mode" Command="{Binding ApplyGameModeCommand}"
                                     Style="{StaticResource SecondaryButton}" HorizontalAlignment="Left"/>
                         </StackPanel>
@@ -135,8 +139,10 @@
                     <TextBlock Text="Overlays" FontWeight="Bold" FontSize="15" Margin="0,0,0,8"/>
                     <Border Style="{StaticResource Card}" Padding="16" Margin="0,0,0,16">
                         <StackPanel>
-                            <CheckBox Content="Disable Xbox Game Bar / Game DVR overlay"
-                                      IsChecked="{Binding WantXboxGameBarOff}" Margin="0,0,0,4"/>
+                            <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
+                                <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding WantXboxGameBarOff}" VerticalAlignment="Center"/>
+                                <TextBlock Text="Disable Xbox Game Bar / Game DVR overlay" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                            </StackPanel>
                             <TextBlock Text="Disables AppCaptureEnabled and GameDVR_Enabled via registry. Instant, reversible."
                                        Style="{StaticResource Subtle}" FontSize="11" Margin="20,0,0,8"/>
                             <Button Content="Apply Xbox Game Bar" Command="{Binding ApplyXboxGameBarCommand}"
@@ -162,9 +168,10 @@
                     <TextBlock Text="GPU" FontWeight="Bold" FontSize="15" Margin="0,0,0,8"/>
                     <Border Style="{StaticResource Card}" Padding="16" Margin="0,0,0,16">
                         <StackPanel>
-                            <CheckBox Content="NVIDIA GPU — Prefer Maximum Performance (requires reboot)"
-                                      IsChecked="{Binding WantGpuMaxPerformance}"
-                                      IsEnabled="{Binding HasNvidiaGpu}" Margin="0,0,0,4"/>
+                            <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
+                                <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding WantGpuMaxPerformance}" IsEnabled="{Binding HasNvidiaGpu}" VerticalAlignment="Center"/>
+                                <TextBlock Text="NVIDIA GPU — Prefer Maximum Performance (requires reboot)" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                            </StackPanel>
                             <TextBlock Style="{StaticResource Subtle}" FontSize="11" Margin="20,0,0,4"
                                        Visibility="{Binding HasNvidiaGpu, Converter={StaticResource BoolToVis}}">
                                 <Run Text="Detected:"/>
@@ -184,14 +191,14 @@
                     <TextBlock Text="Processor State" FontWeight="Bold" FontSize="15" Margin="0,0,0,8"/>
                     <Border Style="{StaticResource Card}" Padding="16" Margin="0,0,0,16">
                         <StackPanel>
-                            <CheckBox Content="Processor min state 100% (force max CPU frequency)"
-                                      IsChecked="{Binding WantProcessorMaxState}"
-                                      IsEnabled="{Binding IsProcessorStateEditable}"
-                                      Margin="0,0,0,4"/>
+                            <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
+                                <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding WantProcessorMaxState}" IsEnabled="{Binding IsProcessorStateEditable}" VerticalAlignment="Center"/>
+                                <TextBlock Text="Processor min state 100% (force max CPU frequency)" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                            </StackPanel>
                             <TextBlock Text="Prevents CPU from downclocking. Increases power consumption."
                                        Style="{StaticResource Subtle}" FontSize="11" Margin="20,0,0,4"/>
                             <TextBlock Text="⚠ Locked to 100 % by the current power plan (High / Ultimate). Switch to Balanced to adjust."
-                                       Foreground="#F59E0B" FontSize="11" Margin="20,0,0,4"
+                                       Foreground="{StaticResource Warning}" FontSize="11" Margin="20,0,0,4"
                                        TextWrapping="Wrap"
                                        Visibility="{Binding IsProcessorStateLocked, Converter={StaticResource BoolToVis}}"/>
                             <Button Content="Apply Processor State" Command="{Binding ApplyProcessorStateCommand}"
@@ -222,7 +229,7 @@
                                 Same as "Empty Working Set" in RAMMap. Useful before launching a game.
                             </TextBlock>
                             <TextBlock Text="⚠ Apps may feel briefly slower on next access as pages are faulted back in."
-                                       Foreground="#F59E0B" FontSize="11" Margin="0,0,0,8"/>
+                                       Foreground="{StaticResource Warning}" FontSize="11" Margin="0,0,0,8"/>
                             <Button Content="Trim RAM Now" Command="{Binding TrimRamCommand}"
                                     Style="{StaticResource SecondaryButton}" HorizontalAlignment="Left"/>
                         </StackPanel>
@@ -240,10 +247,10 @@
                             <StackPanel Orientation="Horizontal" Margin="0,4,0,8">
                                 <TextBlock Text="Currently: " Style="{StaticResource Subtle}" VerticalAlignment="Center"/>
                                 <TextBlock VerticalAlignment="Center" FontWeight="SemiBold"
-                                           Text="Enabled" Foreground="#22C55E"
+                                           Text="Enabled" Foreground="{StaticResource Success}"
                                            Visibility="{Binding IsHibernationEnabled, Converter={StaticResource BoolToVis}}"/>
                                 <TextBlock VerticalAlignment="Center" FontWeight="SemiBold"
-                                           Text="Disabled" Foreground="#EF4444"
+                                           Text="Disabled" Foreground="{StaticResource Danger}"
                                            Visibility="{Binding IsHibernationEnabled, Converter={StaticResource FlexVis}, ConverterParameter=Inverse}"/>
                             </StackPanel>
                             <Button Content="Toggle Hibernation" Command="{Binding ToggleHibernationCommand}"
diff --git a/SysManager/SysManager/Views/PingView.xaml b/SysManager/SysManager/Views/PingView.xaml
index 5b980557..2af8e78e 100644
--- a/SysManager/SysManager/Views/PingView.xaml
+++ b/SysManager/SysManager/Views/PingView.xaml
@@ -109,7 +109,7 @@
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
                             <Border Margin="0,0,10,10" Padding="14,12" CornerRadius="12"
-                                    Background="#0D22C55E" BorderBrush="#0AFFFFFF" BorderThickness="1">
+                                    Background="#0D6366F1" BorderBrush="#0AFFFFFF" BorderThickness="1">
                                 <Grid>
                                     <Border Background="{Binding ColorHex, Converter={StaticResource HexBrush}}"
                                             Width="4" HorizontalAlignment="Left" CornerRadius="2"
@@ -117,7 +117,7 @@
                                     <DockPanel Margin="6,0,0,0">
                                         <StackPanel DockPanel.Dock="Left" VerticalAlignment="Center" MinWidth="100">
                                             <StackPanel Orientation="Horizontal">
-                                                <CheckBox IsChecked="{Binding IsEnabled}" VerticalAlignment="Center" Margin="0,0,6,0"/>
+                                                <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding IsEnabled}" VerticalAlignment="Center" Margin="0,0,6,0"/>
                                                 <TextBlock Text="{Binding Name}" FontWeight="SemiBold" FontSize="13" VerticalAlignment="Center"/>
                                             </StackPanel>
                                             <TextBlock Text="{Binding Host}" Foreground="{StaticResource TextMuted}" FontSize="11" Margin="22,2,0,0"/>
diff --git a/SysManager/SysManager/Views/ProcessManagerView.xaml b/SysManager/SysManager/Views/ProcessManagerView.xaml
index 95640886..d4709309 100644
--- a/SysManager/SysManager/Views/ProcessManagerView.xaml
+++ b/SysManager/SysManager/Views/ProcessManagerView.xaml
@@ -39,9 +39,11 @@
                                VerticalAlignment="Center" FontSize="12"
                                Visibility="{Binding FilterText, Converter={StaticResource FlexVis}, ConverterParameter=Inverse}"/>
                 </Grid>
-                <CheckBox Content="Show only apps" IsChecked="{Binding ShowOnlyApps}"
-                          VerticalAlignment="Center" Margin="4,0,0,0"
-                          ToolTip="Hide system processes and show only applications with a visible window"/>
+                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="4,0,0,0"
+                            ToolTip="Hide system processes and show only applications with a visible window">
+                    <ToggleButton Style="{StaticResource ToggleSwitch}" IsChecked="{Binding ShowOnlyApps}" VerticalAlignment="Center"/>
+                    <TextBlock Text="Show only apps" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                </StackPanel>
             </WrapPanel>
         </Border>
 
@@ -175,7 +177,7 @@
                                             Command="{Binding DataContext.KillProcessCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
                                             CommandParameter="{Binding}"
                                             Style="{StaticResource GhostButton}" Padding="6,2" FontSize="12"
-                                            Foreground="#EF4444"/>
+                                            Foreground="{StaticResource Danger}"/>
                                 </StackPanel>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
diff --git a/SysManager/SysManager/Views/SpeedTestView.xaml b/SysManager/SysManager/Views/SpeedTestView.xaml
index 54d26882..b7d01bbd 100644
--- a/SysManager/SysManager/Views/SpeedTestView.xaml
+++ b/SysManager/SysManager/Views/SpeedTestView.xaml
@@ -47,9 +47,9 @@
                         </DockPanel>
                         <Grid Margin="0,16,0,0" Visibility="{Binding OoklaResult, Converter={StaticResource FlexVis}}">
                             <Grid.ColumnDefinitions><ColumnDefinition Width="*"/><ColumnDefinition Width="*"/><ColumnDefinition Width="*"/></Grid.ColumnDefinitions>
-                            <Border Grid.Column="0" Style="{StaticResource CardInner}" Margin="0,0,6,0"><StackPanel><TextBlock Text="DOWNLOAD" Style="{StaticResource Caption}"/><TextBlock Text="{Binding OoklaResult.DownloadMbps, StringFormat={}{0:F1} Mbps}" Style="{StaticResource Metric}" Foreground="#60A5FA"/></StackPanel></Border>
-                            <Border Grid.Column="1" Style="{StaticResource CardInner}" Margin="6,0"><StackPanel><TextBlock Text="UPLOAD" Style="{StaticResource Caption}"/><TextBlock Text="{Binding OoklaResult.UploadMbps, StringFormat={}{0:F1} Mbps}" Style="{StaticResource Metric}" Foreground="#4ADE80"/></StackPanel></Border>
-                            <Border Grid.Column="2" Style="{StaticResource CardInner}" Margin="6,0,0,0"><StackPanel><TextBlock Text="PING" Style="{StaticResource Caption}"/><TextBlock Text="{Binding OoklaResult.PingMs, StringFormat={}{0:F0} ms}" Style="{StaticResource Metric}" Foreground="#FBBF24"/></StackPanel></Border>
+                            <Border Grid.Column="0" Style="{StaticResource CardInner}" Margin="0,0,6,0"><StackPanel><TextBlock Text="DOWNLOAD" Style="{StaticResource Caption}"/><TextBlock Text="{Binding OoklaResult.DownloadMbps, StringFormat={}{0:F1} Mbps}" Style="{StaticResource Metric}" Foreground="{StaticResource Info}"/></StackPanel></Border>
+                            <Border Grid.Column="1" Style="{StaticResource CardInner}" Margin="6,0"><StackPanel><TextBlock Text="UPLOAD" Style="{StaticResource Caption}"/><TextBlock Text="{Binding OoklaResult.UploadMbps, StringFormat={}{0:F1} Mbps}" Style="{StaticResource Metric}" Foreground="{StaticResource Success}"/></StackPanel></Border>
+                            <Border Grid.Column="2" Style="{StaticResource CardInner}" Margin="6,0,0,0"><StackPanel><TextBlock Text="PING" Style="{StaticResource Caption}"/><TextBlock Text="{Binding OoklaResult.PingMs, StringFormat={}{0:F0} ms}" Style="{StaticResource Metric}" Foreground="{StaticResource Warning}"/></StackPanel></Border>
                         </Grid>
                         <TextBlock Text="{Binding OoklaResult.Server}" Style="{StaticResource Caption}" Margin="0,10,0,0" Visibility="{Binding OoklaResult, Converter={StaticResource FlexVis}}"/>
                         <ProgressBar AutomationProperties.Name="Progress" Value="{Binding SpeedProgress}" Maximum="100" Height="4" Margin="0,14,0,0" Visibility="{Binding IsOoklaTesting, Converter={StaticResource FlexVis}}"/>
@@ -72,9 +72,9 @@
                         </DockPanel>
                         <Grid Margin="0,16,0,0" Visibility="{Binding HttpResult, Converter={StaticResource FlexVis}}">
                             <Grid.ColumnDefinitions><ColumnDefinition Width="*"/><ColumnDefinition Width="*"/><ColumnDefinition Width="*"/></Grid.ColumnDefinitions>
-                            <Border Grid.Column="0" Style="{StaticResource CardInner}" Margin="0,0,6,0"><StackPanel><TextBlock Text="DOWNLOAD" Style="{StaticResource Caption}"/><TextBlock Text="{Binding HttpResult.DownloadMbps, StringFormat={}{0:F1} Mbps}" Style="{StaticResource Metric}" Foreground="#60A5FA"/></StackPanel></Border>
-                            <Border Grid.Column="1" Style="{StaticResource CardInner}" Margin="6,0"><StackPanel><TextBlock Text="UPLOAD" Style="{StaticResource Caption}"/><TextBlock Text="{Binding HttpResult.UploadMbps, StringFormat={}{0:F1} Mbps}" Style="{StaticResource Metric}" Foreground="#4ADE80"/></StackPanel></Border>
-                            <Border Grid.Column="2" Style="{StaticResource CardInner}" Margin="6,0,0,0"><StackPanel><TextBlock Text="PING" Style="{StaticResource Caption}"/><TextBlock Text="{Binding HttpResult.PingMs, StringFormat={}{0:F0} ms}" Style="{StaticResource Metric}" Foreground="#FBBF24"/></StackPanel></Border>
+                            <Border Grid.Column="0" Style="{StaticResource CardInner}" Margin="0,0,6,0"><StackPanel><TextBlock Text="DOWNLOAD" Style="{StaticResource Caption}"/><TextBlock Text="{Binding HttpResult.DownloadMbps, StringFormat={}{0:F1} Mbps}" Style="{StaticResource Metric}" Foreground="{StaticResource Info}"/></StackPanel></Border>
+                            <Border Grid.Column="1" Style="{StaticResource CardInner}" Margin="6,0"><StackPanel><TextBlock Text="UPLOAD" Style="{StaticResource Caption}"/><TextBlock Text="{Binding HttpResult.UploadMbps, StringFormat={}{0:F1} Mbps}" Style="{StaticResource Metric}" Foreground="{StaticResource Success}"/></StackPanel></Border>
+                            <Border Grid.Column="2" Style="{StaticResource CardInner}" Margin="6,0,0,0"><StackPanel><TextBlock Text="PING" Style="{StaticResource Caption}"/><TextBlock Text="{Binding HttpResult.PingMs, StringFormat={}{0:F0} ms}" Style="{StaticResource Metric}" Foreground="{StaticResource Warning}"/></StackPanel></Border>
                         </Grid>
                         <ProgressBar AutomationProperties.Name="Progress" Value="{Binding SpeedProgress}" Maximum="100" Height="4" Margin="0,14,0,0" Visibility="{Binding IsHttpTesting, Converter={StaticResource FlexVis}}"/>
                         <TextBlock Text="{Binding HttpStatus}" Style="{StaticResource Subtle}" Margin="0,6,0,0"/>
diff --git a/SysManager/SysManager/Views/SystemHealthView.xaml b/SysManager/SysManager/Views/SystemHealthView.xaml
index 3a8910af..34585e4e 100644
--- a/SysManager/SysManager/Views/SystemHealthView.xaml
+++ b/SysManager/SysManager/Views/SystemHealthView.xaml
@@ -258,7 +258,7 @@
                                         <Setter Property="Fill" Value="{StaticResource TextSecondary}"/>
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding IsChkdskRunning}" Value="True">
-                                                <Setter Property="Fill" Value="#22C55E"/>
+                                                <Setter Property="Fill" Value="{StaticResource Success}"/>
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
@@ -270,7 +270,7 @@
                                         <Setter Property="Foreground" Value="{StaticResource TextSecondary}"/>
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding IsChkdskRunning}" Value="True">
-                                                <Setter Property="Foreground" Value="#22C55E"/>
+                                                <Setter Property="Foreground" Value="{StaticResource Success}"/>
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>