From e2de64625a5a3c16653416f3a2798124a44eeeec Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Fri, 16 Oct 2026 14:40:37 +0000
Subject: [PATCH 1/3] Add a Look setting with Frutiger Aero and Metal Heart
 themes

Every colour, font and shape the window reads now comes from a pair of
resource dictionaries under Themes/ (one dark, one light) that
Theme.Apply merges in, so a new look is two XAML files and one line in
the list. Settings gets a Look picker next to the dark/light one; both
apply live and are remembered in settings.json.

Looks: Rack faceplate (unchanged default), Frutiger Aero (glass panels
over sky and grass, glossy pills, Segoe UI) and Metal Heart (brushed
steel, bevelled edges, chrome-red accent, Bahnschrift display face).
The smoke test now screenshots each look so they can be compared from
the CI run.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XaLCFyaNVfAWPcHVakuuu8
---
 README.md                                     |  4 +-
 src/ProDHCPServer.App/App.xaml                | 38 ++++++----
 src/ProDHCPServer.App/App.xaml.cs             |  3 +-
 src/ProDHCPServer.App/Converters.cs           | 29 ++++++--
 src/ProDHCPServer.App/MainWindow.xaml         | 23 ++++--
 src/ProDHCPServer.App/Theme.cs                | 73 +++++++++---------
 .../Themes/Faceplate.Dark.xaml                | 51 +++++++++++++
 .../Themes/Faceplate.Light.xaml               | 51 +++++++++++++
 .../Themes/FrutigerAero.Dark.xaml             | 64 ++++++++++++++++
 .../Themes/FrutigerAero.Light.xaml            | 64 ++++++++++++++++
 .../Themes/MetalHeart.Dark.xaml               | 74 +++++++++++++++++++
 .../Themes/MetalHeart.Light.xaml              | 74 +++++++++++++++++++
 .../ViewModels/MainViewModel.cs               | 10 ++-
 .../ViewModels/SettingsViewModel.cs           |  9 ++-
 src/ProDHCPServer.Core/AppSettings.cs         |  2 +
 tools/smoke-test.ps1                          | 20 +++--
 16 files changed, 514 insertions(+), 75 deletions(-)
 create mode 100644 src/ProDHCPServer.App/Themes/Faceplate.Dark.xaml
 create mode 100644 src/ProDHCPServer.App/Themes/Faceplate.Light.xaml
 create mode 100644 src/ProDHCPServer.App/Themes/FrutigerAero.Dark.xaml
 create mode 100644 src/ProDHCPServer.App/Themes/FrutigerAero.Light.xaml
 create mode 100644 src/ProDHCPServer.App/Themes/MetalHeart.Dark.xaml
 create mode 100644 src/ProDHCPServer.App/Themes/MetalHeart.Light.xaml

diff --git a/README.md b/README.md
index d195a19..0d48bae 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Most AV kit ships set to DHCP, and on a bench or a fresh site there's usually no
 - **Several devices at once** behind a small switch, each with its own lease.
 - **Spots a USB adapter that has stopped receiving.** Some USB Ethernet adapters keep showing "connected" but quietly stop receiving after a few seconds, which looks exactly like a silent device. If nothing has come in for 20 seconds while the laptop keeps sending, the cable/link step says so and tells you to replug the adapter. Realtek RTL8152/8153 adapters on a driver older than 2019 (including Windows' own 2015 driver) are flagged as soon as you pick them, with where to get the newer driver.
 - **Wi-Fi and VPN overlap warnings**, with a one-click option to turn Wi-Fi off until you press Stop.
-- **Dark and light themes**, with large status text you can read from arm's length.
+- **Dark and light themes** and a choice of looks (rack faceplate, Frutiger Aero, Metal Heart), with large status text you can read from arm's length.
 
 **Phase 2: visibility**
 
@@ -104,7 +104,7 @@ Each phase ends with a hardware test pass on real AV equipment before the next o
 
 | What | Where |
 |---|---|
-| Your settings (last adapter, profile in use, theme) | `%LOCALAPPDATA%\ProDHCPServer\settings.json` |
+| Your settings (last adapter, profile in use, look and theme) | `%LOCALAPPDATA%\ProDHCPServer\settings.json` |
 | Your profiles | `%LOCALAPPDATA%\ProDHCPServer\profiles.json` |
 | Adapter backup (only while a session runs, or after a crash) | `%ProgramData%\ProDHCPServer\adapter-backup.json` |
 
diff --git a/src/ProDHCPServer.App/App.xaml b/src/ProDHCPServer.App/App.xaml
index 27e628e..5e428c9 100644
--- a/src/ProDHCPServer.App/App.xaml
+++ b/src/ProDHCPServer.App/App.xaml
@@ -12,12 +12,10 @@
         <local:VisibleWhenConverter x:Key="VisibleWhen" />
 
         <!--
-            Faces: Figtree for everything you read, League Spartan only for the few big things (status line, device IP).
-            Both are embedded so every laptop shows the same thing. Monospace is kept for raw technical detail only.
+            Colours, text and display faces, and shapes (corners, edges, gloss) come from the current look: a resource
+            dictionary under Themes/ that Theme.Apply merges in, so they are always read with DynamicResource.
+            Monospace is kept for raw technical detail only and is the same in every look.
         -->
-        <FontFamily x:Key="TextFont">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
-        <FontFamily x:Key="DisplayFont">pack://application:,,,/Assets/Fonts/#League Spartan</FontFamily>
-        <FontFamily x:Key="ContentControlThemeFontFamily">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
         <FontFamily x:Key="MonoFont">Cascadia Mono, Consolas, Courier New</FontFamily>
         <FontFamily x:Key="IconFont">Segoe Fluent Icons, Segoe MDL2 Assets</FontFamily>
 
@@ -28,14 +26,20 @@
         <sys:Double x:Key="TextHead">40</sys:Double>
         <sys:Double x:Key="TextDisplay">64</sys:Double>
 
-        <!-- Panels are a tone step above the ground: no border, no shadow, square corners. -->
+        <!-- Panels are a tone step above the ground. The look decides whether they also get an edge or rounded corners. -->
         <Style x:Key="Panel" TargetType="Border">
             <Setter Property="Background" Value="{DynamicResource PanelBg}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource PanelBorder}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource PanelBorderThickness}" />
+            <Setter Property="CornerRadius" Value="{DynamicResource PanelRadius}" />
             <Setter Property="Padding" Value="24" />
         </Style>
 
         <!-- Status banners: a whole field of the state's soft colour. -->
         <Style x:Key="Banner" TargetType="Border">
+            <Setter Property="BorderBrush" Value="{DynamicResource PanelBorder}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource PanelBorderThickness}" />
+            <Setter Property="CornerRadius" Value="{DynamicResource PanelRadius}" />
             <Setter Property="Padding" Value="24,16" />
             <Setter Property="Margin" Value="0,0,0,16" />
         </Style>
@@ -75,13 +79,14 @@
         </Style>
 
         <!--
-            Buttons: flat, one fill, fully round (the status LED's circle is the app's one shape). Hover and press tint the
-            fill with its own text colour; keyboard focus draws a ring in the ink colour outside the button.
+            Buttons: one fill, with an edge and a gloss the look paints over it (both transparent in the default look) and
+            corners the look sets from fully round to nearly square. Hover and press tint the fill with its own text colour;
+            keyboard focus draws a ring in the ink colour outside the button.
         -->
         <Style x:Key="PillButton" TargetType="Button">
             <Setter Property="Background" Value="{DynamicResource RaisedBg}" />
             <Setter Property="Foreground" Value="{DynamicResource TextPrimary}" />
-            <Setter Property="FontFamily" Value="{StaticResource TextFont}" />
+            <Setter Property="FontFamily" Value="{DynamicResource TextFont}" />
             <Setter Property="FontSize" Value="{StaticResource TextBody}" />
             <Setter Property="FontWeight" Value="Medium" />
             <Setter Property="Padding" Value="20,0" />
@@ -94,9 +99,16 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
                         <Grid>
-                            <Border x:Name="Ring" Margin="-4" CornerRadius="{Binding ActualHeight, RelativeSource={RelativeSource Self}, Converter={x:Static local:PillRadiusConverter.Instance}}" BorderThickness="2" BorderBrush="Transparent" />
-                            <Border x:Name="Bg" CornerRadius="{Binding ActualHeight, RelativeSource={RelativeSource Self}, Converter={x:Static local:PillRadiusConverter.Instance}}" Background="{TemplateBinding Background}" />
-                            <Border x:Name="Tint" CornerRadius="{Binding ActualHeight, RelativeSource={RelativeSource Self}, Converter={x:Static local:PillRadiusConverter.Instance}}" Background="{TemplateBinding Foreground}" Opacity="0" />
+                            <!-- Each layer's corner radius is its own height times the look's ButtonCornerScale (carried in Tag so it follows a live look change). -->
+                            <Border x:Name="Ring" Margin="-4" BorderThickness="2" BorderBrush="Transparent" Tag="{DynamicResource ButtonCornerScale}"
+                                    CornerRadius="{local:CornerScale}" />
+                            <Border x:Name="Bg" Background="{TemplateBinding Background}" Tag="{DynamicResource ButtonCornerScale}"
+                                    BorderBrush="{DynamicResource ButtonBorder}" BorderThickness="{DynamicResource ButtonBorderThickness}"
+                                    CornerRadius="{local:CornerScale}" />
+                            <Border x:Name="Gloss" Background="{DynamicResource ButtonGloss}" IsHitTestVisible="False" Tag="{DynamicResource ButtonCornerScale}"
+                                    CornerRadius="{local:CornerScale}" />
+                            <Border x:Name="Tint" Background="{TemplateBinding Foreground}" Opacity="0" Tag="{DynamicResource ButtonCornerScale}"
+                                    CornerRadius="{local:CornerScale}" />
                             <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="Center"
                                               TextElement.Foreground="{TemplateBinding Foreground}" RecognizesAccessKey="True" />
                         </Grid>
@@ -156,7 +168,7 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
                         <Border x:Name="Bg" Background="{TemplateBinding Background}" BorderBrush="Transparent" BorderThickness="2"
-                                Padding="{TemplateBinding Padding}">
+                                CornerRadius="{DynamicResource RowRadius}" Padding="{TemplateBinding Padding}">
                             <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
                         </Border>
                         <ControlTemplate.Triggers>
diff --git a/src/ProDHCPServer.App/App.xaml.cs b/src/ProDHCPServer.App/App.xaml.cs
index a6d0f7d..7a3dbce 100644
--- a/src/ProDHCPServer.App/App.xaml.cs
+++ b/src/ProDHCPServer.App/App.xaml.cs
@@ -27,7 +27,8 @@ protected override void OnStartup(StartupEventArgs e)
         base.OnStartup(e);
         var userFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "ProDHCPServer");
         var settingsStore = new SettingsStore(Path.Combine(userFolder, "settings.json"));
-        Theme.Apply(settingsStore.Load().Theme);
+        var startSettings = settingsStore.Load();
+        Theme.Apply(startSettings.Theme, startSettings.Look);
 
         if (!Elevation.IsAdministrator())
         {
diff --git a/src/ProDHCPServer.App/Converters.cs b/src/ProDHCPServer.App/Converters.cs
index ca50b70..0740ba7 100644
--- a/src/ProDHCPServer.App/Converters.cs
+++ b/src/ProDHCPServer.App/Converters.cs
@@ -1,6 +1,7 @@
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
+using System.Windows.Markup;
 using ProDHCPServer.Core;
 using ProDHCPServer.Core.Status;
 
@@ -100,13 +101,29 @@ public object Convert(object? value, Type targetType, object? parameter, Culture
     public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => throw new NotSupportedException();
 }
 
-/// <summary>ActualHeight → a corner radius of half the height, so a Border is a true pill or circle at any size.</summary>
-public sealed class PillRadiusConverter : IValueConverter
+/// <summary>
+/// A corner radius of a Border's height times the look's ButtonCornerScale, which the Border carries in its Tag
+/// (0.5 makes a true pill or circle at any size, 0 a square). A fixed large radius would draw ovals in WPF, and the Tag
+/// lets the radius follow a live look change. Used as CornerRadius="{local:CornerScale}".
+/// </summary>
+public sealed class CornerScaleExtension : MarkupExtension, IMultiValueConverter
 {
-    public static readonly PillRadiusConverter Instance = new();
+    public override object ProvideValue(IServiceProvider serviceProvider) => new MultiBinding
+    {
+        Converter = this,
+        Bindings =
+        {
+            new Binding(nameof(FrameworkElement.ActualHeight)) { RelativeSource = RelativeSource.Self },
+            new Binding(nameof(FrameworkElement.Tag)) { RelativeSource = RelativeSource.Self },
+        },
+    }.ProvideValue(serviceProvider);
 
-    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) =>
-        new CornerRadius(value is double h && h > 0 ? h / 2 : 0);
+    public object Convert(object[] values, Type targetType, object? parameter, CultureInfo culture)
+    {
+        var height = values.Length > 0 && values[0] is double h ? h : 0;
+        var scale = values.Length > 1 && values[1] is double d ? d : 0.5;
+        return new CornerRadius(height > 0 ? height * scale : 0);
+    }
 
-    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => throw new NotSupportedException();
+    public object[] ConvertBack(object value, Type[] targetTypes, object? parameter, CultureInfo culture) => throw new NotSupportedException();
 }
diff --git a/src/ProDHCPServer.App/MainWindow.xaml b/src/ProDHCPServer.App/MainWindow.xaml
index c47d087..de37394 100644
--- a/src/ProDHCPServer.App/MainWindow.xaml
+++ b/src/ProDHCPServer.App/MainWindow.xaml
@@ -12,7 +12,7 @@
         Title="ProDHCPServer" Width="1320" Height="860" MinWidth="900" MinHeight="600"
         WindowStartupLocation="CenterScreen"
         Background="{DynamicResource WindowBg}"
-        FontFamily="{StaticResource TextFont}"
+        FontFamily="{DynamicResource TextFont}"
         Closing="OnClosing"
         SourceInitialized="OnSourceInitialized">
     <Window.InputBindings>
@@ -125,7 +125,8 @@
             </Grid>
 
             <!-- ===== Status field: one line, readable from across the rack, beside a giant status light ===== -->
-            <Border Grid.Row="1" Margin="0,0,0,16" ClipToBounds="True" MinHeight="104"
+            <Border Grid.Row="1" Margin="0,0,0,16" ClipToBounds="True" MinHeight="104" CornerRadius="{DynamicResource PanelRadius}"
+                    BorderBrush="{DynamicResource PanelBorder}" BorderThickness="{DynamicResource PanelBorderThickness}"
                     Background="{Binding HeadlineState, Converter={StaticResource StateBrush}, ConverterParameter=Soft}">
                 <Grid>
                     <!-- The light: cropped by the right edge of the field. Its colour is the state. -->
@@ -136,7 +137,7 @@
                                HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,70,0"
                                AutomationProperties.Name="{Binding HeadlineState, Converter={StaticResource StateWord}}" />
                     <StackPanel VerticalAlignment="Center" Margin="32,16,232,16">
-                        <TextBlock Text="{Binding HeadlineText}" FontFamily="{StaticResource DisplayFont}" FontSize="{StaticResource TextHead}" FontWeight="Bold"
+                        <TextBlock Text="{Binding HeadlineText}" FontFamily="{DynamicResource DisplayFont}" FontSize="{StaticResource TextHead}" FontWeight="Bold"
                                    LineHeight="44" LineStackingStrategy="BlockLineHeight" Style="{StaticResource Primary}"
                                    AutomationProperties.LiveSetting="Assertive" />
                         <TextBlock Text="{Binding HeadlineAction}" FontSize="{StaticResource TextBody}" Margin="0,8,0,0" Style="{StaticResource Primary}"
@@ -309,7 +310,7 @@
                                 <TextBlock Text="{Binding Vendor}" FontSize="{StaticResource TextBody}" Style="{StaticResource Secondary}" />
                                 <Grid Margin="0,16,0,0">
                                     <Grid.ColumnDefinitions><ColumnDefinition Width="Auto" /><ColumnDefinition Width="Auto" /></Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding Ip}" FontFamily="{StaticResource DisplayFont}" FontSize="{StaticResource TextDisplay}" FontWeight="Bold"
+                                    <TextBlock Text="{Binding Ip}" FontFamily="{DynamicResource DisplayFont}" FontSize="{StaticResource TextDisplay}" FontWeight="Bold"
                                                Style="{StaticResource Primary}" TextWrapping="NoWrap" VerticalAlignment="Center" AutomationProperties.Name="Device IP address" />
                                     <Button Grid.Column="1" Style="{StaticResource IconButton}" Content="&#xE8C8;" Margin="16,0,0,8" VerticalAlignment="Center"
                                             ToolTip="Copy IP address" AutomationProperties.Name="Copy IP address"
@@ -444,7 +445,7 @@
                                 <ItemsControl ItemsSource="{Binding Found}" AutomationProperties.Name="Found on the network">
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate DataType="{x:Type vm:FoundDeviceViewModel}">
-                                            <Border Margin="0,0,0,4" Padding="16,12" Background="{DynamicResource RaisedBg}" ToolTip="{Binding Detail}">
+                                            <Border Margin="0,0,0,4" Padding="16,12" Background="{DynamicResource RaisedBg}" CornerRadius="{DynamicResource RowRadius}" ToolTip="{Binding Detail}">
                                                 <Grid>
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="Auto" /><ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" />
@@ -567,7 +568,7 @@
                 <DockPanel DataContext="{Binding Settings}">
                     <!-- Header -->
                     <Grid DockPanel.Dock="Top" Margin="32,24,24,0">
-                        <TextBlock Text="Profiles" FontFamily="{StaticResource DisplayFont}" FontSize="{StaticResource TextHead}" FontWeight="Bold"
+                        <TextBlock Text="Profiles" FontFamily="{DynamicResource DisplayFont}" FontSize="{StaticResource TextHead}" FontWeight="Bold"
                                    Foreground="{DynamicResource TextPrimary}" VerticalAlignment="Center" />
                         <Button x:Name="CloseSettingsButton" Style="{StaticResource IconButton}" Content="&#xE711;" HorizontalAlignment="Right"
                                 Command="{Binding DataContext.CloseSettingsCommand, RelativeSource={RelativeSource AncestorType=Window}}"
@@ -737,9 +738,15 @@
                                            AutomationProperties.LiveSetting="Polite" />
                             </Border>
 
-                            <Label Content="T_heme" Target="{Binding ElementName=ThemeBox}" Style="{StaticResource FieldLabel}" Margin="0,32,0,8" />
+                            <!-- Appearance: which look, then dark or light. Both apply straight away and are remembered. -->
+                            <Label Content="Loo_k" Target="{Binding ElementName=LookBox}" Style="{StaticResource FieldLabel}" Margin="0,32,0,8" />
+                            <ComboBox x:Name="LookBox" ItemsSource="{x:Static vm:SettingsViewModel.Looks}" SelectedItem="{Binding Look}" DisplayMemberPath="Name"
+                                      FontSize="{StaticResource TextBody}" HorizontalAlignment="Stretch" />
+                            <TextBlock Text="{Binding Look.Blurb}" Style="{StaticResource FieldHelp}" />
+
+                            <Label Content="Dark or l_ight" Target="{Binding ElementName=ThemeBox}" Style="{StaticResource FieldLabel}" />
                             <ComboBox x:Name="ThemeBox" ItemsSource="{x:Static vm:SettingsViewModel.Themes}" SelectedItem="{Binding Theme}" FontSize="{StaticResource TextBody}" HorizontalAlignment="Stretch" />
-                            <TextBlock Text="Applies straight away, for every profile." Style="{StaticResource FieldHelp}" />
+                            <TextBlock Text="System follows Windows. Both apply straight away, for every profile." Style="{StaticResource FieldHelp}" />
                         </StackPanel>
                     </ScrollViewer>
                 </DockPanel>
diff --git a/src/ProDHCPServer.App/Theme.cs b/src/ProDHCPServer.App/Theme.cs
index d8c3e71..4cd7852 100644
--- a/src/ProDHCPServer.App/Theme.cs
+++ b/src/ProDHCPServer.App/Theme.cs
@@ -1,46 +1,44 @@
 using System.Windows;
-using System.Windows.Media;
 using Microsoft.Win32;
 
 namespace ProDHCPServer.App;
 
 /// <summary>
-/// The app's own colour tokens, swapped together with WPF's Fluent ThemeMode so custom panels and
-/// standard controls always match. Status colours are tuned for readability at arm's length.
+/// Picks the app's look (a pair of resource dictionaries under Themes/) and swaps it together with WPF's Fluent
+/// ThemeMode so custom panels and standard controls always match. Every colour, font and shape the XAML reads with
+/// DynamicResource comes from the current look, so switching looks repaints the window live.
+///
+/// To add a look: drop Themes/Name.Dark.xaml and Themes/Name.Light.xaml next to the others (copy Faceplate's and
+/// change the values; every key in it must be present) and add one line to <see cref="Looks"/>.
 /// </summary>
 public static class Theme
 {
-    private static readonly Dictionary<string, (string Dark, string Light)> Tokens = new()
+    /// <summary>One selectable look. <paramref name="Id"/> is the file name prefix and what settings.json stores.</summary>
+    public sealed record Look(string Id, string Name, string Blurb)
     {
-        // A rack faceplate: one ground, a surface one tone step up, a raised step for the slide-over and selected rows.
-        // Surfaces are separated by tone, never by lines or shadows.
-        ["WindowBg"] = ("#0B0D10", "#E6E8EB"),
-        ["PanelBg"] = ("#15181C", "#F4F5F7"),
-        ["RaisedBg"] = ("#1E2227", "#FFFFFF"),
-        ["RowHover"] = ("#252A30", "#EBEDF0"),
-        ["Scrim"] = ("#A6000000", "#66000000"),
-        ["TextPrimary"] = ("#F2F4F6", "#0E1114"),
-        ["TextSecondary"] = ("#B3BAC3", "#474F59"),
-        ["TextMuted"] = ("#8A929C", "#5D6570"),
-        // Status LED colours, tuned for readability at arm's length. These are the only hues in the app.
-        ["GoodBrush"] = ("#3DD068", "#1A7F37"),
-        ["WarnBrush"] = ("#F2A928", "#B26B00"),
-        ["BadBrush"] = ("#FF5A52", "#CF222E"),
-        ["IdleBrush"] = ("#4A515A", "#A3AAB3"),
-        ["GoodSoft"] = ("#10291A", "#D9F2E0"),
-        ["WarnSoft"] = ("#2E2309", "#FBEACB"),
-        ["BadSoft"] = ("#361515", "#F9DADC"),
-        ["IdleSoft"] = ("#15181C", "#F4F5F7"),
-        // The action colour is the ink itself: primary buttons are solid ink with ground-coloured text.
-        ["AccentBrush"] = ("#F2F4F6", "#0E1114"),
-        ["AccentText"] = ("#0B0D10", "#FFFFFF"),
-        ["MonoBg"] = ("#0B0D10", "#ECEEF1"),
-    };
+        public override string ToString() => Name;
+    }
+
+    public static IReadOnlyList<Look> Looks { get; } =
+    [
+        new("Faceplate", "Rack faceplate", "The default: flat, dark, one status light at every scale."),
+        new("FrutigerAero", "Frutiger Aero", "Glossy glass panels over a sky-and-grass backdrop, 2000s style."),
+        new("MetalHeart", "Metal Heart", "Brushed steel, bevelled edges and a chrome-red accent."),
+    ];
+
+    public static Look DefaultLook => Looks[0];
 
     public static bool IsDark { get; private set; }
 
-    /// <summary>Applies "System", "Dark" or "Light".</summary>
-    public static void Apply(string mode)
+    public static Look CurrentLook { get; private set; } = DefaultLook;
+
+    private static ResourceDictionary? _current;
+
+    /// <summary>Finds a look by its id, falling back to the default for unknown or old values in settings.json.</summary>
+    public static Look Find(string? id) => Looks.FirstOrDefault(l => l.Id == id) ?? DefaultLook;
+
+    /// <summary>Applies a light-or-dark mode ("System", "Dark" or "Light") and a look id.</summary>
+    public static void Apply(string mode, string? lookId)
     {
         bool dark = mode switch
         {
@@ -48,15 +46,20 @@ public static void Apply(string mode)
             "Light" => false,
             _ => SystemPrefersDark(),
         };
+        var look = Find(lookId);
         IsDark = dark;
+        CurrentLook = look;
         var app = Application.Current;
         app.ThemeMode = dark ? ThemeMode.Dark : ThemeMode.Light;
-        foreach (var (key, (d, l)) in Tokens)
+        var next = new ResourceDictionary
         {
-            var brush = new SolidColorBrush((Color)ColorConverter.ConvertFromString(dark ? d : l));
-            brush.Freeze();
-            app.Resources[key] = brush;
-        }
+            Source = new Uri($"pack://application:,,,/Themes/{look.Id}.{(dark ? "Dark" : "Light")}.xaml"),
+        };
+        // The look goes last so its keys win over Fluent's own dictionaries (added by ThemeMode), e.g. the control font.
+        var merged = app.Resources.MergedDictionaries;
+        if (_current is not null) merged.Remove(_current);
+        merged.Add(next);
+        _current = next;
     }
 
     private static bool SystemPrefersDark()
diff --git a/src/ProDHCPServer.App/Themes/Faceplate.Dark.xaml b/src/ProDHCPServer.App/Themes/Faceplate.Dark.xaml
new file mode 100644
index 0000000..0aa7934
--- /dev/null
+++ b/src/ProDHCPServer.App/Themes/Faceplate.Dark.xaml
@@ -0,0 +1,51 @@
+<!--
+    Rack faceplate, dark: a dark front panel with white legends. Surfaces are separated by tone, never by lines.
+    Every key here is read by the XAML with DynamicResource, so the set must stay complete: copy this file to make a new
+    look and change the values, not the keys. Brushes may be solid or gradients.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+
+  <!-- Surfaces: one ground, a panel a tone step up, a raised step for the slide-over and selected rows. -->
+  <SolidColorBrush x:Key="WindowBg" Color="#0B0D10" />
+  <SolidColorBrush x:Key="PanelBg" Color="#15181C" />
+  <SolidColorBrush x:Key="RaisedBg" Color="#1E2227" />
+  <SolidColorBrush x:Key="RowHover" Color="#252A30" />
+  <SolidColorBrush x:Key="Scrim" Color="#A6000000" />
+
+  <!-- Ink -->
+  <SolidColorBrush x:Key="TextPrimary" Color="#F2F4F6" />
+  <SolidColorBrush x:Key="TextSecondary" Color="#B3BAC3" />
+  <SolidColorBrush x:Key="TextMuted" Color="#8A929C" />
+
+  <!-- Status colours, tuned for readability at arm's length. The Soft ones fill banners and the status field. -->
+  <SolidColorBrush x:Key="GoodBrush" Color="#3DD068" />
+  <SolidColorBrush x:Key="WarnBrush" Color="#F2A928" />
+  <SolidColorBrush x:Key="BadBrush" Color="#FF5A52" />
+  <SolidColorBrush x:Key="IdleBrush" Color="#4A515A" />
+  <SolidColorBrush x:Key="GoodSoft" Color="#10291A" />
+  <SolidColorBrush x:Key="WarnSoft" Color="#2E2309" />
+  <SolidColorBrush x:Key="BadSoft" Color="#361515" />
+  <SolidColorBrush x:Key="IdleSoft" Color="#15181C" />
+
+  <!-- The primary action and the box for raw technical detail -->
+  <SolidColorBrush x:Key="AccentBrush" Color="#F2F4F6" />
+  <SolidColorBrush x:Key="AccentText" Color="#0B0D10" />
+  <SolidColorBrush x:Key="MonoBg" Color="#0B0D10" />
+
+  <!-- Shape: panel edges and corners, button edges, a gloss painted over every button, and how round buttons are (0.5 = pill, 0 = square). -->
+  <SolidColorBrush x:Key="PanelBorder" Color="Transparent" />
+  <Thickness x:Key="PanelBorderThickness">0</Thickness>
+  <CornerRadius x:Key="PanelRadius">0</CornerRadius>
+  <CornerRadius x:Key="RowRadius">0</CornerRadius>
+  <SolidColorBrush x:Key="ButtonBorder" Color="Transparent" />
+  <Thickness x:Key="ButtonBorderThickness">0</Thickness>
+  <SolidColorBrush x:Key="ButtonGloss" Color="Transparent" />
+  <sys:Double x:Key="ButtonCornerScale">0.5</sys:Double>
+
+  <!-- Faces: TextFont for everything you read, DisplayFont for the few big things (status line, device IP, settings title). -->
+  <FontFamily x:Key="TextFont">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
+  <FontFamily x:Key="DisplayFont">pack://application:,,,/Assets/Fonts/#League Spartan</FontFamily>
+  <FontFamily x:Key="ContentControlThemeFontFamily">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
+</ResourceDictionary>
diff --git a/src/ProDHCPServer.App/Themes/Faceplate.Light.xaml b/src/ProDHCPServer.App/Themes/Faceplate.Light.xaml
new file mode 100644
index 0000000..43bbd2e
--- /dev/null
+++ b/src/ProDHCPServer.App/Themes/Faceplate.Light.xaml
@@ -0,0 +1,51 @@
+<!--
+    Rack faceplate, light: the same panel in brushed silver. Surfaces are separated by tone, never by lines.
+    Every key here is read by the XAML with DynamicResource, so the set must stay complete: copy this file to make a new
+    look and change the values, not the keys. Brushes may be solid or gradients.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+
+  <!-- Surfaces: one ground, a panel a tone step up, a raised step for the slide-over and selected rows. -->
+  <SolidColorBrush x:Key="WindowBg" Color="#E6E8EB" />
+  <SolidColorBrush x:Key="PanelBg" Color="#F4F5F7" />
+  <SolidColorBrush x:Key="RaisedBg" Color="#FFFFFF" />
+  <SolidColorBrush x:Key="RowHover" Color="#EBEDF0" />
+  <SolidColorBrush x:Key="Scrim" Color="#66000000" />
+
+  <!-- Ink -->
+  <SolidColorBrush x:Key="TextPrimary" Color="#0E1114" />
+  <SolidColorBrush x:Key="TextSecondary" Color="#474F59" />
+  <SolidColorBrush x:Key="TextMuted" Color="#5D6570" />
+
+  <!-- Status colours, tuned for readability at arm's length. The Soft ones fill banners and the status field. -->
+  <SolidColorBrush x:Key="GoodBrush" Color="#1A7F37" />
+  <SolidColorBrush x:Key="WarnBrush" Color="#B26B00" />
+  <SolidColorBrush x:Key="BadBrush" Color="#CF222E" />
+  <SolidColorBrush x:Key="IdleBrush" Color="#A3AAB3" />
+  <SolidColorBrush x:Key="GoodSoft" Color="#D9F2E0" />
+  <SolidColorBrush x:Key="WarnSoft" Color="#FBEACB" />
+  <SolidColorBrush x:Key="BadSoft" Color="#F9DADC" />
+  <SolidColorBrush x:Key="IdleSoft" Color="#F4F5F7" />
+
+  <!-- The primary action and the box for raw technical detail -->
+  <SolidColorBrush x:Key="AccentBrush" Color="#0E1114" />
+  <SolidColorBrush x:Key="AccentText" Color="#FFFFFF" />
+  <SolidColorBrush x:Key="MonoBg" Color="#ECEEF1" />
+
+  <!-- Shape: panel edges and corners, button edges, a gloss painted over every button, and how round buttons are (0.5 = pill, 0 = square). -->
+  <SolidColorBrush x:Key="PanelBorder" Color="Transparent" />
+  <Thickness x:Key="PanelBorderThickness">0</Thickness>
+  <CornerRadius x:Key="PanelRadius">0</CornerRadius>
+  <CornerRadius x:Key="RowRadius">0</CornerRadius>
+  <SolidColorBrush x:Key="ButtonBorder" Color="Transparent" />
+  <Thickness x:Key="ButtonBorderThickness">0</Thickness>
+  <SolidColorBrush x:Key="ButtonGloss" Color="Transparent" />
+  <sys:Double x:Key="ButtonCornerScale">0.5</sys:Double>
+
+  <!-- Faces: TextFont for everything you read, DisplayFont for the few big things (status line, device IP, settings title). -->
+  <FontFamily x:Key="TextFont">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
+  <FontFamily x:Key="DisplayFont">pack://application:,,,/Assets/Fonts/#League Spartan</FontFamily>
+  <FontFamily x:Key="ContentControlThemeFontFamily">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
+</ResourceDictionary>
diff --git a/src/ProDHCPServer.App/Themes/FrutigerAero.Dark.xaml b/src/ProDHCPServer.App/Themes/FrutigerAero.Dark.xaml
new file mode 100644
index 0000000..998a999
--- /dev/null
+++ b/src/ProDHCPServer.App/Themes/FrutigerAero.Dark.xaml
@@ -0,0 +1,64 @@
+<!--
+    Frutiger Aero, dark: the same glass at night, over deep sky and dark grass.
+    Every key here is read by the XAML with DynamicResource, so the set must stay complete: copy this file to make a new
+    look and change the values, not the keys. Brushes may be solid or gradients.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+
+  <!-- Surfaces: one ground, a panel a tone step up, a raised step for the slide-over and selected rows. -->
+  <LinearGradientBrush x:Key="WindowBg" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#0B1F3A" Offset="0" />
+    <GradientStop Color="#0F3B66" Offset="0.45" />
+    <GradientStop Color="#124C6E" Offset="0.7" />
+    <GradientStop Color="#1D5A3A" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush x:Key="PanelBg" Color="#2EFFFFFF" />
+  <SolidColorBrush x:Key="RaisedBg" Color="#40FFFFFF" />
+  <SolidColorBrush x:Key="RowHover" Color="#55FFFFFF" />
+  <SolidColorBrush x:Key="Scrim" Color="#99000A1A" />
+
+  <!-- Ink -->
+  <SolidColorBrush x:Key="TextPrimary" Color="#F0F8FF" />
+  <SolidColorBrush x:Key="TextSecondary" Color="#C2DAEE" />
+  <SolidColorBrush x:Key="TextMuted" Color="#93B3CC" />
+
+  <!-- Status colours, tuned for readability at arm's length. The Soft ones fill banners and the status field. -->
+  <SolidColorBrush x:Key="GoodBrush" Color="#5AD65A" />
+  <SolidColorBrush x:Key="WarnBrush" Color="#FFC53D" />
+  <SolidColorBrush x:Key="BadBrush" Color="#FF6B5E" />
+  <SolidColorBrush x:Key="IdleBrush" Color="#6F93B0" />
+  <SolidColorBrush x:Key="GoodSoft" Color="#5A1E6B3A" />
+  <SolidColorBrush x:Key="WarnSoft" Color="#5A6B4C0E" />
+  <SolidColorBrush x:Key="BadSoft" Color="#5A6E1F1F" />
+  <SolidColorBrush x:Key="IdleSoft" Color="#2EFFFFFF" />
+
+  <!-- The primary action and the box for raw technical detail -->
+  <LinearGradientBrush x:Key="AccentBrush" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#63BDF5" Offset="0" />
+    <GradientStop Color="#2A86D2" Offset="0.5" />
+    <GradientStop Color="#1C6FC2" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush x:Key="AccentText" Color="#FFFFFF" />
+  <SolidColorBrush x:Key="MonoBg" Color="#40051A33" />
+
+  <!-- Shape: panel edges and corners, button edges, a gloss painted over every button, and how round buttons are (0.5 = pill, 0 = square). -->
+  <SolidColorBrush x:Key="PanelBorder" Color="#55FFFFFF" />
+  <Thickness x:Key="PanelBorderThickness">1</Thickness>
+  <CornerRadius x:Key="PanelRadius">14</CornerRadius>
+  <CornerRadius x:Key="RowRadius">8</CornerRadius>
+  <SolidColorBrush x:Key="ButtonBorder" Color="#66FFFFFF" />
+  <Thickness x:Key="ButtonBorderThickness">1</Thickness>
+  <LinearGradientBrush x:Key="ButtonGloss" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#80FFFFFF" Offset="0" />
+    <GradientStop Color="#1AFFFFFF" Offset="0.5" />
+    <GradientStop Color="#00FFFFFF" Offset="0.5" />
+  </LinearGradientBrush>
+  <sys:Double x:Key="ButtonCornerScale">0.5</sys:Double>
+
+  <!-- Faces: TextFont for everything you read, DisplayFont for the few big things (status line, device IP, settings title). -->
+  <FontFamily x:Key="TextFont">Segoe UI</FontFamily>
+  <FontFamily x:Key="DisplayFont">Segoe UI</FontFamily>
+  <FontFamily x:Key="ContentControlThemeFontFamily">Segoe UI</FontFamily>
+</ResourceDictionary>
diff --git a/src/ProDHCPServer.App/Themes/FrutigerAero.Light.xaml b/src/ProDHCPServer.App/Themes/FrutigerAero.Light.xaml
new file mode 100644
index 0000000..c8082c7
--- /dev/null
+++ b/src/ProDHCPServer.App/Themes/FrutigerAero.Light.xaml
@@ -0,0 +1,64 @@
+<!--
+    Frutiger Aero, light: frosted glass panels over a sky-to-grass backdrop, glossy buttons, 2000s optimism.
+    Every key here is read by the XAML with DynamicResource, so the set must stay complete: copy this file to make a new
+    look and change the values, not the keys. Brushes may be solid or gradients.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+
+  <!-- Surfaces: one ground, a panel a tone step up, a raised step for the slide-over and selected rows. -->
+  <LinearGradientBrush x:Key="WindowBg" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#D6EEFB" Offset="0" />
+    <GradientStop Color="#7FC4EF" Offset="0.45" />
+    <GradientStop Color="#5FB2E6" Offset="0.7" />
+    <GradientStop Color="#9DD36A" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush x:Key="PanelBg" Color="#C2FFFFFF" />
+  <SolidColorBrush x:Key="RaisedBg" Color="#E8FFFFFF" />
+  <SolidColorBrush x:Key="RowHover" Color="#F7FFFFFF" />
+  <SolidColorBrush x:Key="Scrim" Color="#66143C5C" />
+
+  <!-- Ink -->
+  <SolidColorBrush x:Key="TextPrimary" Color="#0C2B47" />
+  <SolidColorBrush x:Key="TextSecondary" Color="#2E5676" />
+  <SolidColorBrush x:Key="TextMuted" Color="#4E7390" />
+
+  <!-- Status colours, tuned for readability at arm's length. The Soft ones fill banners and the status field. -->
+  <SolidColorBrush x:Key="GoodBrush" Color="#3FA92A" />
+  <SolidColorBrush x:Key="WarnBrush" Color="#E39A12" />
+  <SolidColorBrush x:Key="BadBrush" Color="#D9382C" />
+  <SolidColorBrush x:Key="IdleBrush" Color="#8DB4CF" />
+  <SolidColorBrush x:Key="GoodSoft" Color="#E0E6F8DC" />
+  <SolidColorBrush x:Key="WarnSoft" Color="#E0FFF0C8" />
+  <SolidColorBrush x:Key="BadSoft" Color="#E0FBDADA" />
+  <SolidColorBrush x:Key="IdleSoft" Color="#C2FFFFFF" />
+
+  <!-- The primary action and the box for raw technical detail -->
+  <LinearGradientBrush x:Key="AccentBrush" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#6CC4F8" Offset="0" />
+    <GradientStop Color="#2E93E0" Offset="0.5" />
+    <GradientStop Color="#1E7FD3" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush x:Key="AccentText" Color="#FFFFFF" />
+  <SolidColorBrush x:Key="MonoBg" Color="#D9F3F9FE" />
+
+  <!-- Shape: panel edges and corners, button edges, a gloss painted over every button, and how round buttons are (0.5 = pill, 0 = square). -->
+  <SolidColorBrush x:Key="PanelBorder" Color="#DDFFFFFF" />
+  <Thickness x:Key="PanelBorderThickness">1</Thickness>
+  <CornerRadius x:Key="PanelRadius">14</CornerRadius>
+  <CornerRadius x:Key="RowRadius">8</CornerRadius>
+  <SolidColorBrush x:Key="ButtonBorder" Color="#A0FFFFFF" />
+  <Thickness x:Key="ButtonBorderThickness">1</Thickness>
+  <LinearGradientBrush x:Key="ButtonGloss" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#A6FFFFFF" Offset="0" />
+    <GradientStop Color="#33FFFFFF" Offset="0.5" />
+    <GradientStop Color="#00FFFFFF" Offset="0.5" />
+  </LinearGradientBrush>
+  <sys:Double x:Key="ButtonCornerScale">0.5</sys:Double>
+
+  <!-- Faces: TextFont for everything you read, DisplayFont for the few big things (status line, device IP, settings title). -->
+  <FontFamily x:Key="TextFont">Segoe UI</FontFamily>
+  <FontFamily x:Key="DisplayFont">Segoe UI</FontFamily>
+  <FontFamily x:Key="ContentControlThemeFontFamily">Segoe UI</FontFamily>
+</ResourceDictionary>
diff --git a/src/ProDHCPServer.App/Themes/MetalHeart.Dark.xaml b/src/ProDHCPServer.App/Themes/MetalHeart.Dark.xaml
new file mode 100644
index 0000000..02bbeb7
--- /dev/null
+++ b/src/ProDHCPServer.App/Themes/MetalHeart.Dark.xaml
@@ -0,0 +1,74 @@
+<!--
+    Metal Heart, dark: brushed steel plates with bevelled edges and a chrome-red primary button.
+    Every key here is read by the XAML with DynamicResource, so the set must stay complete: copy this file to make a new
+    look and change the values, not the keys. Brushes may be solid or gradients.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+
+  <!-- Surfaces: one ground, a panel a tone step up, a raised step for the slide-over and selected rows. -->
+  <LinearGradientBrush x:Key="WindowBg" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#26292E" Offset="0" />
+    <GradientStop Color="#17191C" Offset="0.5" />
+    <GradientStop Color="#2A2E33" Offset="1" />
+  </LinearGradientBrush>
+  <LinearGradientBrush x:Key="PanelBg" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#2E3238" Offset="0" />
+    <GradientStop Color="#1E2126" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush x:Key="RaisedBg" Color="#3B4048" />
+  <SolidColorBrush x:Key="RowHover" Color="#4A5059" />
+  <SolidColorBrush x:Key="Scrim" Color="#B3000000" />
+
+  <!-- Ink -->
+  <SolidColorBrush x:Key="TextPrimary" Color="#E9ECEF" />
+  <SolidColorBrush x:Key="TextSecondary" Color="#AEB5BE" />
+  <SolidColorBrush x:Key="TextMuted" Color="#7F8791" />
+
+  <!-- Status colours, tuned for readability at arm's length. The Soft ones fill banners and the status field. -->
+  <SolidColorBrush x:Key="GoodBrush" Color="#41D15F" />
+  <SolidColorBrush x:Key="WarnBrush" Color="#F5B531" />
+  <SolidColorBrush x:Key="BadBrush" Color="#FF4A4A" />
+  <SolidColorBrush x:Key="IdleBrush" Color="#596069" />
+  <SolidColorBrush x:Key="GoodSoft" Color="#16301D" />
+  <SolidColorBrush x:Key="WarnSoft" Color="#33290C" />
+  <SolidColorBrush x:Key="BadSoft" Color="#3D1414" />
+  <SolidColorBrush x:Key="IdleSoft" Color="#1E2126" />
+
+  <!-- The primary action and the box for raw technical detail -->
+  <LinearGradientBrush x:Key="AccentBrush" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#FF5050" Offset="0" />
+    <GradientStop Color="#C21414" Offset="0.5" />
+    <GradientStop Color="#8E0B0B" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush x:Key="AccentText" Color="#FFFFFF" />
+  <SolidColorBrush x:Key="MonoBg" Color="#121417" />
+
+  <!-- Shape: panel edges and corners, button edges, a gloss painted over every button, and how round buttons are (0.5 = pill, 0 = square). -->
+  <LinearGradientBrush x:Key="PanelBorder" StartPoint="0,0" EndPoint="1,1">
+    <GradientStop Color="#7D838C" Offset="0" />
+    <GradientStop Color="#2A2D31" Offset="0.5" />
+    <GradientStop Color="#050506" Offset="1" />
+  </LinearGradientBrush>
+  <Thickness x:Key="PanelBorderThickness">1</Thickness>
+  <CornerRadius x:Key="PanelRadius">2</CornerRadius>
+  <CornerRadius x:Key="RowRadius">2</CornerRadius>
+  <LinearGradientBrush x:Key="ButtonBorder" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#9DA3AB" Offset="0" />
+    <GradientStop Color="#0C0D0F" Offset="1" />
+  </LinearGradientBrush>
+  <Thickness x:Key="ButtonBorderThickness">1</Thickness>
+  <LinearGradientBrush x:Key="ButtonGloss" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#59FFFFFF" Offset="0" />
+    <GradientStop Color="#14FFFFFF" Offset="0.45" />
+    <GradientStop Color="#00000000" Offset="0.5" />
+    <GradientStop Color="#26000000" Offset="1" />
+  </LinearGradientBrush>
+  <sys:Double x:Key="ButtonCornerScale">0.12</sys:Double>
+
+  <!-- Faces: TextFont for everything you read, DisplayFont for the few big things (status line, device IP, settings title). -->
+  <FontFamily x:Key="TextFont">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
+  <FontFamily x:Key="DisplayFont">Bahnschrift, Impact, Segoe UI</FontFamily>
+  <FontFamily x:Key="ContentControlThemeFontFamily">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
+</ResourceDictionary>
diff --git a/src/ProDHCPServer.App/Themes/MetalHeart.Light.xaml b/src/ProDHCPServer.App/Themes/MetalHeart.Light.xaml
new file mode 100644
index 0000000..dd215b9
--- /dev/null
+++ b/src/ProDHCPServer.App/Themes/MetalHeart.Light.xaml
@@ -0,0 +1,74 @@
+<!--
+    Metal Heart, light: polished silver plates with bevelled edges and a chrome-red primary button.
+    Every key here is read by the XAML with DynamicResource, so the set must stay complete: copy this file to make a new
+    look and change the values, not the keys. Brushes may be solid or gradients.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+
+  <!-- Surfaces: one ground, a panel a tone step up, a raised step for the slide-over and selected rows. -->
+  <LinearGradientBrush x:Key="WindowBg" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#E9EBEF" Offset="0" />
+    <GradientStop Color="#C9CDD4" Offset="0.5" />
+    <GradientStop Color="#EDEFF2" Offset="1" />
+  </LinearGradientBrush>
+  <LinearGradientBrush x:Key="PanelBg" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#F8F9FA" Offset="0" />
+    <GradientStop Color="#DCDFE4" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush x:Key="RaisedBg" Color="#FFFFFF" />
+  <SolidColorBrush x:Key="RowHover" Color="#EEF0F3" />
+  <SolidColorBrush x:Key="Scrim" Color="#66000000" />
+
+  <!-- Ink -->
+  <SolidColorBrush x:Key="TextPrimary" Color="#14171B" />
+  <SolidColorBrush x:Key="TextSecondary" Color="#474D55" />
+  <SolidColorBrush x:Key="TextMuted" Color="#697079" />
+
+  <!-- Status colours, tuned for readability at arm's length. The Soft ones fill banners and the status field. -->
+  <SolidColorBrush x:Key="GoodBrush" Color="#1B8A3A" />
+  <SolidColorBrush x:Key="WarnBrush" Color="#B36D00" />
+  <SolidColorBrush x:Key="BadBrush" Color="#C8201F" />
+  <SolidColorBrush x:Key="IdleBrush" Color="#A6ACB4" />
+  <SolidColorBrush x:Key="GoodSoft" Color="#D7F1DC" />
+  <SolidColorBrush x:Key="WarnSoft" Color="#FBEBC9" />
+  <SolidColorBrush x:Key="BadSoft" Color="#F8D9D8" />
+  <SolidColorBrush x:Key="IdleSoft" Color="#DCDFE4" />
+
+  <!-- The primary action and the box for raw technical detail -->
+  <LinearGradientBrush x:Key="AccentBrush" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#FF5050" Offset="0" />
+    <GradientStop Color="#C21414" Offset="0.5" />
+    <GradientStop Color="#8E0B0B" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush x:Key="AccentText" Color="#FFFFFF" />
+  <SolidColorBrush x:Key="MonoBg" Color="#E4E7EB" />
+
+  <!-- Shape: panel edges and corners, button edges, a gloss painted over every button, and how round buttons are (0.5 = pill, 0 = square). -->
+  <LinearGradientBrush x:Key="PanelBorder" StartPoint="0,0" EndPoint="1,1">
+    <GradientStop Color="#FFFFFF" Offset="0" />
+    <GradientStop Color="#B9BEC6" Offset="0.5" />
+    <GradientStop Color="#7D848D" Offset="1" />
+  </LinearGradientBrush>
+  <Thickness x:Key="PanelBorderThickness">1</Thickness>
+  <CornerRadius x:Key="PanelRadius">2</CornerRadius>
+  <CornerRadius x:Key="RowRadius">2</CornerRadius>
+  <LinearGradientBrush x:Key="ButtonBorder" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#FFFFFF" Offset="0" />
+    <GradientStop Color="#8E959E" Offset="1" />
+  </LinearGradientBrush>
+  <Thickness x:Key="ButtonBorderThickness">1</Thickness>
+  <LinearGradientBrush x:Key="ButtonGloss" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#8CFFFFFF" Offset="0" />
+    <GradientStop Color="#26FFFFFF" Offset="0.45" />
+    <GradientStop Color="#00000000" Offset="0.5" />
+    <GradientStop Color="#14000000" Offset="1" />
+  </LinearGradientBrush>
+  <sys:Double x:Key="ButtonCornerScale">0.12</sys:Double>
+
+  <!-- Faces: TextFont for everything you read, DisplayFont for the few big things (status line, device IP, settings title). -->
+  <FontFamily x:Key="TextFont">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
+  <FontFamily x:Key="DisplayFont">Bahnschrift, Impact, Segoe UI</FontFamily>
+  <FontFamily x:Key="ContentControlThemeFontFamily">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
+</ResourceDictionary>
diff --git a/src/ProDHCPServer.App/ViewModels/MainViewModel.cs b/src/ProDHCPServer.App/ViewModels/MainViewModel.cs
index 3393094..46a0a1d 100644
--- a/src/ProDHCPServer.App/ViewModels/MainViewModel.cs
+++ b/src/ProDHCPServer.App/ViewModels/MainViewModel.cs
@@ -45,7 +45,7 @@ public MainViewModel(IAdapterControl adapters, AdapterSessionManager sessions, S
         _settings = settingsStore.Load();
         _monitor = new DeviceMonitor(log);
         if (profiles.Load(_settings) is { } profileProblem) log.Add(LogSeverity.Warning, LogCategory.App, profileProblem);
-        Settings = new SettingsViewModel(profiles, _settings.ActiveProfile, _settings.Theme);
+        Settings = new SettingsViewModel(profiles, _settings.ActiveProfile, _settings.Theme, Theme.Find(_settings.Look));
         Settings.ActiveProfileChanged += profile =>
         {
             if (_settings.ActiveProfile != profile.Name)
@@ -61,6 +61,12 @@ public MainViewModel(IAdapterControl adapters, AdapterSessionManager sessions, S
             SaveSettings();
             ApplyTheme();
         };
+        Settings.LookChanged += look =>
+        {
+            _settings = _settings with { Look = look.Id };
+            SaveSettings();
+            ApplyTheme();
+        };
         Steps = new ObservableCollection<StepViewModel>(Enum.GetValues<StepId>().Select(id => new StepViewModel(id)));
 
         RebuildLog();
@@ -806,7 +812,7 @@ private void DismissError()
 
     public void ApplyTheme()
     {
-        Theme.Apply(_settings.Theme);
+        Theme.Apply(_settings.Theme, _settings.Look);
         foreach (var s in Steps) s.Repaint();
         OnPropertyChanged(nameof(HeadlineState));
     }
diff --git a/src/ProDHCPServer.App/ViewModels/SettingsViewModel.cs b/src/ProDHCPServer.App/ViewModels/SettingsViewModel.cs
index 0d1dcd8..b1311be 100644
--- a/src/ProDHCPServer.App/ViewModels/SettingsViewModel.cs
+++ b/src/ProDHCPServer.App/ViewModels/SettingsViewModel.cs
@@ -7,6 +7,7 @@
 using ProDHCPServer.Core.Dhcp;
 using ProDHCPServer.Core.Net;
 using ProDHCPServer.Core.Profiles;
+using LookInfo = ProDHCPServer.App.Theme.Look;
 
 namespace ProDHCPServer.App.ViewModels;
 
@@ -51,10 +52,11 @@ public sealed partial class SettingsViewModel : ObservableObject
     private ISettingsDialogs? _dialogs;
     private bool _loading;
 
-    public SettingsViewModel(ProfileLibrary library, string? activeProfile, string theme)
+    public SettingsViewModel(ProfileLibrary library, string? activeProfile, string theme, LookInfo look)
     {
         _library = library;
         _theme = theme;
+        _look = look;
         ReloadList();
         var active = _library.Find(activeProfile) ?? ProfilePresets.Default;
         _selectedProfile = Profiles.First(p => p.Name == active.Name);
@@ -68,6 +70,7 @@ public SettingsViewModel(ProfileLibrary library, string? activeProfile, string t
         Enumerable.Range(8, 23).Reverse().Select(p => new PrefixOption(p)).ToList();
 
     public static IReadOnlyList<string> Themes { get; } = ["System", "Dark", "Light"];
+    public static IReadOnlyList<LookInfo> Looks => global::ProDHCPServer.App.Theme.Looks;
     public static IReadOnlyList<CustomOptionFormat> Formats { get; } = Enum.GetValues<CustomOptionFormat>();
 
     public ObservableCollection<ProfileItem> Profiles { get; } = [];
@@ -79,6 +82,7 @@ public SettingsViewModel(ProfileLibrary library, string? activeProfile, string t
     /// <summary>Raised when a different profile is picked, or the active one is saved or renamed.</summary>
     public event Action<Profile>? ActiveProfileChanged;
     public event Action<string>? ThemeChanged;
+    public event Action<LookInfo>? LookChanged;
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(IsPreset), nameof(CanEdit), nameof(CanDelete))]
@@ -111,6 +115,7 @@ public SettingsViewModel(ProfileLibrary library, string? activeProfile, string t
     [ObservableProperty] private string _option43 = "";
     [ObservableProperty] private bool _alwaysBroadcast;
     [ObservableProperty] private string _theme;
+    [ObservableProperty] private LookInfo _look;
     [ObservableProperty] private string _errors = "";
     /// <summary>A one-off message after import/export/delete.</summary>
     [ObservableProperty] private string _notice = "";
@@ -135,6 +140,8 @@ protected override void OnPropertyChanged(PropertyChangedEventArgs e)
 
     partial void OnThemeChanged(string value) => ThemeChanged?.Invoke(value);
 
+    partial void OnLookChanged(LookInfo value) => LookChanged?.Invoke(value);
+
     partial void OnSelectedProfileChanged(ProfileItem? oldValue, ProfileItem newValue)
     {
         if (_loading || newValue is null) return;
diff --git a/src/ProDHCPServer.Core/AppSettings.cs b/src/ProDHCPServer.Core/AppSettings.cs
index e27bd3c..ca7b932 100644
--- a/src/ProDHCPServer.Core/AppSettings.cs
+++ b/src/ProDHCPServer.Core/AppSettings.cs
@@ -21,6 +21,8 @@ public sealed record AppSettings
     public bool AlwaysBroadcast { get; init; }
     /// <summary>"System", "Dark" or "Light".</summary>
     public string Theme { get; init; } = "System";
+    /// <summary>Which look the window uses (a name from the App's theme list); unknown values fall back to the default.</summary>
+    public string Look { get; init; } = "Faceplate";
 }
 
 public sealed class SettingsStore(string path)
diff --git a/tools/smoke-test.ps1 b/tools/smoke-test.ps1
index 900b744..6a30ac4 100644
--- a/tools/smoke-test.ps1
+++ b/tools/smoke-test.ps1
@@ -1,4 +1,4 @@
-# Launches the published exe in each theme, checks it stays up, and saves a screenshot.
+# Launches the published exe in each look (dark and light), checks it stays up, and saves a screenshot.
 # Runs on the CI runner, which is already elevated, so no UAC prompt appears.
 param(
     [Parameter(Mandatory)] [string] $Exe,
@@ -19,15 +19,21 @@ function Save-Screen([string] $path) {
     $g.Dispose(); $bmp.Dispose()
 }
 
-# Each shot: theme, file name, extra arguments. The last one opens the settings slide-over.
+# Each shot: dark or light, look, file name, extra arguments. "--open-settings" opens the settings slide-over.
+# The first three keep their names: README screenshots are taken from them.
 $shots = @(
-    @{ Theme = "Dark"; Name = "main-dark"; Args = @() },
-    @{ Theme = "Light"; Name = "main-light"; Args = @() },
-    @{ Theme = "Dark"; Name = "settings-dark"; Args = @("--open-settings") }
+    @{ Theme = "Dark"; Look = "Faceplate"; Name = "main-dark"; Args = @() },
+    @{ Theme = "Light"; Look = "Faceplate"; Name = "main-light"; Args = @() },
+    @{ Theme = "Dark"; Look = "Faceplate"; Name = "settings-dark"; Args = @("--open-settings") },
+    @{ Theme = "Light"; Look = "FrutigerAero"; Name = "aero-light"; Args = @() },
+    @{ Theme = "Dark"; Look = "FrutigerAero"; Name = "aero-dark"; Args = @() },
+    @{ Theme = "Light"; Look = "FrutigerAero"; Name = "aero-settings-light"; Args = @("--open-settings") },
+    @{ Theme = "Dark"; Look = "MetalHeart"; Name = "metal-dark"; Args = @() },
+    @{ Theme = "Light"; Look = "MetalHeart"; Name = "metal-light"; Args = @() },
+    @{ Theme = "Dark"; Look = "MetalHeart"; Name = "metal-settings-dark"; Args = @("--open-settings") }
 )
 foreach ($shot in $shots) {
-    $theme = $shot.Theme
-    @{ Theme = $theme } | ConvertTo-Json | Set-Content -Path (Join-Path $settingsDir "settings.json") -Encoding utf8
+    @{ Theme = $shot.Theme; Look = $shot.Look } | ConvertTo-Json | Set-Content -Path (Join-Path $settingsDir "settings.json") -Encoding utf8
     if ($shot.Args.Count -gt 0) { $p = Start-Process -FilePath $Exe -ArgumentList $shot.Args -PassThru }
     else { $p = Start-Process -FilePath $Exe -PassThru }
     Start-Sleep -Seconds 15

From 92d0a133c8aabf5c38763d0032dac1f8a07fc707 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 02:10:06 +0000
Subject: [PATCH 2/3] Give each look its own chrome, not just its own colours

Panels, the status field, the top bar and banners are now templated
controls a look can replace, and the default shapes moved from App.xaml
into Themes/Shared.xaml so a look's own dictionary wins over them.

Frutiger Aero: glass panels with a hard gloss band, a glass bar behind
the top controls, orb status lights with a specular spot, and a drawn
backdrop of sky, grass, bubbles and rings (black glass over glowing
teal in the dark version, after the KDE 4 desktop).

Metal Heart: riveted steel plates with a chrome bevel and brushed grain,
a chrome strip for the top bar, lens status lights, near-square chrome
buttons, an acid-green primary button, a brushed backdrop with blue and
green glows and chrome rails, and Orbitron Bold for the big type
(embedded, OFL, a static instance of the Google Fonts variable file).

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XaLCFyaNVfAWPcHVakuuu8
---
 src/ProDHCPServer.App/App.xaml                | 191 +-------------
 .../Assets/Fonts/OFL-Orbitron.txt             |  93 +++++++
 .../Assets/Fonts/Orbitron-Bold.ttf            | Bin 0 -> 24512 bytes
 src/ProDHCPServer.App/Converters.cs           |  18 ++
 src/ProDHCPServer.App/MainWindow.xaml         | 141 +++++-----
 src/ProDHCPServer.App/Theme.cs                |  18 +-
 .../Themes/Faceplate.Dark.xaml                |  21 +-
 .../Themes/Faceplate.Light.xaml               |  21 +-
 .../Themes/FrutigerAero.Dark.xaml             | 130 ++++++----
 .../Themes/FrutigerAero.Light.xaml            | 124 ++++++---
 .../Themes/FrutigerAero.Shapes.xaml           |  75 ++++++
 .../Themes/MetalHeart.Dark.xaml               | 138 +++++-----
 .../Themes/MetalHeart.Light.xaml              | 120 +++++----
 .../Themes/MetalHeart.Shapes.xaml             | 127 +++++++++
 src/ProDHCPServer.App/Themes/Shared.xaml      | 242 ++++++++++++++++++
 .../ViewModels/MainViewModel.cs               |   1 +
 16 files changed, 979 insertions(+), 481 deletions(-)
 create mode 100644 src/ProDHCPServer.App/Assets/Fonts/OFL-Orbitron.txt
 create mode 100644 src/ProDHCPServer.App/Assets/Fonts/Orbitron-Bold.ttf
 create mode 100644 src/ProDHCPServer.App/Themes/FrutigerAero.Shapes.xaml
 create mode 100644 src/ProDHCPServer.App/Themes/MetalHeart.Shapes.xaml
 create mode 100644 src/ProDHCPServer.App/Themes/Shared.xaml

diff --git a/src/ProDHCPServer.App/App.xaml b/src/ProDHCPServer.App/App.xaml
index 5e428c9..456c969 100644
--- a/src/ProDHCPServer.App/App.xaml
+++ b/src/ProDHCPServer.App/App.xaml
@@ -11,196 +11,15 @@
         <local:StateGlyphConverter x:Key="StateGlyph" />
         <local:VisibleWhenConverter x:Key="VisibleWhen" />
 
+        <local:RunningBrushConverter x:Key="RunningBrush" />
         <!--
-            Colours, text and display faces, and shapes (corners, edges, gloss) come from the current look: a resource
-            dictionary under Themes/ that Theme.Apply merges in, so they are always read with DynamicResource.
-            Monospace is kept for raw technical detail only and is the same in every look.
+            Everything else (type scale, text styles, panel and button shapes, colours, fonts, backdrop) comes from the
+            current look: Theme.Apply merges Themes/<Look>.<Dark|Light>.xaml, which itself merges Themes/Shared.xaml.
         -->
-        <FontFamily x:Key="MonoFont">Cascadia Mono, Consolas, Courier New</FontFamily>
-        <FontFamily x:Key="IconFont">Segoe Fluent Icons, Segoe MDL2 Assets</FontFamily>
-
-        <!-- Five sizes: small, body, lead, head, display. Nothing below 13. -->
-        <sys:Double x:Key="TextSmall">13</sys:Double>
-        <sys:Double x:Key="TextBody">16</sys:Double>
-        <sys:Double x:Key="TextLead">20</sys:Double>
-        <sys:Double x:Key="TextHead">40</sys:Double>
-        <sys:Double x:Key="TextDisplay">64</sys:Double>
-
-        <!-- Panels are a tone step above the ground. The look decides whether they also get an edge or rounded corners. -->
-        <Style x:Key="Panel" TargetType="Border">
-            <Setter Property="Background" Value="{DynamicResource PanelBg}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource PanelBorder}" />
-            <Setter Property="BorderThickness" Value="{DynamicResource PanelBorderThickness}" />
-            <Setter Property="CornerRadius" Value="{DynamicResource PanelRadius}" />
-            <Setter Property="Padding" Value="24" />
-        </Style>
-
-        <!-- Status banners: a whole field of the state's soft colour. -->
-        <Style x:Key="Banner" TargetType="Border">
-            <Setter Property="BorderBrush" Value="{DynamicResource PanelBorder}" />
-            <Setter Property="BorderThickness" Value="{DynamicResource PanelBorderThickness}" />
-            <Setter Property="CornerRadius" Value="{DynamicResource PanelRadius}" />
-            <Setter Property="Padding" Value="24,16" />
-            <Setter Property="Margin" Value="0,0,0,16" />
-        </Style>
-
-        <Style x:Key="SectionTitle" TargetType="TextBlock">
-            <Setter Property="FontSize" Value="{StaticResource TextLead}" />
-            <Setter Property="FontWeight" Value="SemiBold" />
-            <Setter Property="Foreground" Value="{DynamicResource TextPrimary}" />
-        </Style>
-
-        <Style x:Key="Primary" TargetType="TextBlock">
-            <Setter Property="Foreground" Value="{DynamicResource TextPrimary}" />
-            <Setter Property="TextWrapping" Value="Wrap" />
-        </Style>
-
-        <Style x:Key="Secondary" TargetType="TextBlock">
-            <Setter Property="Foreground" Value="{DynamicResource TextSecondary}" />
-            <Setter Property="TextWrapping" Value="Wrap" />
-        </Style>
-
-        <Style x:Key="Meta" TargetType="TextBlock">
-            <Setter Property="FontSize" Value="{StaticResource TextSmall}" />
-            <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
-        </Style>
-
-        <!-- Raw technical detail (packets, exceptions): the one place monospace belongs. -->
-        <Style x:Key="MonoBox" TargetType="TextBox">
-            <Setter Property="FontFamily" Value="{StaticResource MonoFont}" />
-            <Setter Property="FontSize" Value="{StaticResource TextSmall}" />
-            <Setter Property="IsReadOnly" Value="True" />
-            <Setter Property="TextWrapping" Value="Wrap" />
-            <Setter Property="MaxHeight" Value="224" />
-            <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-            <Setter Property="Background" Value="{DynamicResource MonoBg}" />
-            <Setter Property="Foreground" Value="{DynamicResource TextSecondary}" />
-            <Setter Property="BorderThickness" Value="0" />
-        </Style>
-
-        <!--
-            Buttons: one fill, with an edge and a gloss the look paints over it (both transparent in the default look) and
-            corners the look sets from fully round to nearly square. Hover and press tint the fill with its own text colour;
-            keyboard focus draws a ring in the ink colour outside the button.
-        -->
-        <Style x:Key="PillButton" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource RaisedBg}" />
-            <Setter Property="Foreground" Value="{DynamicResource TextPrimary}" />
-            <Setter Property="FontFamily" Value="{DynamicResource TextFont}" />
-            <Setter Property="FontSize" Value="{StaticResource TextBody}" />
-            <Setter Property="FontWeight" Value="Medium" />
-            <Setter Property="Padding" Value="20,0" />
-            <Setter Property="MinHeight" Value="40" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="Cursor" Value="Hand" />
-            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-            <Setter Property="ToolTipService.ShowOnDisabled" Value="True" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Grid>
-                            <!-- Each layer's corner radius is its own height times the look's ButtonCornerScale (carried in Tag so it follows a live look change). -->
-                            <Border x:Name="Ring" Margin="-4" BorderThickness="2" BorderBrush="Transparent" Tag="{DynamicResource ButtonCornerScale}"
-                                    CornerRadius="{local:CornerScale}" />
-                            <Border x:Name="Bg" Background="{TemplateBinding Background}" Tag="{DynamicResource ButtonCornerScale}"
-                                    BorderBrush="{DynamicResource ButtonBorder}" BorderThickness="{DynamicResource ButtonBorderThickness}"
-                                    CornerRadius="{local:CornerScale}" />
-                            <Border x:Name="Gloss" Background="{DynamicResource ButtonGloss}" IsHitTestVisible="False" Tag="{DynamicResource ButtonCornerScale}"
-                                    CornerRadius="{local:CornerScale}" />
-                            <Border x:Name="Tint" Background="{TemplateBinding Foreground}" Opacity="0" Tag="{DynamicResource ButtonCornerScale}"
-                                    CornerRadius="{local:CornerScale}" />
-                            <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="Center"
-                                              TextElement.Foreground="{TemplateBinding Foreground}" RecognizesAccessKey="True" />
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Tint" Property="Opacity" Value="0.08" />
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="Tint" Property="Opacity" Value="0.16" />
-                            </Trigger>
-                            <Trigger Property="IsKeyboardFocused" Value="True">
-                                <Setter TargetName="Ring" Property="BorderBrush" Value="{DynamicResource TextPrimary}" />
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="Opacity" Value="0.4" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <!-- The primary action: solid ink. -->
-        <Style x:Key="AccentButton" TargetType="Button" BasedOn="{StaticResource PillButton}">
-            <Setter Property="Background" Value="{DynamicResource AccentBrush}" />
-            <Setter Property="Foreground" Value="{DynamicResource AccentText}" />
-            <Setter Property="FontWeight" Value="SemiBold" />
-        </Style>
-
-        <Style x:Key="SecondaryButton" TargetType="Button" BasedOn="{StaticResource PillButton}" />
-
-        <!-- Risky confirmations only. -->
-        <Style x:Key="DangerButton" TargetType="Button" BasedOn="{StaticResource PillButton}">
-            <Setter Property="Background" Value="{DynamicResource BadBrush}" />
-            <Setter Property="Foreground" Value="White" />
-            <Setter Property="FontWeight" Value="SemiBold" />
-        </Style>
-
-        <!-- Round icon-only button. Always give it a ToolTip (shown on hover and keyboard focus) and an AutomationProperties.Name. -->
-        <Style x:Key="IconButton" TargetType="Button" BasedOn="{StaticResource PillButton}">
-            <Setter Property="FontFamily" Value="{StaticResource IconFont}" />
-            <Setter Property="FontWeight" Value="Normal" />
-            <Setter Property="Width" Value="48" />
-            <Setter Property="Height" Value="48" />
-            <Setter Property="Padding" Value="0" />
-        </Style>
-
-        <!-- A clickable list row: flat at rest, a tone step on hover, an ink ring on keyboard focus. -->
-        <Style x:Key="RowButton" TargetType="Button">
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{DynamicResource TextPrimary}" />
-            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-            <Setter Property="Padding" Value="16,12" />
-            <Setter Property="Cursor" Value="Hand" />
-            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Bg" Background="{TemplateBinding Background}" BorderBrush="Transparent" BorderThickness="2"
-                                CornerRadius="{DynamicResource RowRadius}" Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Bg" Property="Background" Value="{DynamicResource RowHover}" />
-                            </Trigger>
-                            <Trigger Property="IsKeyboardFocused" Value="True">
-                                <Setter TargetName="Bg" Property="BorderBrush" Value="{DynamicResource TextPrimary}" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style x:Key="FieldLabel" TargetType="Label">
-            <Setter Property="Foreground" Value="{DynamicResource TextPrimary}" />
-            <Setter Property="FontSize" Value="{StaticResource TextBody}" />
-            <Setter Property="FontWeight" Value="Medium" />
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="Margin" Value="0,24,0,8" />
-        </Style>
-
-        <Style x:Key="FieldHelp" TargetType="TextBlock">
-            <Setter Property="FontSize" Value="{StaticResource TextSmall}" />
-            <Setter Property="Foreground" Value="{DynamicResource TextSecondary}" />
-            <Setter Property="TextWrapping" Value="Wrap" />
-            <Setter Property="Margin" Value="0,8,0,0" />
-        </Style>
 
+        <!-- Kept here rather than in Shared.xaml: it must base on Fluent's TextBox style, which a look file can't see while it loads. -->
         <Style x:Key="FieldBox" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
-            <Setter Property="FontSize" Value="{StaticResource TextBody}" />
+            <Setter Property="FontSize" Value="{DynamicResource TextBody}" />
             <Setter Property="Typography.NumeralAlignment" Value="Tabular" />
         </Style>
     </Application.Resources>
diff --git a/src/ProDHCPServer.App/Assets/Fonts/OFL-Orbitron.txt b/src/ProDHCPServer.App/Assets/Fonts/OFL-Orbitron.txt
new file mode 100644
index 0000000..91ede45
--- /dev/null
+++ b/src/ProDHCPServer.App/Assets/Fonts/OFL-Orbitron.txt
@@ -0,0 +1,93 @@
+Copyright 2018 The Orbitron Project Authors (https://github.com/theleagueof/orbitron), with Reserved Font Name: "Orbitron"
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/ProDHCPServer.App/Assets/Fonts/Orbitron-Bold.ttf b/src/ProDHCPServer.App/Assets/Fonts/Orbitron-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..3252adcec0a74f80f14b7428f11dde11d9c2c579
GIT binary patch
literal 24512
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
Cfks#W

literal 0
HcmV?d00001

diff --git a/src/ProDHCPServer.App/Converters.cs b/src/ProDHCPServer.App/Converters.cs
index 0740ba7..7532a7a 100644
--- a/src/ProDHCPServer.App/Converters.cs
+++ b/src/ProDHCPServer.App/Converters.cs
@@ -37,6 +37,24 @@ public sealed class StateBrushConverter : IValueConverter
     public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => throw new NotSupportedException();
 }
 
+/// <summary>
+/// IsRunning → the Start/Stop button's Background or Foreground (the ConverterParameter): solid ink to start, a quiet
+/// button to stop, since the status field already says the server is live. Looked up again after a look change.
+/// </summary>
+public sealed class RunningBrushConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        bool running = value is true;
+        var key = parameter as string == "Foreground"
+            ? (running ? "TextPrimary" : "AccentText")
+            : (running ? "RaisedBg" : "AccentBrush");
+        return Application.Current.TryFindResource(key);
+    }
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) => throw new NotSupportedException();
+}
+
 /// <summary>StepState → a short word for screen readers and the colour-blind.</summary>
 public sealed class StateWordConverter : IValueConverter
 {
diff --git a/src/ProDHCPServer.App/MainWindow.xaml b/src/ProDHCPServer.App/MainWindow.xaml
index de37394..34fd4f9 100644
--- a/src/ProDHCPServer.App/MainWindow.xaml
+++ b/src/ProDHCPServer.App/MainWindow.xaml
@@ -40,7 +40,8 @@
             </Grid.RowDefinitions>
 
             <!-- ===== Top bar: adapter picker, profile picker, refresh, settings, Start/Stop ===== -->
-            <Grid Grid.Row="0" Margin="0,0,0,16">
+            <Border Grid.Row="0" Style="{DynamicResource TopBar}">
+            <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="*" />
@@ -87,12 +88,15 @@
                           ItemsSource="{Binding Settings.Profiles}" SelectedItem="{Binding Settings.SelectedProfile}" DisplayMemberPath="Display"
                           IsEnabled="{Binding SettingsEditable}" ToolTip="The saved settings Start uses: subnet, pool, lease time and DHCP options" />
 
-                <Button Grid.Column="4" Style="{StaticResource IconButton}" Content="&#xE72C;" Width="56" Height="56" Margin="16,0,0,0"
+                <Button Grid.Column="4" Style="{DynamicResource IconButton}" Content="&#xE72C;" Width="56" Height="56" Margin="16,0,0,0"
                         Command="{Binding RefreshAdaptersCommand}" ToolTip="Refresh adapters (F5)" AutomationProperties.Name="Refresh adapters" />
-                <Button x:Name="SettingsButton" Grid.Column="5" Style="{StaticResource IconButton}" Content="&#xE713;" Width="56" Height="56" Margin="8,0,0,0"
+                <Button x:Name="SettingsButton" Grid.Column="5" Style="{DynamicResource IconButton}" Content="&#xE713;" Width="56" Height="56" Margin="8,0,0,0"
                         Command="{Binding ToggleSettingsCommand}" ToolTip="Edit profiles and settings (Ctrl+,)" AutomationProperties.Name="Edit profiles and settings" />
 
-                <Button Grid.Column="6" MinWidth="200" Height="56" Margin="16,0,0,0" Padding="28,0"
+                <!-- While running, Stop is a quiet button: the status field says the server is live. -->
+                <Button Grid.Column="6" MinWidth="200" Height="56" Margin="16,0,0,0" Padding="28,0" Style="{DynamicResource AccentButton}"
+                        Background="{Binding IsRunning, Converter={StaticResource RunningBrush}, ConverterParameter=Background}"
+                        Foreground="{Binding IsRunning, Converter={StaticResource RunningBrush}, ConverterParameter=Foreground}"
                         Command="{Binding StartStopCommand}" AutomationProperties.Name="{Binding StartStopText}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock FontFamily="{StaticResource IconFont}" FontSize="{StaticResource TextBody}" VerticalAlignment="Center" Margin="0,0,12,0">
@@ -110,28 +114,19 @@
                         </TextBlock>
                         <TextBlock Text="{Binding StartStopText}" FontSize="{StaticResource TextLead}" FontWeight="SemiBold" VerticalAlignment="Center" />
                     </StackPanel>
-                    <Button.Style>
-                        <Style TargetType="Button" BasedOn="{StaticResource AccentButton}">
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding IsRunning}" Value="True">
-                                    <!-- While running, Stop is a quiet button: the status field says the server is live. -->
-                                    <Setter Property="Background" Value="{DynamicResource RaisedBg}" />
-                                    <Setter Property="Foreground" Value="{DynamicResource TextPrimary}" />
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </Button.Style>
                 </Button>
             </Grid>
+            </Border>
 
             <!-- ===== Status field: one line, readable from across the rack, beside a giant status light ===== -->
-            <Border Grid.Row="1" Margin="0,0,0,16" ClipToBounds="True" MinHeight="104" CornerRadius="{DynamicResource PanelRadius}"
-                    BorderBrush="{DynamicResource PanelBorder}" BorderThickness="{DynamicResource PanelBorderThickness}"
-                    Background="{Binding HeadlineState, Converter={StaticResource StateBrush}, ConverterParameter=Soft}">
+            <ContentControl Grid.Row="1" Margin="0,0,0,16" MinHeight="104" Style="{DynamicResource StatusField}"
+                            Background="{Binding HeadlineState, Converter={StaticResource StateBrush}, ConverterParameter=Soft}">
                 <Grid>
-                    <!-- The light: cropped by the right edge of the field. Its colour is the state. -->
+                    <!-- The light: cropped by the right edge of the field. Its colour is the state; glossy looks paint a highlight over it. -->
                     <Ellipse Width="280" Height="280" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,-400,-100,-400"
                              Fill="{Binding HeadlineState, Converter={StaticResource StateBrush}}" />
+                    <Ellipse Width="280" Height="280" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,-400,-100,-400"
+                             Fill="{DynamicResource LightGloss}" IsHitTestVisible="False" />
                     <TextBlock Text="{Binding HeadlineState, Converter={StaticResource StateGlyph}, ConverterParameter=Hero}"
                                FontFamily="{StaticResource IconFont}" FontSize="{StaticResource TextHead}" Foreground="White"
                                HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,70,0"
@@ -145,26 +140,26 @@
                                    Visibility="{Binding HeadlineAction, Converter={StaticResource VisibleWhen}}" />
                     </StackPanel>
                 </Grid>
-            </Border>
+            </ContentControl>
 
             <!-- ===== Banners ===== -->
             <StackPanel Grid.Row="2">
                 <!-- Crash recovery -->
-                <Border Style="{StaticResource Banner}" Background="{DynamicResource WarnSoft}"
+                <Border Style="{DynamicResource Banner}" Background="{DynamicResource WarnSoft}"
                         Visibility="{Binding PendingRecovery, Converter={StaticResource VisibleWhen}}">
                     <Grid>
                         <Grid.ColumnDefinitions><ColumnDefinition Width="Auto" /><ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" /></Grid.ColumnDefinitions>
                         <Ellipse Width="16" Height="16" Fill="{DynamicResource WarnBrush}" VerticalAlignment="Center" Margin="0,0,16,0" />
                         <TextBlock Grid.Column="1" Text="{Binding RecoveryText}" FontSize="{StaticResource TextBody}" Style="{StaticResource Primary}" VerticalAlignment="Center" />
                         <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="24,0,0,0" VerticalAlignment="Center">
-                            <Button Content="Restore adapter" Style="{StaticResource AccentButton}" Command="{Binding RestorePendingCommand}" />
-                            <Button Content="Keep current settings" Style="{StaticResource SecondaryButton}" Margin="8,0,0,0" Command="{Binding DiscardPendingCommand}" />
+                            <Button Content="Restore adapter" Style="{DynamicResource AccentButton}" Command="{Binding RestorePendingCommand}" />
+                            <Button Content="Keep current settings" Style="{DynamicResource SecondaryButton}" Margin="8,0,0,0" Command="{Binding DiscardPendingCommand}" />
                         </StackPanel>
                     </Grid>
                 </Border>
 
                 <!-- Another DHCP server -->
-                <Border Style="{StaticResource Banner}" Background="{DynamicResource BadSoft}"
+                <Border Style="{DynamicResource Banner}" Background="{DynamicResource BadSoft}"
                         Visibility="{Binding OtherServerText, Converter={StaticResource VisibleWhen}}">
                     <StackPanel>
                         <Grid>
@@ -172,8 +167,8 @@
                             <Ellipse Width="16" Height="16" Fill="{DynamicResource BadBrush}" VerticalAlignment="Center" Margin="0,0,16,0" />
                             <TextBlock Grid.Column="1" Text="{Binding OtherServerText}" FontSize="{StaticResource TextBody}" FontWeight="SemiBold" Style="{StaticResource Primary}" VerticalAlignment="Center" />
                             <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="24,0,0,0" VerticalAlignment="Center">
-                                <Button Content="Stop server" Style="{StaticResource AccentButton}" Command="{Binding StartStopCommand}" />
-                                <Button Content="Serve anyway…" Style="{StaticResource SecondaryButton}" Margin="8,0,0,0" Command="{Binding ServeAnywayCommand}" />
+                                <Button Content="Stop server" Style="{DynamicResource AccentButton}" Command="{Binding StartStopCommand}" />
+                                <Button Content="Serve anyway…" Style="{DynamicResource SecondaryButton}" Margin="8,0,0,0" Command="{Binding ServeAnywayCommand}" />
                             </StackPanel>
                         </Grid>
                         <Expander Header="Technical detail" Margin="32,8,0,0" Foreground="{DynamicResource TextSecondary}"
@@ -184,7 +179,7 @@
                 </Border>
 
                 <!-- Errors -->
-                <Border Style="{StaticResource Banner}" Background="{DynamicResource BadSoft}"
+                <Border Style="{DynamicResource Banner}" Background="{DynamicResource BadSoft}"
                         Visibility="{Binding ErrorMessage, Converter={StaticResource VisibleWhen}}">
                     <StackPanel>
                         <Grid>
@@ -192,11 +187,11 @@
                             <Ellipse Width="16" Height="16" Fill="{DynamicResource BadBrush}" VerticalAlignment="Center" Margin="0,0,16,0" />
                             <TextBlock Grid.Column="1" Text="{Binding ErrorMessage}" FontSize="{StaticResource TextBody}" FontWeight="SemiBold" Style="{StaticResource Primary}" VerticalAlignment="Center" />
                             <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="24,0,0,0" VerticalAlignment="Center">
-                                <Button Content="Retry restore" Style="{StaticResource AccentButton}" Margin="0,0,8,0" Command="{Binding RetryRestoreCommand}"
+                                <Button Content="Retry restore" Style="{DynamicResource AccentButton}" Margin="0,0,8,0" Command="{Binding RetryRestoreCommand}"
                                         Visibility="{Binding CanRetryRestore, Converter={StaticResource VisibleWhen}}" />
-                                <Button Content="Copy error details" Style="{StaticResource SecondaryButton}" Margin="0,0,8,0" Command="{Binding CopyTextCommand}" CommandParameter="{Binding ErrorDetail}"
+                                <Button Content="Copy error details" Style="{DynamicResource SecondaryButton}" Margin="0,0,8,0" Command="{Binding CopyTextCommand}" CommandParameter="{Binding ErrorDetail}"
                                         Visibility="{Binding ErrorDetail, Converter={StaticResource VisibleWhen}}" />
-                                <Button Content="Dismiss" Style="{StaticResource SecondaryButton}" Command="{Binding DismissErrorCommand}" />
+                                <Button Content="Dismiss" Style="{DynamicResource SecondaryButton}" Command="{Binding DismissErrorCommand}" />
                             </StackPanel>
                         </Grid>
                         <Expander Header="Technical detail" Margin="32,8,0,0" Foreground="{DynamicResource TextSecondary}"
@@ -207,13 +202,13 @@
                 </Border>
 
                 <!-- Overlapping Wi-Fi/other adapter -->
-                <Border Style="{StaticResource Banner}" Background="{DynamicResource WarnSoft}"
+                <Border Style="{DynamicResource Banner}" Background="{DynamicResource WarnSoft}"
                         Visibility="{Binding ConflictText, Converter={StaticResource VisibleWhen}}">
                     <Grid>
                         <Grid.ColumnDefinitions><ColumnDefinition Width="Auto" /><ColumnDefinition Width="*" /><ColumnDefinition Width="Auto" /></Grid.ColumnDefinitions>
                         <Ellipse Width="16" Height="16" Fill="{DynamicResource WarnBrush}" VerticalAlignment="Center" Margin="0,0,16,0" />
                         <TextBlock Grid.Column="1" Text="{Binding ConflictText}" FontSize="{StaticResource TextBody}" Style="{StaticResource Primary}" VerticalAlignment="Center" />
-                        <Button Grid.Column="2" Content="Turn it off until Stop" Style="{StaticResource AccentButton}" Margin="24,0,0,0" VerticalAlignment="Center"
+                        <Button Grid.Column="2" Content="Turn it off until Stop" Style="{DynamicResource AccentButton}" Margin="24,0,0,0" VerticalAlignment="Center"
                                 Command="{Binding TurnOffConflictingCommand}" />
                     </Grid>
                 </Border>
@@ -228,7 +223,7 @@
                 </Grid.ColumnDefinitions>
 
                 <!-- Status checks: the chain from adapter to device, top to bottom in the order a tech would check them -->
-                <Border Style="{StaticResource Panel}" Padding="0">
+                <ContentControl Style="{DynamicResource Panel}" Padding="0">
                     <ScrollViewer VerticalScrollBarVisibility="Auto" Padding="0,8">
                         <ItemsControl ItemsSource="{Binding Steps}" AutomationProperties.Name="Status checks">
                             <ItemsControl.ItemTemplate>
@@ -258,6 +253,17 @@
                                                         </Style>
                                                     </Ellipse.Style>
                                                 </Ellipse>
+                                                <Ellipse Fill="{DynamicResource LightGloss}" IsHitTestVisible="False">
+                                                    <Ellipse.Style>
+                                                        <Style TargetType="Ellipse">
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding State}" Value="{x:Static status:StepState.Idle}">
+                                                                    <Setter Property="Visibility" Value="Collapsed" />
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </Ellipse.Style>
+                                                </Ellipse>
                                                 <TextBlock Text="{Binding State, Converter={StaticResource StateGlyph}}" FontFamily="{StaticResource IconFont}"
                                                            Foreground="White" FontSize="{StaticResource TextSmall}"
                                                            HorizontalAlignment="Center" VerticalAlignment="Center" />
@@ -278,10 +284,10 @@
                             </ItemsControl.ItemTemplate>
                         </ItemsControl>
                     </ScrollViewer>
-                </Border>
+                </ContentControl>
 
                 <!-- Device panel -->
-                <Border Grid.Column="2" Style="{StaticResource Panel}" Padding="32,24">
+                <ContentControl Grid.Column="2" Style="{DynamicResource Panel}" Padding="32,24">
                     <ScrollViewer VerticalScrollBarVisibility="Auto">
                         <StackPanel>
                             <!-- No device yet: say what goes here and give the next step -->
@@ -299,7 +305,7 @@
                                         </Style>
                                     </TextBlock.Style>
                                 </TextBlock>
-                                <Button Content="Start server" Style="{StaticResource AccentButton}" HorizontalAlignment="Left" Margin="0,24,0,0" MinHeight="48"
+                                <Button Content="Start server" Style="{DynamicResource AccentButton}" HorizontalAlignment="Left" Margin="0,24,0,0" MinHeight="48"
                                         Command="{Binding StartStopCommand}"
                                         Visibility="{Binding IsRunning, Converter={StaticResource VisibleWhen}, ConverterParameter=Invert}" />
                             </StackPanel>
@@ -312,7 +318,7 @@
                                     <Grid.ColumnDefinitions><ColumnDefinition Width="Auto" /><ColumnDefinition Width="Auto" /></Grid.ColumnDefinitions>
                                     <TextBlock Text="{Binding Ip}" FontFamily="{DynamicResource DisplayFont}" FontSize="{StaticResource TextDisplay}" FontWeight="Bold"
                                                Style="{StaticResource Primary}" TextWrapping="NoWrap" VerticalAlignment="Center" AutomationProperties.Name="Device IP address" />
-                                    <Button Grid.Column="1" Style="{StaticResource IconButton}" Content="&#xE8C8;" Margin="16,0,0,8" VerticalAlignment="Center"
+                                    <Button Grid.Column="1" Style="{DynamicResource IconButton}" Content="&#xE8C8;" Margin="16,0,0,8" VerticalAlignment="Center"
                                             ToolTip="Copy IP address" AutomationProperties.Name="Copy IP address"
                                             Command="{Binding DataContext.CopyIpCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}" />
                                 </Grid>
@@ -341,7 +347,7 @@
                             </StackPanel>
 
                             <StackPanel Visibility="{Binding FocusedDevice, Converter={StaticResource VisibleWhen}}" Margin="0,24,0,0">
-                                <Button Style="{StaticResource AccentButton}" FontSize="{StaticResource TextLead}" Height="56" HorizontalAlignment="Stretch"
+                                <Button Style="{DynamicResource AccentButton}" FontSize="{StaticResource TextLead}" Height="56" HorizontalAlignment="Stretch"
                                         Command="{Binding OpenWebUiCommand}" ToolTip="Opens the device in your browser (http or https, whichever port is open)">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock Text="&#xE774;" FontFamily="{StaticResource IconFont}" FontSize="{StaticResource TextBody}" VerticalAlignment="Center" Margin="0,0,12,0" />
@@ -351,10 +357,10 @@
                                 <TextBlock Text="{Binding WebUiHint}" Style="{StaticResource Meta}" Margin="0,8,0,0" HorizontalAlignment="Center" />
                                 <TextBlock Text="Or open a specific port" FontSize="{StaticResource TextBody}" Style="{StaticResource Secondary}" Margin="0,24,0,8" />
                                 <WrapPanel>
-                                    <Button Content="Open http :80" Style="{StaticResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding OpenPortCommand}" CommandParameter="http:80" />
-                                    <Button Content="Open https :443" Style="{StaticResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding OpenPortCommand}" CommandParameter="https:443" />
-                                    <Button Content="Open http :8080" Style="{StaticResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding OpenPortCommand}" CommandParameter="http:8080" />
-                                    <Button Content="Open https :8443" Style="{StaticResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding OpenPortCommand}" CommandParameter="https:8443" />
+                                    <Button Content="Open http :80" Style="{DynamicResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding OpenPortCommand}" CommandParameter="http:80" />
+                                    <Button Content="Open https :443" Style="{DynamicResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding OpenPortCommand}" CommandParameter="https:443" />
+                                    <Button Content="Open http :8080" Style="{DynamicResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding OpenPortCommand}" CommandParameter="http:8080" />
+                                    <Button Content="Open https :8443" Style="{DynamicResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding OpenPortCommand}" CommandParameter="https:8443" />
                                 </WrapPanel>
                             </StackPanel>
 
@@ -414,7 +420,7 @@
                                     <TextBlock FontSize="{StaticResource TextBody}" Style="{StaticResource Primary}" VerticalAlignment="Center" TextWrapping="Wrap">
                                         <Run Text="Found on the network" FontWeight="SemiBold" /><Run Text="   " /><Run Text="{Binding FoundCountText, Mode=OneWay}" Foreground="{DynamicResource TextMuted}" />
                                     </TextBlock>
-                                    <Button Grid.Column="1" Style="{StaticResource SecondaryButton}" Command="{Binding SweepCommand}" Margin="16,0,0,0"
+                                    <Button Grid.Column="1" Style="{DynamicResource SecondaryButton}" Command="{Binding SweepCommand}" Margin="16,0,0,0"
                                             ToolTip="Looks for devices with static IPs on this laptop's subnet, the brand presets' subnets and any subnet a device was seen on. Uses a temporary address on each, removed afterwards.">
                                         <StackPanel Orientation="Horizontal">
                                             <TextBlock Text="&#xE721;" FontFamily="{StaticResource IconFont}" VerticalAlignment="Center" Margin="0,0,8,0" />
@@ -460,17 +466,17 @@
                                                                    Foreground="{Binding StateColour, Converter={StaticResource StateBrush}}" />
                                                     </StackPanel>
                                                     <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="16,0,0,0" VerticalAlignment="Center">
-                                                        <Button Content="Reach it" Style="{StaticResource AccentButton}"
+                                                        <Button Content="Reach it" Style="{DynamicResource AccentButton}"
                                                                 Command="{Binding DataContext.ReachCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}"
                                                                 IsEnabled="{Binding IsIdle}"
                                                                 Visibility="{Binding IsReachable, Converter={StaticResource VisibleWhen}, ConverterParameter=Invert}"
                                                                 ToolTip="Adds an address on this device's subnet to your adapter until Stop, so you can open its WebUI"
                                                                 AutomationProperties.Name="{Binding Ip, StringFormat='Reach {0}'}" />
-                                                        <Button Content="Open WebUI" Style="{StaticResource SecondaryButton}"
+                                                        <Button Content="Open WebUI" Style="{DynamicResource SecondaryButton}"
                                                                 Command="{Binding DataContext.OpenFoundCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding}"
                                                                 Visibility="{Binding IsReachable, Converter={StaticResource VisibleWhen}}"
                                                                 AutomationProperties.Name="{Binding Ip, StringFormat='Open the WebUI of {0}'}" />
-                                                        <Button Style="{StaticResource IconButton}" Content="&#xE8C8;" Width="40" Height="40" Margin="8,0,0,0"
+                                                        <Button Style="{DynamicResource IconButton}" Content="&#xE8C8;" Width="40" Height="40" Margin="8,0,0,0"
                                                                 Command="{Binding DataContext.CopyTextCommand, RelativeSource={RelativeSource AncestorType=Window}}" CommandParameter="{Binding Ip}"
                                                                 ToolTip="Copy IP address" AutomationProperties.Name="Copy IP address" />
                                                     </StackPanel>
@@ -482,11 +488,11 @@
                             </StackPanel>
                         </StackPanel>
                     </ScrollViewer>
-                </Border>
+                </ContentControl>
             </Grid>
 
             <!-- ===== Session log ===== -->
-            <Border Grid.Row="4" Style="{StaticResource Panel}" Padding="24,0" Margin="0,16,0,0">
+            <ContentControl Grid.Row="4" Style="{DynamicResource Panel}" Padding="24,0" Margin="0,16,0,0">
                 <Expander x:Name="LogExpander" Foreground="{DynamicResource TextSecondary}">
                     <Expander.Header>
                         <TextBlock TextTrimming="CharacterEllipsis" FontSize="{StaticResource TextSmall}" Typography.NumeralAlignment="Tabular">
@@ -521,8 +527,8 @@
                             <TextBox Grid.Column="2" Text="{Binding LogSearch, UpdateSourceTrigger=PropertyChanged, Delay=200}" Margin="8,0,0,0" FontSize="{StaticResource TextSmall}"
                                      VerticalContentAlignment="Center" AutomationProperties.Name="Search the log" ToolTip="Search the log, for example an IP or MAC address" />
                             <TextBlock Grid.Column="3" Text="{Binding LogCountText}" Style="{StaticResource Meta}" Margin="16,0" VerticalAlignment="Center" TextTrimming="CharacterEllipsis" />
-                            <Button Grid.Column="4" Content="Show everything" Style="{StaticResource SecondaryButton}" Margin="0,0,8,0" Command="{Binding ClearLogFilterCommand}" />
-                            <Button Grid.Column="5" Style="{StaticResource SecondaryButton}" Command="{Binding ExportLogCommand}"
+                            <Button Grid.Column="4" Content="Show everything" Style="{DynamicResource SecondaryButton}" Margin="0,0,8,0" Command="{Binding ClearLogFilterCommand}" />
+                            <Button Grid.Column="5" Style="{DynamicResource SecondaryButton}" Command="{Binding ExportLogCommand}"
                                     ToolTip="Save the entries shown here as a text file (for a job report) or CSV (for Excel)">
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Text="&#xEDE1;" FontFamily="{StaticResource IconFont}" VerticalAlignment="Center" Margin="0,0,8,0" />
@@ -553,13 +559,14 @@
                                  Text="{Binding SelectedItem.Entry, ElementName=LogList, Mode=OneWay, Converter={x:Static local:LogDetailConverter.Instance}, TargetNullValue='Select a log line to see its details.', FallbackValue='Select a log line to see its details.'}" />
                     </Grid>
                 </Expander>
-            </Border>
+            </ContentControl>
         </Grid>
 
         <!-- ===== Settings slide-over: the status stays visible behind it ===== -->
         <Grid x:Name="SettingsLayer" Visibility="{Binding SettingsOpen, Converter={StaticResource VisibleWhen}}">
             <Border Background="{DynamicResource Scrim}" MouseLeftButtonDown="OnScrimClicked" />
-            <Border x:Name="SettingsPanel" Width="448" HorizontalAlignment="Right" Background="{DynamicResource PanelBg}"
+            <Border x:Name="SettingsPanel" Width="448" HorizontalAlignment="Right" Background="{DynamicResource SlideOverBg}"
+                    BorderBrush="{DynamicResource PanelBorder}" BorderThickness="{DynamicResource SlideOverBorderThickness}"
                     KeyboardNavigation.TabNavigation="Cycle" KeyboardNavigation.ControlTabNavigation="Cycle"
                     AutomationProperties.Name="Profiles and settings">
                 <Border.RenderTransform>
@@ -570,7 +577,7 @@
                     <Grid DockPanel.Dock="Top" Margin="32,24,24,0">
                         <TextBlock Text="Profiles" FontFamily="{DynamicResource DisplayFont}" FontSize="{StaticResource TextHead}" FontWeight="Bold"
                                    Foreground="{DynamicResource TextPrimary}" VerticalAlignment="Center" />
-                        <Button x:Name="CloseSettingsButton" Style="{StaticResource IconButton}" Content="&#xE711;" HorizontalAlignment="Right"
+                        <Button x:Name="CloseSettingsButton" Style="{DynamicResource IconButton}" Content="&#xE711;" HorizontalAlignment="Right"
                                 Command="{Binding DataContext.CloseSettingsCommand, RelativeSource={RelativeSource AncestorType=Window}}"
                                 ToolTip="Close (Esc)" AutomationProperties.Name="Close profiles and settings" />
                     </Grid>
@@ -578,15 +585,15 @@
                     <!-- Footer: always clickable for your own profiles; Save shows what needs fixing -->
                     <Border DockPanel.Dock="Bottom" Background="{DynamicResource RaisedBg}" Padding="32,16">
                         <StackPanel Orientation="Horizontal">
-                            <Button Content="Save profile" Style="{StaticResource AccentButton}" MinHeight="48" Command="{Binding SaveCommand}" />
-                            <Button Content="Discard changes" Style="{StaticResource SecondaryButton}" MinHeight="48" Margin="8,0,0,0" Background="{DynamicResource PanelBg}"
+                            <Button Content="Save profile" Style="{DynamicResource AccentButton}" MinHeight="48" Command="{Binding SaveCommand}" />
+                            <Button Content="Discard changes" Style="{DynamicResource SecondaryButton}" MinHeight="48" Margin="8,0,0,0" Background="{DynamicResource PanelBg}"
                                     Command="{Binding DiscardCommand}" />
                         </StackPanel>
                     </Border>
 
                     <ScrollViewer VerticalScrollBarVisibility="Auto" Padding="32,0,32,24">
                         <StackPanel>
-                            <Border Style="{StaticResource Banner}" Margin="0,16,0,0" Padding="16,12" Background="{DynamicResource WarnSoft}"
+                            <Border Style="{DynamicResource Banner}" Margin="0,16,0,0" Padding="16,12" Background="{DynamicResource WarnSoft}"
                                     Visibility="{Binding IsLocked, Converter={StaticResource VisibleWhen}}">
                                 <TextBlock Text="The server is running. Stop it to change or switch profiles; the theme can change any time." FontSize="{StaticResource TextBody}" Style="{StaticResource Primary}" />
                             </Border>
@@ -597,20 +604,20 @@
                                       IsEnabled="{Binding CanManage}" FontSize="{StaticResource TextBody}" HorizontalAlignment="Stretch" />
                             <TextBlock Text="Start uses the profile picked here." Style="{StaticResource FieldHelp}" />
                             <WrapPanel Margin="0,12,0,0">
-                                <Button Content="New" Style="{StaticResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding NewCommand}" ToolTip="Make a new profile from the defaults" />
-                                <Button Content="Duplicate" Style="{StaticResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding DuplicateCommand}" ToolTip="Copy this profile so you can change it" />
-                                <Button Content="Import…" Style="{StaticResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding ImportCommand}" ToolTip="Add profiles from a file someone exported" />
-                                <Button Content="Export…" Style="{StaticResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding ExportCommand}" ToolTip="Save this profile to a file to share or back up" />
-                                <Button Content="Delete" Style="{StaticResource DangerButton}" Margin="0,0,8,8" Command="{Binding DeleteCommand}"
+                                <Button Content="New" Style="{DynamicResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding NewCommand}" ToolTip="Make a new profile from the defaults" />
+                                <Button Content="Duplicate" Style="{DynamicResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding DuplicateCommand}" ToolTip="Copy this profile so you can change it" />
+                                <Button Content="Import…" Style="{DynamicResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding ImportCommand}" ToolTip="Add profiles from a file someone exported" />
+                                <Button Content="Export…" Style="{DynamicResource SecondaryButton}" Margin="0,0,8,8" Command="{Binding ExportCommand}" ToolTip="Save this profile to a file to share or back up" />
+                                <Button Content="Delete" Style="{DynamicResource DangerButton}" Margin="0,0,8,8" Command="{Binding DeleteCommand}"
                                         Visibility="{Binding IsPreset, Converter={StaticResource VisibleWhen}, ConverterParameter=Invert}" />
                             </WrapPanel>
 
-                            <Border Style="{StaticResource Banner}" Margin="0,8,0,0" Padding="16,12" Background="{DynamicResource RaisedBg}"
+                            <Border Style="{DynamicResource Banner}" Margin="0,8,0,0" Padding="16,12" Background="{DynamicResource RaisedBg}"
                                     Visibility="{Binding Notice, Converter={StaticResource VisibleWhen}}">
                                 <TextBlock Text="{Binding Notice}" FontSize="{StaticResource TextBody}" Style="{StaticResource Primary}" AutomationProperties.LiveSetting="Polite" />
                             </Border>
 
-                            <Border Style="{StaticResource Banner}" Margin="0,8,0,0" Padding="16,12" Background="{DynamicResource RaisedBg}"
+                            <Border Style="{DynamicResource Banner}" Margin="0,8,0,0" Padding="16,12" Background="{DynamicResource RaisedBg}"
                                     Visibility="{Binding IsPreset, Converter={StaticResource VisibleWhen}}">
                                 <StackPanel>
                                     <TextBlock Text="{Binding Notes}" FontSize="{StaticResource TextBody}" Style="{StaticResource Primary}" />
@@ -660,7 +667,7 @@
                                     <TextBox Grid.Column="2" Text="{Binding PoolEnd, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource FieldBox}"
                                              AutomationProperties.Name="Last address in the pool" />
                                 </Grid>
-                                <Button Content="Suggest a pool for this subnet" Style="{StaticResource SecondaryButton}" Margin="0,8,0,0" HorizontalAlignment="Left"
+                                <Button Content="Suggest a pool for this subnet" Style="{DynamicResource SecondaryButton}" Margin="0,8,0,0" HorizontalAlignment="Left"
                                         Command="{Binding SuggestPoolCommand}" />
 
                                 <Label Content="Lease _time (minutes)" Target="{Binding ElementName=LeaseBox}" Style="{StaticResource FieldLabel}" />
@@ -719,20 +726,20 @@
                                                                   FontSize="{StaticResource TextSmall}" AutomationProperties.Name="Value type" />
                                                         <TextBox Grid.Column="2" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource FieldBox}" Margin="8,0,0,0"
                                                                  AutomationProperties.Name="Option value" />
-                                                        <Button Grid.Column="3" Style="{StaticResource IconButton}" Content="&#xE74D;" Width="40" Height="40" Margin="8,0,0,0"
+                                                        <Button Grid.Column="3" Style="{DynamicResource IconButton}" Content="&#xE74D;" Width="40" Height="40" Margin="8,0,0,0"
                                                                 Command="{Binding DataContext.RemoveCustomOptionCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding}"
                                                                 ToolTip="Remove this option" AutomationProperties.Name="Remove this option" />
                                                     </Grid>
                                                 </DataTemplate>
                                             </ItemsControl.ItemTemplate>
                                         </ItemsControl>
-                                        <Button Content="Add an option" Style="{StaticResource SecondaryButton}" HorizontalAlignment="Left" Command="{Binding AddCustomOptionCommand}" />
+                                        <Button Content="Add an option" Style="{DynamicResource SecondaryButton}" HorizontalAlignment="Left" Command="{Binding AddCustomOptionCommand}" />
                                         <TextBlock Text="Text for names and URLs, Addresses for IP lists, Hex for anything else." Style="{StaticResource FieldHelp}" />
                                     </StackPanel>
                                 </Expander>
                             </StackPanel>
 
-                            <Border Style="{StaticResource Banner}" Margin="0,24,0,0" Padding="16,12" Background="{DynamicResource BadSoft}"
+                            <Border Style="{DynamicResource Banner}" Margin="0,24,0,0" Padding="16,12" Background="{DynamicResource BadSoft}"
                                     Visibility="{Binding Errors, Converter={StaticResource VisibleWhen}}">
                                 <TextBlock Text="{Binding Errors}" FontSize="{StaticResource TextBody}" Style="{StaticResource Primary}"
                                            AutomationProperties.LiveSetting="Polite" />
diff --git a/src/ProDHCPServer.App/Theme.cs b/src/ProDHCPServer.App/Theme.cs
index 4cd7852..7868ae1 100644
--- a/src/ProDHCPServer.App/Theme.cs
+++ b/src/ProDHCPServer.App/Theme.cs
@@ -4,12 +4,14 @@
 namespace ProDHCPServer.App;
 
 /// <summary>
-/// Picks the app's look (a pair of resource dictionaries under Themes/) and swaps it together with WPF's Fluent
-/// ThemeMode so custom panels and standard controls always match. Every colour, font and shape the XAML reads with
-/// DynamicResource comes from the current look, so switching looks repaints the window live.
+/// Picks the app's look (resource dictionaries under Themes/) and swaps it together with WPF's Fluent ThemeMode so
+/// custom panels and standard controls always match. Every colour, font and shape the XAML reads with DynamicResource
+/// comes from the current look, so switching looks repaints the window live.
 ///
-/// To add a look: drop Themes/Name.Dark.xaml and Themes/Name.Light.xaml next to the others (copy Faceplate's and
-/// change the values; every key in it must be present) and add one line to <see cref="Looks"/>.
+/// A look is Themes/Name.Dark.xaml and Themes/Name.Light.xaml (colours, fonts, backdrop), each merging Shared.xaml
+/// (type scale, text styles, default shapes) and optionally a Name.Shapes.xaml that replaces the panel, status field,
+/// top bar, banner or button styles with its own templates. To add one: copy Faceplate's two files, change the values,
+/// and add one line to <see cref="Looks"/>.
 /// </summary>
 public static class Theme
 {
@@ -21,9 +23,9 @@ public sealed record Look(string Id, string Name, string Blurb)
 
     public static IReadOnlyList<Look> Looks { get; } =
     [
-        new("Faceplate", "Rack faceplate", "The default: flat, dark, one status light at every scale."),
-        new("FrutigerAero", "Frutiger Aero", "Glossy glass panels over a sky-and-grass backdrop, 2000s style."),
-        new("MetalHeart", "Metal Heart", "Brushed steel, bevelled edges and a chrome-red accent."),
+        new("Faceplate", "Rack faceplate", "The default: a flat front panel, one status light at every scale."),
+        new("FrutigerAero", "Frutiger Aero", "Glass widgets and orb lights over a sky full of bubbles, 2000s desktop style."),
+        new("MetalHeart", "Metal Heart", "Riveted steel plates, chrome bevels and an acid-green button, Winamp skin style."),
     ];
 
     public static Look DefaultLook => Looks[0];
diff --git a/src/ProDHCPServer.App/Themes/Faceplate.Dark.xaml b/src/ProDHCPServer.App/Themes/Faceplate.Dark.xaml
index 0aa7934..f433789 100644
--- a/src/ProDHCPServer.App/Themes/Faceplate.Dark.xaml
+++ b/src/ProDHCPServer.App/Themes/Faceplate.Dark.xaml
@@ -1,17 +1,20 @@
 <!--
     Rack faceplate, dark: a dark front panel with white legends. Surfaces are separated by tone, never by lines.
-    Every key here is read by the XAML with DynamicResource, so the set must stay complete: copy this file to make a new
-    look and change the values, not the keys. Brushes may be solid or gradients.
+    Colours and fonts only: the shapes come from Shared.xaml. Every key here is read with DynamicResource, so the set must
+    stay complete: copy this file to make a new look and change the values, not the keys.
 -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="Shared.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
   <!-- Surfaces: one ground, a panel a tone step up, a raised step for the slide-over and selected rows. -->
   <SolidColorBrush x:Key="WindowBg" Color="#0B0D10" />
   <SolidColorBrush x:Key="PanelBg" Color="#15181C" />
   <SolidColorBrush x:Key="RaisedBg" Color="#1E2227" />
   <SolidColorBrush x:Key="RowHover" Color="#252A30" />
+  <SolidColorBrush x:Key="SlideOverBg" Color="#15181C" />
   <SolidColorBrush x:Key="Scrim" Color="#A6000000" />
 
   <!-- Ink -->
@@ -34,16 +37,6 @@
   <SolidColorBrush x:Key="AccentText" Color="#0B0D10" />
   <SolidColorBrush x:Key="MonoBg" Color="#0B0D10" />
 
-  <!-- Shape: panel edges and corners, button edges, a gloss painted over every button, and how round buttons are (0.5 = pill, 0 = square). -->
-  <SolidColorBrush x:Key="PanelBorder" Color="Transparent" />
-  <Thickness x:Key="PanelBorderThickness">0</Thickness>
-  <CornerRadius x:Key="PanelRadius">0</CornerRadius>
-  <CornerRadius x:Key="RowRadius">0</CornerRadius>
-  <SolidColorBrush x:Key="ButtonBorder" Color="Transparent" />
-  <Thickness x:Key="ButtonBorderThickness">0</Thickness>
-  <SolidColorBrush x:Key="ButtonGloss" Color="Transparent" />
-  <sys:Double x:Key="ButtonCornerScale">0.5</sys:Double>
-
   <!-- Faces: TextFont for everything you read, DisplayFont for the few big things (status line, device IP, settings title). -->
   <FontFamily x:Key="TextFont">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
   <FontFamily x:Key="DisplayFont">pack://application:,,,/Assets/Fonts/#League Spartan</FontFamily>
diff --git a/src/ProDHCPServer.App/Themes/Faceplate.Light.xaml b/src/ProDHCPServer.App/Themes/Faceplate.Light.xaml
index 43bbd2e..716eede 100644
--- a/src/ProDHCPServer.App/Themes/Faceplate.Light.xaml
+++ b/src/ProDHCPServer.App/Themes/Faceplate.Light.xaml
@@ -1,17 +1,20 @@
 <!--
     Rack faceplate, light: the same panel in brushed silver. Surfaces are separated by tone, never by lines.
-    Every key here is read by the XAML with DynamicResource, so the set must stay complete: copy this file to make a new
-    look and change the values, not the keys. Brushes may be solid or gradients.
+    Colours and fonts only: the shapes come from Shared.xaml. Every key here is read with DynamicResource, so the set must
+    stay complete: copy this file to make a new look and change the values, not the keys.
 -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="Shared.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
   <!-- Surfaces: one ground, a panel a tone step up, a raised step for the slide-over and selected rows. -->
   <SolidColorBrush x:Key="WindowBg" Color="#E6E8EB" />
   <SolidColorBrush x:Key="PanelBg" Color="#F4F5F7" />
   <SolidColorBrush x:Key="RaisedBg" Color="#FFFFFF" />
   <SolidColorBrush x:Key="RowHover" Color="#EBEDF0" />
+  <SolidColorBrush x:Key="SlideOverBg" Color="#F4F5F7" />
   <SolidColorBrush x:Key="Scrim" Color="#66000000" />
 
   <!-- Ink -->
@@ -34,16 +37,6 @@
   <SolidColorBrush x:Key="AccentText" Color="#FFFFFF" />
   <SolidColorBrush x:Key="MonoBg" Color="#ECEEF1" />
 
-  <!-- Shape: panel edges and corners, button edges, a gloss painted over every button, and how round buttons are (0.5 = pill, 0 = square). -->
-  <SolidColorBrush x:Key="PanelBorder" Color="Transparent" />
-  <Thickness x:Key="PanelBorderThickness">0</Thickness>
-  <CornerRadius x:Key="PanelRadius">0</CornerRadius>
-  <CornerRadius x:Key="RowRadius">0</CornerRadius>
-  <SolidColorBrush x:Key="ButtonBorder" Color="Transparent" />
-  <Thickness x:Key="ButtonBorderThickness">0</Thickness>
-  <SolidColorBrush x:Key="ButtonGloss" Color="Transparent" />
-  <sys:Double x:Key="ButtonCornerScale">0.5</sys:Double>
-
   <!-- Faces: TextFont for everything you read, DisplayFont for the few big things (status line, device IP, settings title). -->
   <FontFamily x:Key="TextFont">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
   <FontFamily x:Key="DisplayFont">pack://application:,,,/Assets/Fonts/#League Spartan</FontFamily>
diff --git a/src/ProDHCPServer.App/Themes/FrutigerAero.Dark.xaml b/src/ProDHCPServer.App/Themes/FrutigerAero.Dark.xaml
index 998a999..4084748 100644
--- a/src/ProDHCPServer.App/Themes/FrutigerAero.Dark.xaml
+++ b/src/ProDHCPServer.App/Themes/FrutigerAero.Dark.xaml
@@ -1,63 +1,103 @@
 <!--
-    Frutiger Aero, dark: the same glass at night, over deep sky and dark grass.
-    Every key here is read by the XAML with DynamicResource, so the set must stay complete: copy this file to make a new
-    look and change the values, not the keys. Brushes may be solid or gradients.
+    Frutiger Aero, dark: black glass widgets (the KDE 4 / Oxygen desktop) over deep teal with glowing bubbles and
+    rings; the same glossy blue buttons. Shapes are in FrutigerAero.Shapes.xaml.
 -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="Shared.xaml" />
+    <ResourceDictionary Source="FrutigerAero.Shapes.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-  <!-- Surfaces: one ground, a panel a tone step up, a raised step for the slide-over and selected rows. -->
-  <LinearGradientBrush x:Key="WindowBg" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#0B1F3A" Offset="0" />
-    <GradientStop Color="#0F3B66" Offset="0.45" />
-    <GradientStop Color="#124C6E" Offset="0.7" />
-    <GradientStop Color="#1D5A3A" Offset="1" />
-  </LinearGradientBrush>
-  <SolidColorBrush x:Key="PanelBg" Color="#2EFFFFFF" />
-  <SolidColorBrush x:Key="RaisedBg" Color="#40FFFFFF" />
+  <!-- The backdrop: deep teal, lit from the right, with glowing bubbles. Drawn at 1600x1000 and scaled to fill. -->
+  <DrawingBrush x:Key="WindowBg" Stretch="UniformToFill" Viewbox="0,0,1600,1000" ViewboxUnits="Absolute">
+    <DrawingBrush.Drawing>
+      <DrawingGroup>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><RectangleGeometry Rect="0,0,1600,1000" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+              <GradientStop Color="#041B26" Offset="0" />
+              <GradientStop Color="#0A4A5E" Offset="0.55" />
+              <GradientStop Color="#0E6E80" Offset="1" />
+            </LinearGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <!-- Glow from the lower right -->
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1350,760" RadiusX="700" RadiusY="520" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush><GradientStop Color="#9933C6E0" Offset="0" /><GradientStop Color="#0033C6E0" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <!-- Bubbles: glowing discs with a bright rim -->
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1290,250" RadiusX="300" RadiusY="300" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush GradientOrigin="0.35,0.3"><GradientStop Color="#4DB8F0FF" Offset="0" /><GradientStop Color="#0DB8F0FF" Offset="0.7" /><GradientStop Color="#59B8F0FF" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="3"><Pen.Brush><SolidColorBrush Color="#99C8F4FF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1060,720" RadiusX="190" RadiusY="190" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush GradientOrigin="0.35,0.3"><GradientStop Color="#40B8F0FF" Offset="0" /><GradientStop Color="#0DB8F0FF" Offset="0.7" /><GradientStop Color="#4DB8F0FF" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="2"><Pen.Brush><SolidColorBrush Color="#8CC8F4FF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="420,880" RadiusX="130" RadiusY="130" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush GradientOrigin="0.35,0.3"><GradientStop Color="#40B8F0FF" Offset="0" /><GradientStop Color="#0DB8F0FF" Offset="0.7" /><GradientStop Color="#4DB8F0FF" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="2"><Pen.Brush><SolidColorBrush Color="#8CC8F4FF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <!-- Rings -->
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1480,640" RadiusX="240" RadiusY="240" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Pen><Pen Thickness="14"><Pen.Brush><SolidColorBrush Color="#33C8F4FF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="760,180" RadiusX="90" RadiusY="90" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Pen><Pen Thickness="6"><Pen.Brush><SolidColorBrush Color="#59C8F4FF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+      </DrawingGroup>
+    </DrawingBrush.Drawing>
+  </DrawingBrush>
+
+  <!-- Surfaces: black glass. -->
+  <SolidColorBrush x:Key="PanelBg" Color="#B3070B0E" />
+  <SolidColorBrush x:Key="PanelBorder" Color="#66FFFFFF" />
+  <SolidColorBrush x:Key="RaisedBg" Color="#38FFFFFF" />
   <SolidColorBrush x:Key="RowHover" Color="#55FFFFFF" />
-  <SolidColorBrush x:Key="Scrim" Color="#99000A1A" />
+  <SolidColorBrush x:Key="SlideOverBg" Color="#EE070B0E" />
+  <SolidColorBrush x:Key="TopBarBg" Color="#B3000000" />
+  <SolidColorBrush x:Key="Scrim" Color="#99000A10" />
 
   <!-- Ink -->
-  <SolidColorBrush x:Key="TextPrimary" Color="#F0F8FF" />
-  <SolidColorBrush x:Key="TextSecondary" Color="#C2DAEE" />
-  <SolidColorBrush x:Key="TextMuted" Color="#93B3CC" />
+  <SolidColorBrush x:Key="TextPrimary" Color="#F4FAFF" />
+  <SolidColorBrush x:Key="TextSecondary" Color="#BFD6E6" />
+  <SolidColorBrush x:Key="TextMuted" Color="#8FB0C4" />
 
   <!-- Status colours, tuned for readability at arm's length. The Soft ones fill banners and the status field. -->
-  <SolidColorBrush x:Key="GoodBrush" Color="#5AD65A" />
-  <SolidColorBrush x:Key="WarnBrush" Color="#FFC53D" />
+  <SolidColorBrush x:Key="GoodBrush" Color="#5AE06A" />
+  <SolidColorBrush x:Key="WarnBrush" Color="#FFC247" />
   <SolidColorBrush x:Key="BadBrush" Color="#FF6B5E" />
-  <SolidColorBrush x:Key="IdleBrush" Color="#6F93B0" />
-  <SolidColorBrush x:Key="GoodSoft" Color="#5A1E6B3A" />
-  <SolidColorBrush x:Key="WarnSoft" Color="#5A6B4C0E" />
-  <SolidColorBrush x:Key="BadSoft" Color="#5A6E1F1F" />
-  <SolidColorBrush x:Key="IdleSoft" Color="#2EFFFFFF" />
+  <SolidColorBrush x:Key="IdleBrush" Color="#5A7A8C" />
+  <SolidColorBrush x:Key="GoodSoft" Color="#C20F3D1A" />
+  <SolidColorBrush x:Key="WarnSoft" Color="#C2473507" />
+  <SolidColorBrush x:Key="BadSoft" Color="#C24A1414" />
+  <SolidColorBrush x:Key="IdleSoft" Color="#B3070B0E" />
 
-  <!-- The primary action and the box for raw technical detail -->
+  <!-- The primary action: a glossy blue capsule. -->
   <LinearGradientBrush x:Key="AccentBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#63BDF5" Offset="0" />
-    <GradientStop Color="#2A86D2" Offset="0.5" />
-    <GradientStop Color="#1C6FC2" Offset="1" />
+    <GradientStop Color="#7CCBFF" Offset="0" />
+    <GradientStop Color="#2A93E6" Offset="0.5" />
+    <GradientStop Color="#0F6BC4" Offset="1" />
   </LinearGradientBrush>
   <SolidColorBrush x:Key="AccentText" Color="#FFFFFF" />
-  <SolidColorBrush x:Key="MonoBg" Color="#40051A33" />
-
-  <!-- Shape: panel edges and corners, button edges, a gloss painted over every button, and how round buttons are (0.5 = pill, 0 = square). -->
-  <SolidColorBrush x:Key="PanelBorder" Color="#55FFFFFF" />
-  <Thickness x:Key="PanelBorderThickness">1</Thickness>
-  <CornerRadius x:Key="PanelRadius">14</CornerRadius>
-  <CornerRadius x:Key="RowRadius">8</CornerRadius>
-  <SolidColorBrush x:Key="ButtonBorder" Color="#66FFFFFF" />
-  <Thickness x:Key="ButtonBorderThickness">1</Thickness>
-  <LinearGradientBrush x:Key="ButtonGloss" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#80FFFFFF" Offset="0" />
-    <GradientStop Color="#1AFFFFFF" Offset="0.5" />
-    <GradientStop Color="#00FFFFFF" Offset="0.5" />
-  </LinearGradientBrush>
-  <sys:Double x:Key="ButtonCornerScale">0.5</sys:Double>
+  <SolidColorBrush x:Key="MonoBg" Color="#80000000" />
 
-  <!-- Faces: TextFont for everything you read, DisplayFont for the few big things (status line, device IP, settings title). -->
   <FontFamily x:Key="TextFont">Segoe UI</FontFamily>
   <FontFamily x:Key="DisplayFont">Segoe UI</FontFamily>
   <FontFamily x:Key="ContentControlThemeFontFamily">Segoe UI</FontFamily>
diff --git a/src/ProDHCPServer.App/Themes/FrutigerAero.Light.xaml b/src/ProDHCPServer.App/Themes/FrutigerAero.Light.xaml
index c8082c7..96b5975 100644
--- a/src/ProDHCPServer.App/Themes/FrutigerAero.Light.xaml
+++ b/src/ProDHCPServer.App/Themes/FrutigerAero.Light.xaml
@@ -1,22 +1,79 @@
 <!--
-    Frutiger Aero, light: frosted glass panels over a sky-to-grass backdrop, glossy buttons, 2000s optimism.
-    Every key here is read by the XAML with DynamicResource, so the set must stay complete: copy this file to make a new
-    look and change the values, not the keys. Brushes may be solid or gradients.
+    Frutiger Aero, light: white glass over a sky that runs down into grass, with big soft bubbles and rings drifting
+    behind the panels; glossy blue buttons; Segoe UI (the Frutiger of Windows). Shapes are in FrutigerAero.Shapes.xaml.
 -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="Shared.xaml" />
+    <ResourceDictionary Source="FrutigerAero.Shapes.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-  <!-- Surfaces: one ground, a panel a tone step up, a raised step for the slide-over and selected rows. -->
-  <LinearGradientBrush x:Key="WindowBg" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#D6EEFB" Offset="0" />
-    <GradientStop Color="#7FC4EF" Offset="0.45" />
-    <GradientStop Color="#5FB2E6" Offset="0.7" />
-    <GradientStop Color="#9DD36A" Offset="1" />
-  </LinearGradientBrush>
-  <SolidColorBrush x:Key="PanelBg" Color="#C2FFFFFF" />
-  <SolidColorBrush x:Key="RaisedBg" Color="#E8FFFFFF" />
-  <SolidColorBrush x:Key="RowHover" Color="#F7FFFFFF" />
+  <!-- The backdrop: sky to grass, with bubbles. Drawn at 1600x1000 and scaled to fill the window. -->
+  <DrawingBrush x:Key="WindowBg" Stretch="UniformToFill" Viewbox="0,0,1600,1000" ViewboxUnits="Absolute">
+    <DrawingBrush.Drawing>
+      <DrawingGroup>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><RectangleGeometry Rect="0,0,1600,1000" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+              <GradientStop Color="#DDF1FC" Offset="0" />
+              <GradientStop Color="#8ACBF3" Offset="0.4" />
+              <GradientStop Color="#4FA9E4" Offset="0.72" />
+              <GradientStop Color="#6CBF4E" Offset="0.86" />
+              <GradientStop Color="#A9DB5B" Offset="1" />
+            </LinearGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <!-- Sun glow top left -->
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="180,80" RadiusX="520" RadiusY="420" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush><GradientStop Color="#B3FFFFFF" Offset="0" /><GradientStop Color="#00FFFFFF" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <!-- Bubbles: soft filled discs with a thin bright rim -->
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1290,250" RadiusX="300" RadiusY="300" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush GradientOrigin="0.35,0.3"><GradientStop Color="#66FFFFFF" Offset="0" /><GradientStop Color="#14FFFFFF" Offset="0.7" /><GradientStop Color="#59FFFFFF" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="3"><Pen.Brush><SolidColorBrush Color="#99FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1060,720" RadiusX="190" RadiusY="190" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush GradientOrigin="0.35,0.3"><GradientStop Color="#59FFFFFF" Offset="0" /><GradientStop Color="#0DFFFFFF" Offset="0.7" /><GradientStop Color="#4DFFFFFF" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="2"><Pen.Brush><SolidColorBrush Color="#8CFFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="420,880" RadiusX="130" RadiusY="130" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush GradientOrigin="0.35,0.3"><GradientStop Color="#59FFFFFF" Offset="0" /><GradientStop Color="#0DFFFFFF" Offset="0.7" /><GradientStop Color="#4DFFFFFF" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="2"><Pen.Brush><SolidColorBrush Color="#8CFFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <!-- Rings -->
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1480,640" RadiusX="240" RadiusY="240" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Pen><Pen Thickness="14"><Pen.Brush><SolidColorBrush Color="#40FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="760,180" RadiusX="90" RadiusY="90" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Pen><Pen Thickness="6"><Pen.Brush><SolidColorBrush Color="#59FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+      </DrawingGroup>
+    </DrawingBrush.Drawing>
+  </DrawingBrush>
+
+  <!-- Surfaces: white glass. -->
+  <SolidColorBrush x:Key="PanelBg" Color="#B8FFFFFF" />
+  <SolidColorBrush x:Key="PanelBorder" Color="#F2FFFFFF" />
+  <SolidColorBrush x:Key="RaisedBg" Color="#E6FFFFFF" />
+  <SolidColorBrush x:Key="RowHover" Color="#FFFFFFFF" />
+  <SolidColorBrush x:Key="SlideOverBg" Color="#F0F6FBFF" />
+  <SolidColorBrush x:Key="TopBarBg" Color="#8CFFFFFF" />
   <SolidColorBrush x:Key="Scrim" Color="#66143C5C" />
 
   <!-- Ink -->
@@ -25,39 +82,24 @@
   <SolidColorBrush x:Key="TextMuted" Color="#4E7390" />
 
   <!-- Status colours, tuned for readability at arm's length. The Soft ones fill banners and the status field. -->
-  <SolidColorBrush x:Key="GoodBrush" Color="#3FA92A" />
-  <SolidColorBrush x:Key="WarnBrush" Color="#E39A12" />
-  <SolidColorBrush x:Key="BadBrush" Color="#D9382C" />
+  <SolidColorBrush x:Key="GoodBrush" Color="#4DB82A" />
+  <SolidColorBrush x:Key="WarnBrush" Color="#F0A020" />
+  <SolidColorBrush x:Key="BadBrush" Color="#E2402F" />
   <SolidColorBrush x:Key="IdleBrush" Color="#8DB4CF" />
-  <SolidColorBrush x:Key="GoodSoft" Color="#E0E6F8DC" />
-  <SolidColorBrush x:Key="WarnSoft" Color="#E0FFF0C8" />
-  <SolidColorBrush x:Key="BadSoft" Color="#E0FBDADA" />
-  <SolidColorBrush x:Key="IdleSoft" Color="#C2FFFFFF" />
+  <SolidColorBrush x:Key="GoodSoft" Color="#D9E9FADF" />
+  <SolidColorBrush x:Key="WarnSoft" Color="#D9FFF1CC" />
+  <SolidColorBrush x:Key="BadSoft" Color="#D9FCDCDC" />
+  <SolidColorBrush x:Key="IdleSoft" Color="#B8FFFFFF" />
 
-  <!-- The primary action and the box for raw technical detail -->
+  <!-- The primary action: a glossy blue capsule. -->
   <LinearGradientBrush x:Key="AccentBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#6CC4F8" Offset="0" />
-    <GradientStop Color="#2E93E0" Offset="0.5" />
-    <GradientStop Color="#1E7FD3" Offset="1" />
+    <GradientStop Color="#7CCBFF" Offset="0" />
+    <GradientStop Color="#2A93E6" Offset="0.5" />
+    <GradientStop Color="#0F6BC4" Offset="1" />
   </LinearGradientBrush>
   <SolidColorBrush x:Key="AccentText" Color="#FFFFFF" />
   <SolidColorBrush x:Key="MonoBg" Color="#D9F3F9FE" />
 
-  <!-- Shape: panel edges and corners, button edges, a gloss painted over every button, and how round buttons are (0.5 = pill, 0 = square). -->
-  <SolidColorBrush x:Key="PanelBorder" Color="#DDFFFFFF" />
-  <Thickness x:Key="PanelBorderThickness">1</Thickness>
-  <CornerRadius x:Key="PanelRadius">14</CornerRadius>
-  <CornerRadius x:Key="RowRadius">8</CornerRadius>
-  <SolidColorBrush x:Key="ButtonBorder" Color="#A0FFFFFF" />
-  <Thickness x:Key="ButtonBorderThickness">1</Thickness>
-  <LinearGradientBrush x:Key="ButtonGloss" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#A6FFFFFF" Offset="0" />
-    <GradientStop Color="#33FFFFFF" Offset="0.5" />
-    <GradientStop Color="#00FFFFFF" Offset="0.5" />
-  </LinearGradientBrush>
-  <sys:Double x:Key="ButtonCornerScale">0.5</sys:Double>
-
-  <!-- Faces: TextFont for everything you read, DisplayFont for the few big things (status line, device IP, settings title). -->
   <FontFamily x:Key="TextFont">Segoe UI</FontFamily>
   <FontFamily x:Key="DisplayFont">Segoe UI</FontFamily>
   <FontFamily x:Key="ContentControlThemeFontFamily">Segoe UI</FontFamily>
diff --git a/src/ProDHCPServer.App/Themes/FrutigerAero.Shapes.xaml b/src/ProDHCPServer.App/Themes/FrutigerAero.Shapes.xaml
new file mode 100644
index 0000000..6c35dbb
--- /dev/null
+++ b/src/ProDHCPServer.App/Themes/FrutigerAero.Shapes.xaml
@@ -0,0 +1,75 @@
+<!--
+    Frutiger Aero: the shapes. Glass panels with a hard-edged gloss band across the top (the 2000s desktop-widget
+    look), glossy capsule buttons, orb status lights, and a glass bar behind the top controls. Colours come from the
+    Dark and Light files, which merge this after Shared.xaml.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+
+  <CornerRadius x:Key="PanelRadius">18</CornerRadius>
+  <CornerRadius x:Key="RowRadius">10</CornerRadius>
+  <Thickness x:Key="PanelBorderThickness">1</Thickness>
+  <Thickness x:Key="SlideOverBorderThickness">1,0,0,0</Thickness>
+  <Thickness x:Key="TopBarPadding">12,8</Thickness>
+
+  <!-- Buttons: fully round, a light edge, and a gloss that stops dead at the middle: the glass look. -->
+  <sys:Double x:Key="ButtonCornerScale">0.5</sys:Double>
+  <Thickness x:Key="ButtonBorderThickness">1</Thickness>
+  <SolidColorBrush x:Key="ButtonBorder" Color="#99FFFFFF" />
+  <LinearGradientBrush x:Key="ButtonGloss" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#C2FFFFFF" Offset="0" />
+    <GradientStop Color="#4DFFFFFF" Offset="0.5" />
+    <GradientStop Color="#00FFFFFF" Offset="0.5" />
+    <GradientStop Color="#1AFFFFFF" Offset="1" />
+  </LinearGradientBrush>
+
+  <!-- The same gloss band, wider and softer, across the top of every panel. -->
+  <LinearGradientBrush x:Key="PanelGloss" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#8CFFFFFF" Offset="0" />
+    <GradientStop Color="#33FFFFFF" Offset="0.4" />
+    <GradientStop Color="#00FFFFFF" Offset="0.4" />
+  </LinearGradientBrush>
+
+  <!-- Status lights become orbs: a specular spot up and to the left, a darker rim at the bottom. -->
+  <RadialGradientBrush x:Key="LightGloss" GradientOrigin="0.3,0.25" Center="0.4,0.4" RadiusX="0.6" RadiusY="0.6">
+    <GradientStop Color="#D9FFFFFF" Offset="0" />
+    <GradientStop Color="#40FFFFFF" Offset="0.45" />
+    <GradientStop Color="#00FFFFFF" Offset="0.8" />
+    <GradientStop Color="#33000000" Offset="1" />
+  </RadialGradientBrush>
+
+  <Style x:Key="Panel" TargetType="ContentControl">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="IsTabStop" Value="False" />
+    <Setter Property="Padding" Value="24" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ContentControl">
+          <Grid>
+            <Border Background="{DynamicResource PanelBg}" BorderBrush="{DynamicResource PanelBorder}" BorderThickness="1" CornerRadius="18" />
+            <Border Background="{DynamicResource PanelGloss}" CornerRadius="18" Margin="1" IsHitTestVisible="False" />
+            <ContentPresenter Margin="{TemplateBinding Padding}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style x:Key="StatusField" TargetType="ContentControl">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="IsTabStop" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ContentControl">
+          <Grid>
+            <Border Background="{TemplateBinding Background}" BorderBrush="{DynamicResource PanelBorder}" BorderThickness="1" CornerRadius="18" ClipToBounds="True">
+              <ContentPresenter />
+            </Border>
+            <Border Background="{DynamicResource PanelGloss}" CornerRadius="18" Margin="1" IsHitTestVisible="False" />
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+</ResourceDictionary>
diff --git a/src/ProDHCPServer.App/Themes/MetalHeart.Dark.xaml b/src/ProDHCPServer.App/Themes/MetalHeart.Dark.xaml
index 02bbeb7..6d66fa0 100644
--- a/src/ProDHCPServer.App/Themes/MetalHeart.Dark.xaml
+++ b/src/ProDHCPServer.App/Themes/MetalHeart.Dark.xaml
@@ -1,74 +1,98 @@
 <!--
-    Metal Heart, dark: brushed steel plates with bevelled edges and a chrome-red primary button.
-    Every key here is read by the XAML with DynamicResource, so the set must stay complete: copy this file to make a new
-    look and change the values, not the keys. Brushes may be solid or gradients.
+    Metal Heart, dark: gunmetal plates on a dark brushed-steel backdrop lit by an electric-blue glow, with an acid-green
+    chrome primary button and Orbitron for the big type (the Winamp and Sonique skin era). Shapes are in
+    MetalHeart.Shapes.xaml.
 -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="Shared.xaml" />
+    <ResourceDictionary Source="MetalHeart.Shapes.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-  <!-- Surfaces: one ground, a panel a tone step up, a raised step for the slide-over and selected rows. -->
-  <LinearGradientBrush x:Key="WindowBg" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#26292E" Offset="0" />
-    <GradientStop Color="#17191C" Offset="0.5" />
-    <GradientStop Color="#2A2E33" Offset="1" />
-  </LinearGradientBrush>
+  <!-- The backdrop: dark steel with a blue glow at top right and a green one at bottom left, under the brushed grain. -->
+  <DrawingBrush x:Key="WindowBg" Stretch="UniformToFill" Viewbox="0,0,1600,1000" ViewboxUnits="Absolute">
+    <DrawingBrush.Drawing>
+      <DrawingGroup>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><RectangleGeometry Rect="0,0,1600,1000" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+              <GradientStop Color="#2A2E35" Offset="0" />
+              <GradientStop Color="#0E1013" Offset="0.5" />
+              <GradientStop Color="#1E2126" Offset="1" />
+            </LinearGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1400,120" RadiusX="900" RadiusY="600" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush><GradientStop Color="#802E8CFF" Offset="0" /><GradientStop Color="#002E8CFF" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="150,950" RadiusX="700" RadiusY="450" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush><GradientStop Color="#5A7CFF2A" Offset="0" /><GradientStop Color="#007CFF2A" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <!-- A couple of chrome rails across the backdrop -->
+        <GeometryDrawing Geometry="M0,300 H1600 V306 H0 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1"><GradientStop Color="#66FFFFFF" Offset="0" /><GradientStop Color="#1AFFFFFF" Offset="0.5" /><GradientStop Color="#99000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M0,700 H1600 V706 H0 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1"><GradientStop Color="#66FFFFFF" Offset="0" /><GradientStop Color="#1AFFFFFF" Offset="0.5" /><GradientStop Color="#99000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M0,0 H1600 V1000 H0 Z" Brush="{StaticResource BrushedGrain}" />
+      </DrawingGroup>
+    </DrawingBrush.Drawing>
+  </DrawingBrush>
+
+  <!-- Surfaces: gunmetal. -->
   <LinearGradientBrush x:Key="PanelBg" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#2E3238" Offset="0" />
+    <GradientStop Color="#363B43" Offset="0" />
+    <GradientStop Color="#1C1F24" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush x:Key="PanelBorder" Color="#7A818A" />
+  <SolidColorBrush x:Key="RaisedBg" Color="#3F454E" />
+  <SolidColorBrush x:Key="RowHover" Color="#4F5660" />
+  <SolidColorBrush x:Key="SlideOverBg" Color="#24282E" />
+  <LinearGradientBrush x:Key="TopBarBg" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#6B737D" Offset="0" />
+    <GradientStop Color="#3A3F46" Offset="0.5" />
     <GradientStop Color="#1E2126" Offset="1" />
   </LinearGradientBrush>
-  <SolidColorBrush x:Key="RaisedBg" Color="#3B4048" />
-  <SolidColorBrush x:Key="RowHover" Color="#4A5059" />
-  <SolidColorBrush x:Key="Scrim" Color="#B3000000" />
+  <SolidColorBrush x:Key="Scrim" Color="#BF000000" />
 
   <!-- Ink -->
-  <SolidColorBrush x:Key="TextPrimary" Color="#E9ECEF" />
-  <SolidColorBrush x:Key="TextSecondary" Color="#AEB5BE" />
-  <SolidColorBrush x:Key="TextMuted" Color="#7F8791" />
+  <SolidColorBrush x:Key="TextPrimary" Color="#EEF1F5" />
+  <SolidColorBrush x:Key="TextSecondary" Color="#B4BCC6" />
+  <SolidColorBrush x:Key="TextMuted" Color="#858E98" />
 
-  <!-- Status colours, tuned for readability at arm's length. The Soft ones fill banners and the status field. -->
-  <SolidColorBrush x:Key="GoodBrush" Color="#41D15F" />
-  <SolidColorBrush x:Key="WarnBrush" Color="#F5B531" />
-  <SolidColorBrush x:Key="BadBrush" Color="#FF4A4A" />
-  <SolidColorBrush x:Key="IdleBrush" Color="#596069" />
-  <SolidColorBrush x:Key="GoodSoft" Color="#16301D" />
-  <SolidColorBrush x:Key="WarnSoft" Color="#33290C" />
-  <SolidColorBrush x:Key="BadSoft" Color="#3D1414" />
-  <SolidColorBrush x:Key="IdleSoft" Color="#1E2126" />
+  <!-- Status colours: acid green for good. The Soft ones fill banners and the status field. -->
+  <SolidColorBrush x:Key="GoodBrush" Color="#9BFF3C" />
+  <SolidColorBrush x:Key="WarnBrush" Color="#FFC53D" />
+  <SolidColorBrush x:Key="BadBrush" Color="#FF4D4D" />
+  <SolidColorBrush x:Key="IdleBrush" Color="#5A626C" />
+  <SolidColorBrush x:Key="GoodSoft" Color="#233A12" />
+  <SolidColorBrush x:Key="WarnSoft" Color="#3A2E0E" />
+  <SolidColorBrush x:Key="BadSoft" Color="#421616" />
+  <SolidColorBrush x:Key="IdleSoft" Color="#24282E" />
 
-  <!-- The primary action and the box for raw technical detail -->
+  <!-- The primary action: acid-green chrome with dark lettering. -->
   <LinearGradientBrush x:Key="AccentBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#FF5050" Offset="0" />
-    <GradientStop Color="#C21414" Offset="0.5" />
-    <GradientStop Color="#8E0B0B" Offset="1" />
-  </LinearGradientBrush>
-  <SolidColorBrush x:Key="AccentText" Color="#FFFFFF" />
-  <SolidColorBrush x:Key="MonoBg" Color="#121417" />
-
-  <!-- Shape: panel edges and corners, button edges, a gloss painted over every button, and how round buttons are (0.5 = pill, 0 = square). -->
-  <LinearGradientBrush x:Key="PanelBorder" StartPoint="0,0" EndPoint="1,1">
-    <GradientStop Color="#7D838C" Offset="0" />
-    <GradientStop Color="#2A2D31" Offset="0.5" />
-    <GradientStop Color="#050506" Offset="1" />
-  </LinearGradientBrush>
-  <Thickness x:Key="PanelBorderThickness">1</Thickness>
-  <CornerRadius x:Key="PanelRadius">2</CornerRadius>
-  <CornerRadius x:Key="RowRadius">2</CornerRadius>
-  <LinearGradientBrush x:Key="ButtonBorder" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#9DA3AB" Offset="0" />
-    <GradientStop Color="#0C0D0F" Offset="1" />
-  </LinearGradientBrush>
-  <Thickness x:Key="ButtonBorderThickness">1</Thickness>
-  <LinearGradientBrush x:Key="ButtonGloss" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#59FFFFFF" Offset="0" />
-    <GradientStop Color="#14FFFFFF" Offset="0.45" />
-    <GradientStop Color="#00000000" Offset="0.5" />
-    <GradientStop Color="#26000000" Offset="1" />
+    <GradientStop Color="#DDFF6A" Offset="0" />
+    <GradientStop Color="#8FE51E" Offset="0.5" />
+    <GradientStop Color="#4C9E08" Offset="1" />
   </LinearGradientBrush>
-  <sys:Double x:Key="ButtonCornerScale">0.12</sys:Double>
+  <SolidColorBrush x:Key="AccentText" Color="#0B1A02" />
+  <SolidColorBrush x:Key="MonoBg" Color="#0F1114" />
 
-  <!-- Faces: TextFont for everything you read, DisplayFont for the few big things (status line, device IP, settings title). -->
   <FontFamily x:Key="TextFont">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
-  <FontFamily x:Key="DisplayFont">Bahnschrift, Impact, Segoe UI</FontFamily>
+  <FontFamily x:Key="DisplayFont">pack://application:,,,/Assets/Fonts/#Orbitron</FontFamily>
   <FontFamily x:Key="ContentControlThemeFontFamily">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
 </ResourceDictionary>
diff --git a/src/ProDHCPServer.App/Themes/MetalHeart.Light.xaml b/src/ProDHCPServer.App/Themes/MetalHeart.Light.xaml
index dd215b9..d292d28 100644
--- a/src/ProDHCPServer.App/Themes/MetalHeart.Light.xaml
+++ b/src/ProDHCPServer.App/Themes/MetalHeart.Light.xaml
@@ -1,74 +1,96 @@
 <!--
-    Metal Heart, light: polished silver plates with bevelled edges and a chrome-red primary button.
-    Every key here is read by the XAML with DynamicResource, so the set must stay complete: copy this file to make a new
-    look and change the values, not the keys. Brushes may be solid or gradients.
+    Metal Heart, light: polished silver plates on a brushed-chrome backdrop with a blue glow, the same acid-green
+    primary button and Orbitron for the big type. Shapes are in MetalHeart.Shapes.xaml.
 -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="Shared.xaml" />
+    <ResourceDictionary Source="MetalHeart.Shapes.xaml" />
+  </ResourceDictionary.MergedDictionaries>
 
-  <!-- Surfaces: one ground, a panel a tone step up, a raised step for the slide-over and selected rows. -->
-  <LinearGradientBrush x:Key="WindowBg" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#E9EBEF" Offset="0" />
-    <GradientStop Color="#C9CDD4" Offset="0.5" />
-    <GradientStop Color="#EDEFF2" Offset="1" />
-  </LinearGradientBrush>
+  <!-- The backdrop: brushed chrome with a blue glow at top right, under the brushed grain. -->
+  <DrawingBrush x:Key="WindowBg" Stretch="UniformToFill" Viewbox="0,0,1600,1000" ViewboxUnits="Absolute">
+    <DrawingBrush.Drawing>
+      <DrawingGroup>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><RectangleGeometry Rect="0,0,1600,1000" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+              <GradientStop Color="#F2F4F7" Offset="0" />
+              <GradientStop Color="#B8BEC7" Offset="0.5" />
+              <GradientStop Color="#E3E6EB" Offset="1" />
+            </LinearGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1400,120" RadiusX="900" RadiusY="600" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush><GradientStop Color="#664A9CFF" Offset="0" /><GradientStop Color="#004A9CFF" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="150,950" RadiusX="700" RadiusY="450" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush><GradientStop Color="#4D8FE02A" Offset="0" /><GradientStop Color="#008FE02A" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M0,300 H1600 V306 H0 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1"><GradientStop Color="#CCFFFFFF" Offset="0" /><GradientStop Color="#33FFFFFF" Offset="0.5" /><GradientStop Color="#66000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M0,700 H1600 V706 H0 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1"><GradientStop Color="#CCFFFFFF" Offset="0" /><GradientStop Color="#33FFFFFF" Offset="0.5" /><GradientStop Color="#66000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M0,0 H1600 V1000 H0 Z" Brush="{StaticResource BrushedGrain}" />
+      </DrawingGroup>
+    </DrawingBrush.Drawing>
+  </DrawingBrush>
+
+  <!-- Surfaces: polished silver. -->
   <LinearGradientBrush x:Key="PanelBg" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#F8F9FA" Offset="0" />
-    <GradientStop Color="#DCDFE4" Offset="1" />
+    <GradientStop Color="#F7F8FA" Offset="0" />
+    <GradientStop Color="#D3D8DF" Offset="1" />
   </LinearGradientBrush>
+  <SolidColorBrush x:Key="PanelBorder" Color="#8A919B" />
   <SolidColorBrush x:Key="RaisedBg" Color="#FFFFFF" />
-  <SolidColorBrush x:Key="RowHover" Color="#EEF0F3" />
-  <SolidColorBrush x:Key="Scrim" Color="#66000000" />
+  <SolidColorBrush x:Key="RowHover" Color="#E6E9EE" />
+  <SolidColorBrush x:Key="SlideOverBg" Color="#EDF0F3" />
+  <LinearGradientBrush x:Key="TopBarBg" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#FFFFFF" Offset="0" />
+    <GradientStop Color="#C9CFD7" Offset="0.5" />
+    <GradientStop Color="#A3ABB5" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush x:Key="Scrim" Color="#73000000" />
 
   <!-- Ink -->
   <SolidColorBrush x:Key="TextPrimary" Color="#14171B" />
   <SolidColorBrush x:Key="TextSecondary" Color="#474D55" />
-  <SolidColorBrush x:Key="TextMuted" Color="#697079" />
+  <SolidColorBrush x:Key="TextMuted" Color="#656C75" />
 
-  <!-- Status colours, tuned for readability at arm's length. The Soft ones fill banners and the status field. -->
-  <SolidColorBrush x:Key="GoodBrush" Color="#1B8A3A" />
+  <!-- Status colours. The Soft ones fill banners and the status field. -->
+  <SolidColorBrush x:Key="GoodBrush" Color="#3E9A0C" />
   <SolidColorBrush x:Key="WarnBrush" Color="#B36D00" />
   <SolidColorBrush x:Key="BadBrush" Color="#C8201F" />
   <SolidColorBrush x:Key="IdleBrush" Color="#A6ACB4" />
-  <SolidColorBrush x:Key="GoodSoft" Color="#D7F1DC" />
+  <SolidColorBrush x:Key="GoodSoft" Color="#DDF5C8" />
   <SolidColorBrush x:Key="WarnSoft" Color="#FBEBC9" />
   <SolidColorBrush x:Key="BadSoft" Color="#F8D9D8" />
-  <SolidColorBrush x:Key="IdleSoft" Color="#DCDFE4" />
+  <SolidColorBrush x:Key="IdleSoft" Color="#E3E6EB" />
 
-  <!-- The primary action and the box for raw technical detail -->
+  <!-- The primary action: acid-green chrome with dark lettering. -->
   <LinearGradientBrush x:Key="AccentBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#FF5050" Offset="0" />
-    <GradientStop Color="#C21414" Offset="0.5" />
-    <GradientStop Color="#8E0B0B" Offset="1" />
+    <GradientStop Color="#DDFF6A" Offset="0" />
+    <GradientStop Color="#8FE51E" Offset="0.5" />
+    <GradientStop Color="#4C9E08" Offset="1" />
   </LinearGradientBrush>
-  <SolidColorBrush x:Key="AccentText" Color="#FFFFFF" />
+  <SolidColorBrush x:Key="AccentText" Color="#0B1A02" />
   <SolidColorBrush x:Key="MonoBg" Color="#E4E7EB" />
 
-  <!-- Shape: panel edges and corners, button edges, a gloss painted over every button, and how round buttons are (0.5 = pill, 0 = square). -->
-  <LinearGradientBrush x:Key="PanelBorder" StartPoint="0,0" EndPoint="1,1">
-    <GradientStop Color="#FFFFFF" Offset="0" />
-    <GradientStop Color="#B9BEC6" Offset="0.5" />
-    <GradientStop Color="#7D848D" Offset="1" />
-  </LinearGradientBrush>
-  <Thickness x:Key="PanelBorderThickness">1</Thickness>
-  <CornerRadius x:Key="PanelRadius">2</CornerRadius>
-  <CornerRadius x:Key="RowRadius">2</CornerRadius>
-  <LinearGradientBrush x:Key="ButtonBorder" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#FFFFFF" Offset="0" />
-    <GradientStop Color="#8E959E" Offset="1" />
-  </LinearGradientBrush>
-  <Thickness x:Key="ButtonBorderThickness">1</Thickness>
-  <LinearGradientBrush x:Key="ButtonGloss" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#8CFFFFFF" Offset="0" />
-    <GradientStop Color="#26FFFFFF" Offset="0.45" />
-    <GradientStop Color="#00000000" Offset="0.5" />
-    <GradientStop Color="#14000000" Offset="1" />
-  </LinearGradientBrush>
-  <sys:Double x:Key="ButtonCornerScale">0.12</sys:Double>
-
-  <!-- Faces: TextFont for everything you read, DisplayFont for the few big things (status line, device IP, settings title). -->
   <FontFamily x:Key="TextFont">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
-  <FontFamily x:Key="DisplayFont">Bahnschrift, Impact, Segoe UI</FontFamily>
+  <FontFamily x:Key="DisplayFont">pack://application:,,,/Assets/Fonts/#Orbitron</FontFamily>
   <FontFamily x:Key="ContentControlThemeFontFamily">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
 </ResourceDictionary>
diff --git a/src/ProDHCPServer.App/Themes/MetalHeart.Shapes.xaml b/src/ProDHCPServer.App/Themes/MetalHeart.Shapes.xaml
new file mode 100644
index 0000000..f2dec11
--- /dev/null
+++ b/src/ProDHCPServer.App/Themes/MetalHeart.Shapes.xaml
@@ -0,0 +1,127 @@
+<!--
+    Metal Heart: the shapes. Steel plates with a bevelled chrome edge and a rivet in each corner, a brushed-metal grain
+    over every surface, chrome buttons with a hard highlight, lens status lights, and a chrome strip behind the top
+    controls. Colours come from the Dark and Light files, which merge this after Shared.xaml.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+
+  <CornerRadius x:Key="PanelRadius">6</CornerRadius>
+  <CornerRadius x:Key="RowRadius">3</CornerRadius>
+  <Thickness x:Key="PanelBorderThickness">1</Thickness>
+  <Thickness x:Key="SlideOverBorderThickness">2,0,0,0</Thickness>
+  <Thickness x:Key="TopBarPadding">12,8</Thickness>
+
+  <!-- Buttons: nearly square plates, a bevel (light on top, dark below) and a chrome highlight that stops at the middle. -->
+  <sys:Double x:Key="ButtonCornerScale">0.18</sys:Double>
+  <Thickness x:Key="ButtonBorderThickness">1</Thickness>
+  <LinearGradientBrush x:Key="ButtonBorder" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#F2FFFFFF" Offset="0" />
+    <GradientStop Color="#66FFFFFF" Offset="0.5" />
+    <GradientStop Color="#CC000000" Offset="1" />
+  </LinearGradientBrush>
+  <LinearGradientBrush x:Key="ButtonGloss" StartPoint="0,0" EndPoint="0,1">
+    <GradientStop Color="#99FFFFFF" Offset="0" />
+    <GradientStop Color="#33FFFFFF" Offset="0.48" />
+    <GradientStop Color="#26000000" Offset="0.52" />
+    <GradientStop Color="#59000000" Offset="1" />
+  </LinearGradientBrush>
+
+  <!-- Brushed grain: fine horizontal lines, tiled over the plates. -->
+  <DrawingBrush x:Key="BrushedGrain" TileMode="Tile" Viewport="0,0,4,4" ViewportUnits="Absolute" Viewbox="0,0,4,4" ViewboxUnits="Absolute" Opacity="0.7">
+    <DrawingBrush.Drawing>
+      <DrawingGroup>
+        <GeometryDrawing Geometry="M0,0 H4 V1 H0 Z"><GeometryDrawing.Brush><SolidColorBrush Color="#12FFFFFF" /></GeometryDrawing.Brush></GeometryDrawing>
+        <GeometryDrawing Geometry="M0,2 H4 V3 H0 Z"><GeometryDrawing.Brush><SolidColorBrush Color="#1F000000" /></GeometryDrawing.Brush></GeometryDrawing>
+      </DrawingGroup>
+    </DrawingBrush.Drawing>
+  </DrawingBrush>
+
+  <!-- The bevel around a plate: lit from the top left. -->
+  <LinearGradientBrush x:Key="Bevel" StartPoint="0,0" EndPoint="1,1">
+    <GradientStop Color="#F4F7FA" Offset="0" />
+    <GradientStop Color="#9AA2AC" Offset="0.35" />
+    <GradientStop Color="#3C4249" Offset="0.65" />
+    <GradientStop Color="#07080A" Offset="1" />
+  </LinearGradientBrush>
+
+  <!-- A rivet: a chrome dome. -->
+  <RadialGradientBrush x:Key="Rivet" GradientOrigin="0.3,0.3" Center="0.45,0.45" RadiusX="0.6" RadiusY="0.6">
+    <GradientStop Color="#FFFFFF" Offset="0" />
+    <GradientStop Color="#B5BCC5" Offset="0.45" />
+    <GradientStop Color="#4A5058" Offset="0.85" />
+    <GradientStop Color="#0A0B0D" Offset="1" />
+  </RadialGradientBrush>
+
+  <!-- Status lights become lenses: a bright spot, a dark rim. -->
+  <RadialGradientBrush x:Key="LightGloss" GradientOrigin="0.32,0.28" Center="0.45,0.45" RadiusX="0.62" RadiusY="0.62">
+    <GradientStop Color="#C2FFFFFF" Offset="0" />
+    <GradientStop Color="#26FFFFFF" Offset="0.4" />
+    <GradientStop Color="#00000000" Offset="0.75" />
+    <GradientStop Color="#66000000" Offset="1" />
+  </RadialGradientBrush>
+
+  <!-- A plate: bevel, inner shadow line, grain, rivets. -->
+  <ControlTemplate x:Key="PlateTemplate" TargetType="ContentControl">
+    <Grid>
+      <Border Background="{DynamicResource PanelBg}" BorderBrush="{DynamicResource Bevel}" BorderThickness="2" CornerRadius="6" />
+      <Border Background="{DynamicResource BrushedGrain}" Margin="2" CornerRadius="4" IsHitTestVisible="False" />
+      <Border BorderBrush="#99000000" BorderThickness="1" Margin="2" CornerRadius="4" IsHitTestVisible="False" />
+      <Ellipse Width="9" Height="9" Fill="{DynamicResource Rivet}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="7" IsHitTestVisible="False" />
+      <Ellipse Width="9" Height="9" Fill="{DynamicResource Rivet}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="7" IsHitTestVisible="False" />
+      <Ellipse Width="9" Height="9" Fill="{DynamicResource Rivet}" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="7" IsHitTestVisible="False" />
+      <Ellipse Width="9" Height="9" Fill="{DynamicResource Rivet}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="7" IsHitTestVisible="False" />
+      <ContentPresenter Margin="{TemplateBinding Padding}" />
+    </Grid>
+  </ControlTemplate>
+
+  <Style x:Key="Panel" TargetType="ContentControl">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="IsTabStop" Value="False" />
+    <Setter Property="Padding" Value="24" />
+    <Setter Property="Template" Value="{StaticResource PlateTemplate}" />
+  </Style>
+
+  <!-- The status field is a plate too, filled with the state's colour and clipped so the big light stays inside. -->
+  <Style x:Key="StatusField" TargetType="ContentControl">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="IsTabStop" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ContentControl">
+          <Grid>
+            <Border Background="{TemplateBinding Background}" BorderBrush="{DynamicResource Bevel}" BorderThickness="2" CornerRadius="6" ClipToBounds="True">
+              <ContentPresenter />
+            </Border>
+            <Border Background="{DynamicResource BrushedGrain}" Margin="2" CornerRadius="4" IsHitTestVisible="False" />
+            <Border BorderBrush="#99000000" BorderThickness="1" Margin="2" CornerRadius="4" IsHitTestVisible="False" />
+            <Ellipse Width="9" Height="9" Fill="{DynamicResource Rivet}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="7" IsHitTestVisible="False" />
+            <Ellipse Width="9" Height="9" Fill="{DynamicResource Rivet}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="7" IsHitTestVisible="False" />
+            <Ellipse Width="9" Height="9" Fill="{DynamicResource Rivet}" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="7" IsHitTestVisible="False" />
+            <Ellipse Width="9" Height="9" Fill="{DynamicResource Rivet}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="7" IsHitTestVisible="False" />
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!-- The top bar is a chrome strip with the same bevel. -->
+  <Style x:Key="TopBar" TargetType="Border">
+    <Setter Property="Background" Value="{DynamicResource TopBarBg}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource Bevel}" />
+    <Setter Property="BorderThickness" Value="2" />
+    <Setter Property="Padding" Value="{DynamicResource TopBarPadding}" />
+    <Setter Property="CornerRadius" Value="6" />
+    <Setter Property="Margin" Value="0,0,0,16" />
+  </Style>
+
+  <!-- Banners get the bevel too. -->
+  <Style x:Key="Banner" TargetType="Border">
+    <Setter Property="BorderBrush" Value="{DynamicResource Bevel}" />
+    <Setter Property="BorderThickness" Value="2" />
+    <Setter Property="CornerRadius" Value="6" />
+    <Setter Property="Padding" Value="24,16" />
+    <Setter Property="Margin" Value="0,0,0,16" />
+  </Style>
+</ResourceDictionary>
diff --git a/src/ProDHCPServer.App/Themes/Shared.xaml b/src/ProDHCPServer.App/Themes/Shared.xaml
new file mode 100644
index 0000000..1025258
--- /dev/null
+++ b/src/ProDHCPServer.App/Themes/Shared.xaml
@@ -0,0 +1,242 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+                    xmlns:local="clr-namespace:ProDHCPServer.App">
+  <!--
+      What every look shares: the type scale, text styles, and the default (rack faceplate) shapes for panels, banners
+      and buttons. A look's own files merge this first, then put their colours, fonts and backdrop on top, and may
+      replace any of the shape styles below with their own templates. Everything that can differ between looks is read
+      with DynamicResource so switching looks repaints the window live.
+  -->
+  <FontFamily x:Key="MonoFont">Cascadia Mono, Consolas, Courier New</FontFamily>
+  <FontFamily x:Key="IconFont">Segoe Fluent Icons, Segoe MDL2 Assets</FontFamily>
+
+  <!-- Five sizes: small, body, lead, head, display. Nothing below 13. -->
+  <sys:Double x:Key="TextSmall">13</sys:Double>
+  <sys:Double x:Key="TextBody">16</sys:Double>
+  <sys:Double x:Key="TextLead">20</sys:Double>
+  <sys:Double x:Key="TextHead">40</sys:Double>
+  <sys:Double x:Key="TextDisplay">64</sys:Double>
+
+  <!-- Shape tokens the default templates read. A look can change these, or replace the templates outright. -->
+  <SolidColorBrush x:Key="PanelBorder" Color="Transparent" />
+  <Thickness x:Key="PanelBorderThickness">0</Thickness>
+  <CornerRadius x:Key="PanelRadius">0</CornerRadius>
+  <CornerRadius x:Key="RowRadius">0</CornerRadius>
+  <SolidColorBrush x:Key="ButtonBorder" Color="Transparent" />
+  <Thickness x:Key="ButtonBorderThickness">0</Thickness>
+  <SolidColorBrush x:Key="ButtonGloss" Color="Transparent" />
+  <sys:Double x:Key="ButtonCornerScale">0.5</sys:Double>
+  <!-- Painted over every status light (the big one in the status field and the one on each check); a specular spot in glossy looks. -->
+  <SolidColorBrush x:Key="LightGloss" Color="Transparent" />
+  <!-- The strip behind the adapter/profile pickers and Start: nothing in the faceplate look, a bar in others. -->
+  <SolidColorBrush x:Key="TopBarBg" Color="Transparent" />
+  <Thickness x:Key="TopBarPadding">0</Thickness>
+  <!-- The settings slide-over's edge (its fill, SlideOverBg, is a colour so each look sets it). -->
+  <Thickness x:Key="SlideOverBorderThickness">0</Thickness>
+
+  <!-- Panels are a tone step above the ground. A ContentControl so a look can give it any chrome it likes. -->
+  <Style x:Key="Panel" TargetType="ContentControl">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="IsTabStop" Value="False" />
+    <Setter Property="Padding" Value="24" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ContentControl">
+          <Border Background="{DynamicResource PanelBg}" BorderBrush="{DynamicResource PanelBorder}" BorderThickness="{DynamicResource PanelBorderThickness}"
+                  CornerRadius="{DynamicResource PanelRadius}" Padding="{TemplateBinding Padding}">
+            <ContentPresenter />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!-- The status field: a whole field of the state's soft colour (set as Background), with the giant light inside. -->
+  <Style x:Key="StatusField" TargetType="ContentControl">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="IsTabStop" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ContentControl">
+          <Border Background="{TemplateBinding Background}" BorderBrush="{DynamicResource PanelBorder}" BorderThickness="{DynamicResource PanelBorderThickness}"
+                  CornerRadius="{DynamicResource PanelRadius}" ClipToBounds="True">
+            <ContentPresenter />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <!-- The top bar: adapter and profile pickers, refresh, settings, Start. -->
+  <Style x:Key="TopBar" TargetType="Border">
+    <Setter Property="Background" Value="{DynamicResource TopBarBg}" />
+    <Setter Property="Padding" Value="{DynamicResource TopBarPadding}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource PanelRadius}" />
+    <Setter Property="Margin" Value="0,0,0,16" />
+  </Style>
+
+  <!-- Status banners: a whole field of the state's soft colour. -->
+  <Style x:Key="Banner" TargetType="Border">
+    <Setter Property="BorderBrush" Value="{DynamicResource PanelBorder}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource PanelBorderThickness}" />
+    <Setter Property="CornerRadius" Value="{DynamicResource PanelRadius}" />
+    <Setter Property="Padding" Value="24,16" />
+    <Setter Property="Margin" Value="0,0,0,16" />
+  </Style>
+
+  <Style x:Key="SectionTitle" TargetType="TextBlock">
+      <Setter Property="FontSize" Value="{StaticResource TextLead}" />
+      <Setter Property="FontWeight" Value="SemiBold" />
+      <Setter Property="Foreground" Value="{DynamicResource TextPrimary}" />
+  </Style>
+
+  <Style x:Key="Primary" TargetType="TextBlock">
+      <Setter Property="Foreground" Value="{DynamicResource TextPrimary}" />
+      <Setter Property="TextWrapping" Value="Wrap" />
+  </Style>
+
+  <Style x:Key="Secondary" TargetType="TextBlock">
+      <Setter Property="Foreground" Value="{DynamicResource TextSecondary}" />
+      <Setter Property="TextWrapping" Value="Wrap" />
+  </Style>
+
+  <Style x:Key="Meta" TargetType="TextBlock">
+      <Setter Property="FontSize" Value="{StaticResource TextSmall}" />
+      <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
+  </Style>
+
+  <!-- Raw technical detail (packets, exceptions): the one place monospace belongs. -->
+  <Style x:Key="MonoBox" TargetType="TextBox">
+      <Setter Property="FontFamily" Value="{StaticResource MonoFont}" />
+      <Setter Property="FontSize" Value="{StaticResource TextSmall}" />
+      <Setter Property="IsReadOnly" Value="True" />
+      <Setter Property="TextWrapping" Value="Wrap" />
+      <Setter Property="MaxHeight" Value="224" />
+      <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="Background" Value="{DynamicResource MonoBg}" />
+      <Setter Property="Foreground" Value="{DynamicResource TextSecondary}" />
+      <Setter Property="BorderThickness" Value="0" />
+  </Style>
+
+  <!--
+      Buttons: one fill, with an edge and a gloss the look paints over it (both transparent in the faceplate look) and
+      corners the look sets from fully round to nearly square. Hover and press tint the fill with its own text colour;
+      keyboard focus draws a ring in the ink colour outside the button.
+  -->
+  <Style x:Key="PillButton" TargetType="Button">
+      <Setter Property="Background" Value="{DynamicResource RaisedBg}" />
+      <Setter Property="Foreground" Value="{DynamicResource TextPrimary}" />
+      <Setter Property="FontFamily" Value="{DynamicResource TextFont}" />
+      <Setter Property="FontSize" Value="{StaticResource TextBody}" />
+      <Setter Property="FontWeight" Value="Medium" />
+      <Setter Property="Padding" Value="20,0" />
+      <Setter Property="MinHeight" Value="40" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="Cursor" Value="Hand" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="ToolTipService.ShowOnDisabled" Value="True" />
+      <Setter Property="Template">
+    <Setter.Value>
+        <ControlTemplate TargetType="Button">
+            <Grid>
+                <!-- Each layer's corner radius is its own height times the look's ButtonCornerScale (carried in Tag so it follows a live look change). -->
+                <Border x:Name="Ring" Margin="-4" BorderThickness="2" BorderBrush="Transparent" Tag="{DynamicResource ButtonCornerScale}"
+                        CornerRadius="{local:CornerScale}" />
+                <Border x:Name="Bg" Background="{TemplateBinding Background}" Tag="{DynamicResource ButtonCornerScale}"
+                        BorderBrush="{DynamicResource ButtonBorder}" BorderThickness="{DynamicResource ButtonBorderThickness}"
+                        CornerRadius="{local:CornerScale}" />
+                <Border x:Name="Gloss" Background="{DynamicResource ButtonGloss}" IsHitTestVisible="False" Tag="{DynamicResource ButtonCornerScale}"
+                        CornerRadius="{local:CornerScale}" />
+                <Border x:Name="Tint" Background="{TemplateBinding Foreground}" Opacity="0" Tag="{DynamicResource ButtonCornerScale}"
+                        CornerRadius="{local:CornerScale}" />
+                <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="Center"
+                                  TextElement.Foreground="{TemplateBinding Foreground}" RecognizesAccessKey="True" />
+            </Grid>
+            <ControlTemplate.Triggers>
+                <Trigger Property="IsMouseOver" Value="True">
+                    <Setter TargetName="Tint" Property="Opacity" Value="0.08" />
+                </Trigger>
+                <Trigger Property="IsPressed" Value="True">
+                    <Setter TargetName="Tint" Property="Opacity" Value="0.16" />
+                </Trigger>
+                <Trigger Property="IsKeyboardFocused" Value="True">
+                    <Setter TargetName="Ring" Property="BorderBrush" Value="{DynamicResource TextPrimary}" />
+                </Trigger>
+                <Trigger Property="IsEnabled" Value="False">
+                    <Setter Property="Opacity" Value="0.4" />
+                </Trigger>
+            </ControlTemplate.Triggers>
+        </ControlTemplate>
+    </Setter.Value>
+      </Setter>
+  </Style>
+
+  <!-- The primary action: solid ink. -->
+  <Style x:Key="AccentButton" TargetType="Button" BasedOn="{StaticResource PillButton}">
+      <Setter Property="Background" Value="{DynamicResource AccentBrush}" />
+      <Setter Property="Foreground" Value="{DynamicResource AccentText}" />
+      <Setter Property="FontWeight" Value="SemiBold" />
+  </Style>
+
+  <Style x:Key="SecondaryButton" TargetType="Button" BasedOn="{StaticResource PillButton}" />
+
+  <!-- Risky confirmations only. -->
+  <Style x:Key="DangerButton" TargetType="Button" BasedOn="{StaticResource PillButton}">
+      <Setter Property="Background" Value="{DynamicResource BadBrush}" />
+      <Setter Property="Foreground" Value="White" />
+      <Setter Property="FontWeight" Value="SemiBold" />
+  </Style>
+
+  <!-- Round icon-only button. Always give it a ToolTip (shown on hover and keyboard focus) and an AutomationProperties.Name. -->
+  <Style x:Key="IconButton" TargetType="Button" BasedOn="{StaticResource PillButton}">
+      <Setter Property="FontFamily" Value="{StaticResource IconFont}" />
+      <Setter Property="FontWeight" Value="Normal" />
+      <Setter Property="Width" Value="48" />
+      <Setter Property="Height" Value="48" />
+      <Setter Property="Padding" Value="0" />
+  </Style>
+
+  <!-- A clickable list row: flat at rest, a tone step on hover, an ink ring on keyboard focus. -->
+  <Style x:Key="RowButton" TargetType="Button">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Foreground" Value="{DynamicResource TextPrimary}" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="Padding" Value="16,12" />
+      <Setter Property="Cursor" Value="Hand" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Template">
+    <Setter.Value>
+        <ControlTemplate TargetType="Button">
+            <Border x:Name="Bg" Background="{TemplateBinding Background}" BorderBrush="Transparent" BorderThickness="2"
+                    CornerRadius="{DynamicResource RowRadius}" Padding="{TemplateBinding Padding}">
+                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+            </Border>
+            <ControlTemplate.Triggers>
+                <Trigger Property="IsMouseOver" Value="True">
+                    <Setter TargetName="Bg" Property="Background" Value="{DynamicResource RowHover}" />
+                </Trigger>
+                <Trigger Property="IsKeyboardFocused" Value="True">
+                    <Setter TargetName="Bg" Property="BorderBrush" Value="{DynamicResource TextPrimary}" />
+                </Trigger>
+            </ControlTemplate.Triggers>
+        </ControlTemplate>
+    </Setter.Value>
+      </Setter>
+  </Style>
+
+  <Style x:Key="FieldLabel" TargetType="Label">
+      <Setter Property="Foreground" Value="{DynamicResource TextPrimary}" />
+      <Setter Property="FontSize" Value="{StaticResource TextBody}" />
+      <Setter Property="FontWeight" Value="Medium" />
+      <Setter Property="Padding" Value="0" />
+      <Setter Property="Margin" Value="0,24,0,8" />
+  </Style>
+
+  <Style x:Key="FieldHelp" TargetType="TextBlock">
+      <Setter Property="FontSize" Value="{StaticResource TextSmall}" />
+      <Setter Property="Foreground" Value="{DynamicResource TextSecondary}" />
+      <Setter Property="TextWrapping" Value="Wrap" />
+      <Setter Property="Margin" Value="0,8,0,0" />
+  </Style>
+</ResourceDictionary>
diff --git a/src/ProDHCPServer.App/ViewModels/MainViewModel.cs b/src/ProDHCPServer.App/ViewModels/MainViewModel.cs
index 46a0a1d..ac05f6c 100644
--- a/src/ProDHCPServer.App/ViewModels/MainViewModel.cs
+++ b/src/ProDHCPServer.App/ViewModels/MainViewModel.cs
@@ -815,6 +815,7 @@ public void ApplyTheme()
         Theme.Apply(_settings.Theme, _settings.Look);
         foreach (var s in Steps) s.Repaint();
         OnPropertyChanged(nameof(HeadlineState));
+        OnPropertyChanged(nameof(IsRunning));
     }
 
     private void OpenUrl(string url)

From 41ac265f61222a8d6d0373d1701e26a2a74460e0 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 02:21:23 +0000
Subject: [PATCH 3/3] Metal Heart: shattered chrome in black, white and red

Replace the blue and green glows with a backdrop of angular chrome
shards on black (silver on chrome in the light version), a red crack
running through them and a red glow behind; the primary button goes
back to red chrome. The plates are slightly see-through so the shards
ghost through them.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XaLCFyaNVfAWPcHVakuuu8
---
 src/ProDHCPServer.App/Theme.cs                |   2 +-
 .../Themes/MetalHeart.Dark.xaml               | 169 +++++++++++++++---
 .../Themes/MetalHeart.Light.xaml              | 166 ++++++++++++++---
 3 files changed, 286 insertions(+), 51 deletions(-)

diff --git a/src/ProDHCPServer.App/Theme.cs b/src/ProDHCPServer.App/Theme.cs
index 7868ae1..4cb0164 100644
--- a/src/ProDHCPServer.App/Theme.cs
+++ b/src/ProDHCPServer.App/Theme.cs
@@ -25,7 +25,7 @@ public sealed record Look(string Id, string Name, string Blurb)
     [
         new("Faceplate", "Rack faceplate", "The default: a flat front panel, one status light at every scale."),
         new("FrutigerAero", "Frutiger Aero", "Glass widgets and orb lights over a sky full of bubbles, 2000s desktop style."),
-        new("MetalHeart", "Metal Heart", "Riveted steel plates, chrome bevels and an acid-green button, Winamp skin style."),
+        new("MetalHeart", "Metal Heart", "Riveted steel plates over shattered chrome, black and white with a red accent."),
     ];
 
     public static Look DefaultLook => Looks[0];
diff --git a/src/ProDHCPServer.App/Themes/MetalHeart.Dark.xaml b/src/ProDHCPServer.App/Themes/MetalHeart.Dark.xaml
index 6d66fa0..ae1ea80 100644
--- a/src/ProDHCPServer.App/Themes/MetalHeart.Dark.xaml
+++ b/src/ProDHCPServer.App/Themes/MetalHeart.Dark.xaml
@@ -1,5 +1,5 @@
 <!--
-    Metal Heart, dark: gunmetal plates on a dark brushed-steel backdrop lit by an electric-blue glow, with an acid-green
+    Metal Heart, dark: gunmetal plates over shattered chrome on black, with a red crack running through it, a red
     chrome primary button and Orbitron for the big type (the Winamp and Sonique skin era). Shapes are in
     MetalHeart.Shapes.xaml.
 -->
@@ -10,52 +10,169 @@
     <ResourceDictionary Source="MetalHeart.Shapes.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
-  <!-- The backdrop: dark steel with a blue glow at top right and a green one at bottom left, under the brushed grain. -->
+  <!-- The backdrop: black, shattered into chrome shards from the top right, with a red crack and glow. Drawn at 1600x1000 and scaled to fill. -->
   <DrawingBrush x:Key="WindowBg" Stretch="UniformToFill" Viewbox="0,0,1600,1000" ViewboxUnits="Absolute">
     <DrawingBrush.Drawing>
       <DrawingGroup>
         <GeometryDrawing>
           <GeometryDrawing.Geometry><RectangleGeometry Rect="0,0,1600,1000" /></GeometryDrawing.Geometry>
           <GeometryDrawing.Brush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-              <GradientStop Color="#2A2E35" Offset="0" />
-              <GradientStop Color="#0E1013" Offset="0.5" />
-              <GradientStop Color="#1E2126" Offset="1" />
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+              <GradientStop Color="#1C1F24" Offset="0" />
+              <GradientStop Color="#07080A" Offset="0.55" />
+              <GradientStop Color="#15171B" Offset="1" />
             </LinearGradientBrush>
           </GeometryDrawing.Brush>
         </GeometryDrawing>
         <GeometryDrawing>
-          <GeometryDrawing.Geometry><EllipseGeometry Center="1400,120" RadiusX="900" RadiusY="600" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1500,100" RadiusX="800" RadiusY="600" /></GeometryDrawing.Geometry>
           <GeometryDrawing.Brush>
-            <RadialGradientBrush><GradientStop Color="#802E8CFF" Offset="0" /><GradientStop Color="#002E8CFF" Offset="1" /></RadialGradientBrush>
+            <RadialGradientBrush><GradientStop Color="#40FFFFFF" Offset="0" /><GradientStop Color="#00FFFFFF" Offset="1" /></RadialGradientBrush>
           </GeometryDrawing.Brush>
         </GeometryDrawing>
-        <GeometryDrawing>
-          <GeometryDrawing.Geometry><EllipseGeometry Center="150,950" RadiusX="700" RadiusY="450" /></GeometryDrawing.Geometry>
+        <GeometryDrawing Geometry="M0,0 L420,0 L300,180 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#F2FFFFFF" Offset="0" /><GradientStop Color="#66FFFFFF" Offset="0.35" /><GradientStop Color="#00FFFFFF" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M300,180 L420,0 L700,0 L560,260 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,1"><GradientStop Color="#CC2A2E35" Offset="0" /><GradientStop Color="#CC2A2E35" Offset="0.35" /><GradientStop Color="#FF050607" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M0,0 L0,300 L300,180 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#CC2A2E35" Offset="0" /><GradientStop Color="#CC2A2E35" Offset="0.35" /><GradientStop Color="#FF050607" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M560,260 L700,0 L980,120 L860,300 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#F2FFFFFF" Offset="0" /><GradientStop Color="#66FFFFFF" Offset="0.35" /><GradientStop Color="#00FFFFFF" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M0,300 L300,180 L560,260 L340,760 L0,700 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#CC2A2E35" Offset="0" /><GradientStop Color="#CC2A2E35" Offset="0.35" /><GradientStop Color="#FF050607" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M560,260 L860,300 L760,520 L700,740 L340,760 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,1"><GradientStop Color="#F2FFFFFF" Offset="0" /><GradientStop Color="#66FFFFFF" Offset="0.35" /><GradientStop Color="#00FFFFFF" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M340,760 L700,740 L820,1000 L360,1000 L420,860 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#CC2A2E35" Offset="0" /><GradientStop Color="#CC2A2E35" Offset="0.35" /><GradientStop Color="#FF050607" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1600,0 L1180,0 L1420,260 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#F2FFFFFF" Offset="0" /><GradientStop Color="#66FFFFFF" Offset="0.35" /><GradientStop Color="#00FFFFFF" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1600,0 L1600,420 L1360,300 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,1"><GradientStop Color="#CC2A2E35" Offset="0" /><GradientStop Color="#CC2A2E35" Offset="0.35" /><GradientStop Color="#FF050607" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1420,260 L1180,0 L980,120 L1250,330 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#CC2A2E35" Offset="0" /><GradientStop Color="#CC2A2E35" Offset="0.35" /><GradientStop Color="#FF050607" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1360,300 L1600,420 L1600,700 L1300,520 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,1"><GradientStop Color="#F2FFFFFF" Offset="0" /><GradientStop Color="#66FFFFFF" Offset="0.35" /><GradientStop Color="#00FFFFFF" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1250,330 L1420,260 L1300,520 L1120,480 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#F2FFFFFF" Offset="0" /><GradientStop Color="#66FFFFFF" Offset="0.35" /><GradientStop Color="#00FFFFFF" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M980,120 L1250,330 L1120,480 L860,300 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,1"><GradientStop Color="#CC2A2E35" Offset="0" /><GradientStop Color="#CC2A2E35" Offset="0.35" /><GradientStop Color="#FF050607" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1120,480 L1300,520 L1230,760 L1020,660 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1"><GradientStop Color="#CC2A2E35" Offset="0" /><GradientStop Color="#CC2A2E35" Offset="0.35" /><GradientStop Color="#FF050607" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1300,520 L1600,700 L1600,1000 L1380,1000 L1230,760 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#F2FFFFFF" Offset="0" /><GradientStop Color="#66FFFFFF" Offset="0.35" /><GradientStop Color="#00FFFFFF" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M860,300 L1120,480 L1020,660 L760,520 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#F2FFFFFF" Offset="0" /><GradientStop Color="#66FFFFFF" Offset="0.35" /><GradientStop Color="#00FFFFFF" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1020,660 L1230,760 L1380,1000 L1080,1000 Z">
           <GeometryDrawing.Brush>
-            <RadialGradientBrush><GradientStop Color="#5A7CFF2A" Offset="0" /><GradientStop Color="#007CFF2A" Offset="1" /></RadialGradientBrush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,1"><GradientStop Color="#CC2A2E35" Offset="0" /><GradientStop Color="#CC2A2E35" Offset="0.35" /><GradientStop Color="#FF050607" Offset="1" /></LinearGradientBrush>
           </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
         </GeometryDrawing>
-        <!-- A couple of chrome rails across the backdrop -->
-        <GeometryDrawing Geometry="M0,300 H1600 V306 H0 Z">
+        <GeometryDrawing Geometry="M760,520 L1020,660 L1080,1000 L820,1000 L700,740 Z">
           <GeometryDrawing.Brush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1"><GradientStop Color="#66FFFFFF" Offset="0" /><GradientStop Color="#1AFFFFFF" Offset="0.5" /><GradientStop Color="#99000000" Offset="1" /></LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#CC2A2E35" Offset="0" /><GradientStop Color="#CC2A2E35" Offset="0.35" /><GradientStop Color="#FF050607" Offset="1" /></LinearGradientBrush>
           </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
         </GeometryDrawing>
-        <GeometryDrawing Geometry="M0,700 H1600 V706 H0 Z">
+        <GeometryDrawing Geometry="M0,1000 L0,820 L260,880 L360,1000 Z">
           <GeometryDrawing.Brush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1"><GradientStop Color="#66FFFFFF" Offset="0" /><GradientStop Color="#1AFFFFFF" Offset="0.5" /><GradientStop Color="#99000000" Offset="1" /></LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,0"><GradientStop Color="#CC2A2E35" Offset="0" /><GradientStop Color="#CC2A2E35" Offset="0.35" /><GradientStop Color="#FF050607" Offset="1" /></LinearGradientBrush>
           </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M260,880 L0,820 L0,700 L340,760 L420,860 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,1" EndPoint="1,0"><GradientStop Color="#F2FFFFFF" Offset="0" /><GradientStop Color="#66FFFFFF" Offset="0.35" /><GradientStop Color="#00FFFFFF" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#B3FFFFFF" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1250,420" RadiusX="520" RadiusY="380" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush><GradientStop Color="#59FF2E2E" Offset="0" /><GradientStop Color="#00FF2E2E" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1600,420 L1360,300 L860,300 L866,308 L1356,308 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,0"><GradientStop Color="#E6FF2E2E" Offset="0" /><GradientStop Color="#00FF2E2E" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M760,520 L1020,660 L1024,654 L764,514 Z">
+          <GeometryDrawing.Brush><SolidColorBrush Color="#E6FF2E2E" /></GeometryDrawing.Brush>
         </GeometryDrawing>
         <GeometryDrawing Geometry="M0,0 H1600 V1000 H0 Z" Brush="{StaticResource BrushedGrain}" />
       </DrawingGroup>
     </DrawingBrush.Drawing>
   </DrawingBrush>
 
-  <!-- Surfaces: gunmetal. -->
+  <!-- Surfaces: gunmetal, slightly see-through so the shards ghost through the plates. -->
   <LinearGradientBrush x:Key="PanelBg" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#363B43" Offset="0" />
-    <GradientStop Color="#1C1F24" Offset="1" />
+    <GradientStop Color="#E0363B43" Offset="0" />
+    <GradientStop Color="#E61C1F24" Offset="1" />
   </LinearGradientBrush>
   <SolidColorBrush x:Key="PanelBorder" Color="#7A818A" />
   <SolidColorBrush x:Key="RaisedBg" Color="#3F454E" />
@@ -73,8 +190,8 @@
   <SolidColorBrush x:Key="TextSecondary" Color="#B4BCC6" />
   <SolidColorBrush x:Key="TextMuted" Color="#858E98" />
 
-  <!-- Status colours: acid green for good. The Soft ones fill banners and the status field. -->
-  <SolidColorBrush x:Key="GoodBrush" Color="#9BFF3C" />
+  <!-- Status colours. The Soft ones fill banners and the status field. -->
+  <SolidColorBrush x:Key="GoodBrush" Color="#41D15F" />
   <SolidColorBrush x:Key="WarnBrush" Color="#FFC53D" />
   <SolidColorBrush x:Key="BadBrush" Color="#FF4D4D" />
   <SolidColorBrush x:Key="IdleBrush" Color="#5A626C" />
@@ -83,13 +200,13 @@
   <SolidColorBrush x:Key="BadSoft" Color="#421616" />
   <SolidColorBrush x:Key="IdleSoft" Color="#24282E" />
 
-  <!-- The primary action: acid-green chrome with dark lettering. -->
+  <!-- The primary action: red chrome. -->
   <LinearGradientBrush x:Key="AccentBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#DDFF6A" Offset="0" />
-    <GradientStop Color="#8FE51E" Offset="0.5" />
-    <GradientStop Color="#4C9E08" Offset="1" />
+    <GradientStop Color="#FF6464" Offset="0" />
+    <GradientStop Color="#D21818" Offset="0.5" />
+    <GradientStop Color="#860A0A" Offset="1" />
   </LinearGradientBrush>
-  <SolidColorBrush x:Key="AccentText" Color="#0B1A02" />
+  <SolidColorBrush x:Key="AccentText" Color="#FFFFFF" />
   <SolidColorBrush x:Key="MonoBg" Color="#0F1114" />
 
   <FontFamily x:Key="TextFont">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>
diff --git a/src/ProDHCPServer.App/Themes/MetalHeart.Light.xaml b/src/ProDHCPServer.App/Themes/MetalHeart.Light.xaml
index d292d28..241b99e 100644
--- a/src/ProDHCPServer.App/Themes/MetalHeart.Light.xaml
+++ b/src/ProDHCPServer.App/Themes/MetalHeart.Light.xaml
@@ -1,5 +1,5 @@
 <!--
-    Metal Heart, light: polished silver plates on a brushed-chrome backdrop with a blue glow, the same acid-green
+    Metal Heart, light: polished silver plates over shattered chrome, black, white and a red crack; a red chrome
     primary button and Orbitron for the big type. Shapes are in MetalHeart.Shapes.xaml.
 -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -9,51 +9,169 @@
     <ResourceDictionary Source="MetalHeart.Shapes.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
-  <!-- The backdrop: brushed chrome with a blue glow at top right, under the brushed grain. -->
+  <!-- The backdrop: chrome, shattered into chrome shards from the top right, with a red crack and glow. Drawn at 1600x1000 and scaled to fill. -->
   <DrawingBrush x:Key="WindowBg" Stretch="UniformToFill" Viewbox="0,0,1600,1000" ViewboxUnits="Absolute">
     <DrawingBrush.Drawing>
       <DrawingGroup>
         <GeometryDrawing>
           <GeometryDrawing.Geometry><RectangleGeometry Rect="0,0,1600,1000" /></GeometryDrawing.Geometry>
           <GeometryDrawing.Brush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-              <GradientStop Color="#F2F4F7" Offset="0" />
-              <GradientStop Color="#B8BEC7" Offset="0.5" />
-              <GradientStop Color="#E3E6EB" Offset="1" />
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+              <GradientStop Color="#F4F6F8" Offset="0" />
+              <GradientStop Color="#C3C8CF" Offset="0.5" />
+              <GradientStop Color="#8E959E" Offset="1" />
             </LinearGradientBrush>
           </GeometryDrawing.Brush>
         </GeometryDrawing>
         <GeometryDrawing>
-          <GeometryDrawing.Geometry><EllipseGeometry Center="1400,120" RadiusX="900" RadiusY="600" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1500,100" RadiusX="800" RadiusY="600" /></GeometryDrawing.Geometry>
           <GeometryDrawing.Brush>
-            <RadialGradientBrush><GradientStop Color="#664A9CFF" Offset="0" /><GradientStop Color="#004A9CFF" Offset="1" /></RadialGradientBrush>
+            <RadialGradientBrush><GradientStop Color="#8CFFFFFF" Offset="0" /><GradientStop Color="#00FFFFFF" Offset="1" /></RadialGradientBrush>
           </GeometryDrawing.Brush>
         </GeometryDrawing>
-        <GeometryDrawing>
-          <GeometryDrawing.Geometry><EllipseGeometry Center="150,950" RadiusX="700" RadiusY="450" /></GeometryDrawing.Geometry>
+        <GeometryDrawing Geometry="M0,0 L420,0 L300,180 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#FFFFFFFF" Offset="0" /><GradientStop Color="#B3FFFFFF" Offset="0.35" /><GradientStop Color="#26000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M300,180 L420,0 L700,0 L560,260 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,1"><GradientStop Color="#8C1A1D22" Offset="0" /><GradientStop Color="#8C1A1D22" Offset="0.35" /><GradientStop Color="#D90A0B0D" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M0,0 L0,300 L300,180 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#8C1A1D22" Offset="0" /><GradientStop Color="#8C1A1D22" Offset="0.35" /><GradientStop Color="#D90A0B0D" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M560,260 L700,0 L980,120 L860,300 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#FFFFFFFF" Offset="0" /><GradientStop Color="#B3FFFFFF" Offset="0.35" /><GradientStop Color="#26000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M0,300 L300,180 L560,260 L340,760 L0,700 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#8C1A1D22" Offset="0" /><GradientStop Color="#8C1A1D22" Offset="0.35" /><GradientStop Color="#D90A0B0D" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M560,260 L860,300 L760,520 L700,740 L340,760 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,1"><GradientStop Color="#FFFFFFFF" Offset="0" /><GradientStop Color="#B3FFFFFF" Offset="0.35" /><GradientStop Color="#26000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M340,760 L700,740 L820,1000 L360,1000 L420,860 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#8C1A1D22" Offset="0" /><GradientStop Color="#8C1A1D22" Offset="0.35" /><GradientStop Color="#D90A0B0D" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1600,0 L1180,0 L1420,260 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#FFFFFFFF" Offset="0" /><GradientStop Color="#B3FFFFFF" Offset="0.35" /><GradientStop Color="#26000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1600,0 L1600,420 L1360,300 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,1"><GradientStop Color="#8C1A1D22" Offset="0" /><GradientStop Color="#8C1A1D22" Offset="0.35" /><GradientStop Color="#D90A0B0D" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1420,260 L1180,0 L980,120 L1250,330 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#8C1A1D22" Offset="0" /><GradientStop Color="#8C1A1D22" Offset="0.35" /><GradientStop Color="#D90A0B0D" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1360,300 L1600,420 L1600,700 L1300,520 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,1"><GradientStop Color="#FFFFFFFF" Offset="0" /><GradientStop Color="#B3FFFFFF" Offset="0.35" /><GradientStop Color="#26000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1250,330 L1420,260 L1300,520 L1120,480 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#FFFFFFFF" Offset="0" /><GradientStop Color="#B3FFFFFF" Offset="0.35" /><GradientStop Color="#26000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M980,120 L1250,330 L1120,480 L860,300 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,1"><GradientStop Color="#8C1A1D22" Offset="0" /><GradientStop Color="#8C1A1D22" Offset="0.35" /><GradientStop Color="#D90A0B0D" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1120,480 L1300,520 L1230,760 L1020,660 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1"><GradientStop Color="#8C1A1D22" Offset="0" /><GradientStop Color="#8C1A1D22" Offset="0.35" /><GradientStop Color="#D90A0B0D" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1300,520 L1600,700 L1600,1000 L1380,1000 L1230,760 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#FFFFFFFF" Offset="0" /><GradientStop Color="#B3FFFFFF" Offset="0.35" /><GradientStop Color="#26000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M860,300 L1120,480 L1020,660 L760,520 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#FFFFFFFF" Offset="0" /><GradientStop Color="#B3FFFFFF" Offset="0.35" /><GradientStop Color="#26000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1020,660 L1230,760 L1380,1000 L1080,1000 Z">
           <GeometryDrawing.Brush>
-            <RadialGradientBrush><GradientStop Color="#4D8FE02A" Offset="0" /><GradientStop Color="#008FE02A" Offset="1" /></RadialGradientBrush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,1"><GradientStop Color="#8C1A1D22" Offset="0" /><GradientStop Color="#8C1A1D22" Offset="0.35" /><GradientStop Color="#D90A0B0D" Offset="1" /></LinearGradientBrush>
           </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
         </GeometryDrawing>
-        <GeometryDrawing Geometry="M0,300 H1600 V306 H0 Z">
+        <GeometryDrawing Geometry="M760,520 L1020,660 L1080,1000 L820,1000 L700,740 Z">
           <GeometryDrawing.Brush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1"><GradientStop Color="#CCFFFFFF" Offset="0" /><GradientStop Color="#33FFFFFF" Offset="0.5" /><GradientStop Color="#66000000" Offset="1" /></LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1"><GradientStop Color="#8C1A1D22" Offset="0" /><GradientStop Color="#8C1A1D22" Offset="0.35" /><GradientStop Color="#D90A0B0D" Offset="1" /></LinearGradientBrush>
           </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
         </GeometryDrawing>
-        <GeometryDrawing Geometry="M0,700 H1600 V706 H0 Z">
+        <GeometryDrawing Geometry="M0,1000 L0,820 L260,880 L360,1000 Z">
           <GeometryDrawing.Brush>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1"><GradientStop Color="#CCFFFFFF" Offset="0" /><GradientStop Color="#33FFFFFF" Offset="0.5" /><GradientStop Color="#66000000" Offset="1" /></LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,0"><GradientStop Color="#8C1A1D22" Offset="0" /><GradientStop Color="#8C1A1D22" Offset="0.35" /><GradientStop Color="#D90A0B0D" Offset="1" /></LinearGradientBrush>
           </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M260,880 L0,820 L0,700 L340,760 L420,860 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="0,1" EndPoint="1,0"><GradientStop Color="#FFFFFFFF" Offset="0" /><GradientStop Color="#B3FFFFFF" Offset="0.35" /><GradientStop Color="#26000000" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+          <GeometryDrawing.Pen><Pen Thickness="1.5"><Pen.Brush><SolidColorBrush Color="#CC000000" /></Pen.Brush></Pen></GeometryDrawing.Pen>
+        </GeometryDrawing>
+        <GeometryDrawing>
+          <GeometryDrawing.Geometry><EllipseGeometry Center="1250,420" RadiusX="520" RadiusY="380" /></GeometryDrawing.Geometry>
+          <GeometryDrawing.Brush>
+            <RadialGradientBrush><GradientStop Color="#59FF2E2E" Offset="0" /><GradientStop Color="#00FF2E2E" Offset="1" /></RadialGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M1600,420 L1360,300 L860,300 L866,308 L1356,308 Z">
+          <GeometryDrawing.Brush>
+            <LinearGradientBrush StartPoint="1,0" EndPoint="0,0"><GradientStop Color="#E6FF2E2E" Offset="0" /><GradientStop Color="#00FF2E2E" Offset="1" /></LinearGradientBrush>
+          </GeometryDrawing.Brush>
+        </GeometryDrawing>
+        <GeometryDrawing Geometry="M760,520 L1020,660 L1024,654 L764,514 Z">
+          <GeometryDrawing.Brush><SolidColorBrush Color="#E6FF2E2E" /></GeometryDrawing.Brush>
         </GeometryDrawing>
         <GeometryDrawing Geometry="M0,0 H1600 V1000 H0 Z" Brush="{StaticResource BrushedGrain}" />
       </DrawingGroup>
     </DrawingBrush.Drawing>
   </DrawingBrush>
 
-  <!-- Surfaces: polished silver. -->
+  <!-- Surfaces: polished silver, slightly see-through so the shards ghost through the plates. -->
   <LinearGradientBrush x:Key="PanelBg" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#F7F8FA" Offset="0" />
-    <GradientStop Color="#D3D8DF" Offset="1" />
+    <GradientStop Color="#E6F7F8FA" Offset="0" />
+    <GradientStop Color="#E6D3D8DF" Offset="1" />
   </LinearGradientBrush>
   <SolidColorBrush x:Key="PanelBorder" Color="#8A919B" />
   <SolidColorBrush x:Key="RaisedBg" Color="#FFFFFF" />
@@ -72,7 +190,7 @@
   <SolidColorBrush x:Key="TextMuted" Color="#656C75" />
 
   <!-- Status colours. The Soft ones fill banners and the status field. -->
-  <SolidColorBrush x:Key="GoodBrush" Color="#3E9A0C" />
+  <SolidColorBrush x:Key="GoodBrush" Color="#1E8A3A" />
   <SolidColorBrush x:Key="WarnBrush" Color="#B36D00" />
   <SolidColorBrush x:Key="BadBrush" Color="#C8201F" />
   <SolidColorBrush x:Key="IdleBrush" Color="#A6ACB4" />
@@ -81,13 +199,13 @@
   <SolidColorBrush x:Key="BadSoft" Color="#F8D9D8" />
   <SolidColorBrush x:Key="IdleSoft" Color="#E3E6EB" />
 
-  <!-- The primary action: acid-green chrome with dark lettering. -->
+  <!-- The primary action: red chrome. -->
   <LinearGradientBrush x:Key="AccentBrush" StartPoint="0,0" EndPoint="0,1">
-    <GradientStop Color="#DDFF6A" Offset="0" />
-    <GradientStop Color="#8FE51E" Offset="0.5" />
-    <GradientStop Color="#4C9E08" Offset="1" />
+    <GradientStop Color="#FF6464" Offset="0" />
+    <GradientStop Color="#D21818" Offset="0.5" />
+    <GradientStop Color="#860A0A" Offset="1" />
   </LinearGradientBrush>
-  <SolidColorBrush x:Key="AccentText" Color="#0B1A02" />
+  <SolidColorBrush x:Key="AccentText" Color="#FFFFFF" />
   <SolidColorBrush x:Key="MonoBg" Color="#E4E7EB" />
 
   <FontFamily x:Key="TextFont">pack://application:,,,/Assets/Fonts/#Figtree</FontFamily>