diff --git a/ROADMAP.md b/ROADMAP.md
index f4c13b8..d00492c 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -230,7 +230,7 @@ Each release's notes say what it brought, and the decisions above say why. The c
 An audit on 2026-10-10 went through the UI tests' screenshots, the themes and the views. These are what it found.
 
 - [x] Screen readers and the keyboard: the rating takes the keyboard and reads out as "Usefulness, Solid", toasts and Quick save's error are announced, a heart says whether its prompt is a favorite, Show details says when it's open, and the workflow's Previous and Next buttons point left and right like its step strip.
-- [ ] Contrast and focus: danger buttons on hover, the focused list row against a picked one, the picked option in segmented controls, control edges and empty rating pips at 3:1, counts on the active sidebar row and tags on their tinted fill, and focus outlines that follow each control's corners. `ThemeTests` holds every theme to the new pairs.
+- [x] Contrast and focus: danger buttons on hover, the focused list row against a picked one, the picked option in segmented controls, control edges at 3:1 (the editor's empty rating pips too), counts on the active sidebar row and tags on their tinted fill, and focus outlines that follow each control's corners. `ThemeTests` holds every theme to the new pairs.
 - [ ] Layout: long dialog titles wrap, the library and Settings fit the 960-pixel minimum width with a screenshot test at that size, toasts stay clear of the buttons beneath them, the Render tab scrolls once, the data folder's path shows in full on hover, and Settings sections share one spacing.
 - [ ] Copy and polish: Quick save's button says Save, the list view shows the rating's word, and small icon buttons use one icon size.
 - [ ] Publish v1.1.1.
diff --git a/src/Prompuff.App/Themes/Controls.axaml b/src/Prompuff.App/Themes/Controls.axaml
index 0461633..2b60784 100644
--- a/src/Prompuff.App/Themes/Controls.axaml
+++ b/src/Prompuff.App/Themes/Controls.axaml
@@ -11,6 +11,7 @@
 
       <!-- Buttons: secondary by default; classes primary, ghost, danger, sm, icon, nav, card, row, bare -->
       <ControlTheme x:Key="{x:Type Button}" TargetType="Button">
+        <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="Background" Value="{DynamicResource Bg3Brush}" />
         <Setter Property="Foreground" Value="{DynamicResource Text1Brush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource Border2Brush}" />
@@ -58,6 +59,10 @@
         <Style Selector="^:focus-visible">
           <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}" />
         </Style>
+        <!-- Focus is a ring inside the edge, so it follows the corners and shows on buttons without a border -->
+        <Style Selector="^:focus-visible /template/ ContentPresenter#PART_ContentPresenter">
+          <Setter Property="BoxShadow" Value="{DynamicResource FocusOutline}" />
+        </Style>
 
         <Style Selector="^.primary">
           <Setter Property="Background" Value="{DynamicResource AccentBrush}" />
@@ -94,8 +99,7 @@
           <Setter Property="BorderBrush" Value="{DynamicResource CriticalBorderBrush}" />
         </Style>
         <Style Selector="^.danger:pointerover">
-          <Setter Property="Background" Value="{DynamicResource CriticalBrush}" />
-          <Setter Property="Foreground" Value="White" />
+          <Setter Property="BorderBrush" Value="{DynamicResource CriticalBrush}" />
         </Style>
 
         <Style Selector="^.sm">
@@ -204,10 +208,11 @@
         <Style Selector="^.row.selected">
           <Setter Property="Background" Value="{DynamicResource AccentSubtleBrush}" />
         </Style>
+        <!-- Avalonia draws no box shadow on a border that differs by side, so the focused row's border goes all round -->
         <Style Selector="^.row:focus-visible">
-          <Setter Property="FocusAdorner" Value="{x:Null}" />
-          <Setter Property="Background" Value="{DynamicResource AccentSubtleBrush}" />
-          <Setter Property="BorderBrush" Value="{DynamicResource AccentBorderBrush}" />
+          <Setter Property="Background" Value="{DynamicResource Bg3Brush}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource Border1Brush}" />
+          <Setter Property="BorderThickness" Value="1" />
         </Style>
 
         <!-- Version cards in the history timeline -->
@@ -267,14 +272,17 @@
         <Setter Property="FontWeight" Value="SemiBold" />
         <Setter Property="FontSize" Value="13" />
         <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="Template">
           <ControlTemplate>
-            <Border Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="0,0,0,2"
-                    Padding="10,8"
-                    Margin="0,0,0,-1">
-              <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+            <!-- The focus ring sits on an outer border, since Avalonia draws no box shadow on the underline's one-sided border -->
+            <Border x:Name="PART_Focus" CornerRadius="4" Margin="0,0,0,-1">
+              <Border Background="{TemplateBinding Background}"
+                      BorderBrush="{TemplateBinding BorderBrush}"
+                      BorderThickness="0,0,0,2"
+                      Padding="10,8">
+                <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+              </Border>
             </Border>
           </ControlTemplate>
         </Setter>
@@ -285,6 +293,9 @@
           <Setter Property="Foreground" Value="{DynamicResource Text1Brush}" />
           <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}" />
         </Style>
+        <Style Selector="^:focus-visible /template/ Border#PART_Focus">
+          <Setter Property="BoxShadow" Value="{DynamicResource FocusOutline}" />
+        </Style>
       </ControlTheme>
 
       <!-- Segmented control options (Cards / List, theme, history mode) -->
@@ -295,10 +306,14 @@
         <Setter Property="FontSize" Value="12" />
         <Setter Property="Padding" Value="9,0" />
         <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="Template">
           <ControlTemplate>
             <Border x:Name="PART_Border"
                     Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="1"
                     CornerRadius="3"
                     Padding="{TemplateBinding Padding}">
               <ContentPresenter VerticalAlignment="Center"
@@ -312,11 +327,12 @@
           <Setter Property="Foreground" Value="{DynamicResource Text1Brush}" />
         </Style>
         <Style Selector="^:checked">
-          <Setter Property="Background" Value="{DynamicResource Bg3Brush}" />
+          <Setter Property="Background" Value="{DynamicResource AccentSubtleBrush}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}" />
           <Setter Property="Foreground" Value="{DynamicResource Text1Brush}" />
         </Style>
-        <Style Selector="^:checked /template/ Border#PART_Border">
-          <Setter Property="BoxShadow" Value="{DynamicResource Shadow1}" />
+        <Style Selector="^:focus-visible /template/ Border#PART_Border">
+          <Setter Property="BoxShadow" Value="{DynamicResource FocusOutline}" />
         </Style>
         <Style Selector="^:disabled">
           <Setter Property="Opacity" Value="0.45" />
@@ -331,6 +347,7 @@
         <Setter Property="FontWeight" Value="SemiBold" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="Template">
           <ControlTemplate>
             <Border Height="34"
@@ -354,11 +371,15 @@
           <Setter Property="BorderBrush" Value="{DynamicResource AccentBorderBrush}" />
           <Setter Property="Foreground" Value="{DynamicResource AccentTextBrush}" />
         </Style>
+        <Style Selector="^:focus-visible /template/ Border">
+          <Setter Property="BoxShadow" Value="{DynamicResource FocusOutline}" />
+        </Style>
       </ControlTheme>
 
       <!-- Switch -->
       <ControlTheme x:Key="Switch" TargetType="ToggleButton">
         <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="Background" Value="{DynamicResource Bg4Brush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource Border3Brush}" />
         <Setter Property="Template">
@@ -397,7 +418,7 @@
           <Setter Property="Background" Value="{DynamicResource TextInverseBrush}" />
         </Style>
         <Style Selector="^:focus-visible">
-          <Setter Property="BorderBrush" Value="{DynamicResource AccentHoverBrush}" />
+          <Setter Property="BorderBrush" Value="{DynamicResource Text1Brush}" />
         </Style>
       </ControlTheme>
 
@@ -536,6 +557,9 @@
   <Style Selector="TextBlock.faint">
     <Setter Property="Foreground" Value="{DynamicResource Text3Brush}" />
   </Style>
+  <Style Selector="Button.nav.active TextBlock.faint">
+    <Setter Property="Foreground" Value="{DynamicResource Text2Brush}" />
+  </Style>
   <Style Selector="TextBlock.variable">
     <Setter Property="FontFamily" Value="{StaticResource MonoFont}" />
     <Setter Property="FontSize" Value="12" />
@@ -632,10 +656,13 @@
   <!-- Rating pips and Puff -->
   <Style Selector="c|RatingPips">
     <Setter Property="FilledBrush" Value="{DynamicResource LavenderBrush}" />
-    <Setter Property="EmptyBrush" Value="{DynamicResource Bg4Brush}" />
+    <Setter Property="EmptyBrush" Value="{DynamicResource Border3Brush}" />
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="FocusAdorner" Value="{x:Null}" />
   </Style>
+  <Style Selector="c|RatingPips[IsInteractive=True]">
+    <Setter Property="EmptyBrush" Value="{DynamicResource ControlBorderBrush}" />
+  </Style>
   <Style Selector="c|RatingPips:focus-visible">
     <Setter Property="FocusBrush" Value="{DynamicResource AccentBrush}" />
   </Style>
@@ -727,7 +754,7 @@
   </Style>
   <Style Selector="TextBox.plain:focus /template/ Border#PART_BorderElement">
     <Setter Property="Background" Value="{DynamicResource Bg2Brush}" />
-    <Setter Property="BoxShadow" Value="none" />
+    <Setter Property="BoxShadow" Value="{DynamicResource FocusOutline}" />
   </Style>
   <Style Selector="TextBox.title">
     <Setter Property="FontSize" Value="20" />
diff --git a/src/Prompuff.App/Themes/ThemeBuilder.cs b/src/Prompuff.App/Themes/ThemeBuilder.cs
index 203d32b..639359d 100644
--- a/src/Prompuff.App/Themes/ThemeBuilder.cs
+++ b/src/Prompuff.App/Themes/ThemeBuilder.cs
@@ -71,6 +71,8 @@ public static ResourceDictionary Tokens(ThemePalette p)
         resources["Shadow3"] = Shadow(0, 8, 24, WithAlpha(shadow, dark ? (byte)0x80 : (byte)0x1F));
         resources["Shadow4"] = Shadow(0, 24, 64, WithAlpha(shadow, dark ? (byte)0x99 : (byte)0x2E));
         resources["FocusRing"] = new BoxShadows(new BoxShadow { Spread = 3, Color = WithAlpha(p.AccentColor, 0x1A) });
+        resources["FocusOutline"] = new BoxShadows(new BoxShadow { Spread = 2, IsInset = true, Color = p.AccentColor });
+        Brush("ControlBorderBrush", p.ControlBorder);
 
         Brush("AccentBrush", p.AccentColor);
         Brush("AccentHoverBrush", p.AccentHover);
@@ -94,8 +96,8 @@ public static ResourceDictionary Tokens(ThemePalette p)
         Brush("TextControlBackground", dark ? p.Inset : p.Bg(2));
         Brush("TextControlBackgroundPointerOver", dark ? p.Inset : p.Bg(2));
         Brush("TextControlBackgroundFocused", dark ? p.Inset : p.Bg(2));
-        Brush("TextControlBorderBrush", p.Border(2));
-        Brush("TextControlBorderBrushPointerOver", p.Border(3));
+        Brush("TextControlBorderBrush", p.ControlBorder);
+        Brush("TextControlBorderBrushPointerOver", p.Text(3));
         Brush("TextControlBorderBrushFocused", p.AccentColor);
         Brush("TextControlForeground", p.Text(1));
         Brush("TextControlForegroundPointerOver", p.Text(1));
@@ -108,9 +110,9 @@ public static ResourceDictionary Tokens(ThemePalette p)
         Brush("ComboBoxBackgroundPointerOver", dark ? p.Bg(4) : p.Bg(3));
         Brush("ComboBoxBackgroundPressed", p.Bg(4));
         Brush("ComboBoxBackgroundFocused", raised);
-        Brush("ComboBoxBorderBrush", p.Border(2));
-        Brush("ComboBoxBorderBrushPointerOver", p.Border(3));
-        Brush("ComboBoxBorderBrushPressed", p.Border(3));
+        Brush("ComboBoxBorderBrush", p.ControlBorder);
+        Brush("ComboBoxBorderBrushPointerOver", p.Text(3));
+        Brush("ComboBoxBorderBrushPressed", p.Text(3));
         Brush("ComboBoxForeground", p.Text(1));
         Brush("ComboBoxDropDownBackground", raised);
         Brush("ComboBoxDropDownBorderBrush", p.Border(2));
diff --git a/src/Prompuff.App/Themes/ThemePalette.cs b/src/Prompuff.App/Themes/ThemePalette.cs
index 1166d8d..fd968d1 100644
--- a/src/Prompuff.App/Themes/ThemePalette.cs
+++ b/src/Prompuff.App/Themes/ThemePalette.cs
@@ -49,6 +49,48 @@ public sealed record ThemePalette(
     public Color AccentText => Color.Parse(Accent[3]);
     public Color Inverse => Color.Parse(TextInverse);
 
+    /// <summary>
+    /// The edge of a text box, dropdown or checkbox: the faintest step from Border3 toward Text3 that reaches 3:1
+    /// (WCAG's bar for the parts of a control) on every background a control sits on.
+    /// </summary>
+    public Color ControlBorder
+    {
+        get
+        {
+            Color[] surfaces = [Bg(0), Bg(1), Bg(2), Bg(3), Inset];
+            for (var step = 0; step <= 100; step++)
+            {
+                var color = Mix(Border(3), Text(3), step / 100.0);
+                if (surfaces.All(surface => Contrast(color, surface) >= 3))
+                {
+                    return color;
+                }
+            }
+
+            return Text(3);
+        }
+    }
+
+    /// <summary>WCAG contrast ratio, as in https://www.w3.org/TR/WCAG21/#dfn-contrast-ratio.</summary>
+    public static double Contrast(Color a, Color b)
+    {
+        static double Channel(byte value)
+        {
+            var c = value / 255.0;
+            return c <= 0.04045 ? c / 12.92 : Math.Pow((c + 0.055) / 1.055, 2.4);
+        }
+
+        static double Luminance(Color color) => (0.2126 * Channel(color.R)) + (0.7152 * Channel(color.G)) + (0.0722 * Channel(color.B));
+
+        var (first, second) = (Luminance(a), Luminance(b));
+        return (Math.Max(first, second) + 0.05) / (Math.Min(first, second) + 0.05);
+    }
+
+    private static Color Mix(Color from, Color to, double amount) => Color.FromRgb(
+        (byte)Math.Round(from.R + ((to.R - from.R) * amount)),
+        (byte)Math.Round(from.G + ((to.G - from.G) * amount)),
+        (byte)Math.Round(from.B + ((to.B - from.B) * amount)));
+
     /// <summary>Prompuff's own themes live in <c>Tokens.axaml</c>; these entries only describe them for the picker.</summary>
     public bool IsBuiltIn => Id is ThemeCatalog.PrompuffDark or ThemeCatalog.PrompuffLight;
 }
@@ -76,18 +118,18 @@ public static class ThemeCatalog
         new("darcula", "Darcula", true,
             ["#232525", "#2B2B2B", "#313335", "#3C3F41", "#45494A", "#1E2020"],
             ["#373A3C", "#4B4F51", "#5E6264"],
-            ["#D4D4D4", "#A9B7C6", "#A0AAB5", "#5E6060"],
+            ["#D4D4D4", "#ACB9C7", "#A0AAB5", "#5E6060"],
             ["#589DF6", "#78B0F8", "#3C7FD8", "#8FBEFA"], "#1E2020",
-            new("#9876AA", "#B9A0C9"), new("#6897BB", "#92B6D5"), new("#C77DBB", "#DCA3D2"), new("#CC7832", "#E09A5F"),
+            new("#9876AA", "#C1AFCC"), new("#6897BB", "#9FBCD5"), new("#C77DBB", "#DBA9D2"), new("#CC7832", "#DCAD84"),
             new("#6A8759", "#9CBF87"), new("#589DF6", "#8FBEFA"), new("#FFC66D", "#FFD899"), new("#FF6B68", "#FF9C99")),
 
         new("gruvbox-dark", "Gruvbox Dark", true,
             ["#1D2021", "#282828", "#32302F", "#3C3836", "#504945", "#161819"],
             ["#3C3836", "#504945", "#665C54"],
-            ["#EBDBB2", "#BDAE93", "#AFA089", "#665C54"],
+            ["#EBDBB2", "#C8B99A", "#AFA089", "#665C54"],
             ["#8EC07C", "#A6D18F", "#689D6A", "#A9D19B"], "#1D2021",
-            new("#D3869B", "#E5B0BE"), new("#83A598", "#A7C0B6"), new("#B16286", "#D3869B"), new("#FE8019", "#FEAB6B"),
-            new("#B8BB26", "#CFD16B"), new("#458588", "#83A598"), new("#FABD2F", "#FCD36F"), new("#FB4934", "#FC7A6A")),
+            new("#D3869B", "#E5B0BE"), new("#83A598", "#A7C0B6"), new("#B16286", "#D99DA1"), new("#FE8019", "#FEAB6B"),
+            new("#B8BB26", "#CFD16B"), new("#458588", "#9CB29E"), new("#FABD2F", "#FCD36F"), new("#FB4934", "#F8907B")),
 
         new("dracula", "Dracula", true,
             ["#191A21", "#21222C", "#282A36", "#343746", "#44475A", "#14151B"],
@@ -95,15 +137,15 @@ public static class ThemeCatalog
             ["#F8F8F2", "#C5C8D6", "#949FC7", "#6272A4"],
             ["#BD93F9", "#D0B0FB", "#A275F2", "#CFB2FB"], "#191A21",
             new("#BD93F9", "#D4B8FB"), new("#8BE9FD", "#B0F1FE"), new("#FF79C6", "#FFA3D7"), new("#FFB86C", "#FFCD98"),
-            new("#50FA7B", "#8CFCA7"), new("#6C7BD8", "#9BA6E8"), new("#F1FA8C", "#F6FBB3"), new("#FF5555", "#FF8888")),
+            new("#50FA7B", "#8CFCA7"), new("#6C7BD8", "#9FA9E8"), new("#F1FA8C", "#F6FBB3"), new("#FF5555", "#FF8B8B")),
 
         new("nord", "Nord", true,
             ["#242933", "#2E3440", "#3B4252", "#434C5E", "#4C566A", "#20242C"],
             ["#3B4252", "#4C566A", "#616E88"],
             ["#ECEFF4", "#D8DEE9", "#B3BCCB", "#616E88"],
             ["#88C0D0", "#9FCFDC", "#6FAFC2", "#A3D2DE"], "#2E3440",
-            new("#B48EAD", "#CBAEC6"), new("#88C0D0", "#ACD5E0"), new("#C48BB5", "#D9B0CF"), new("#D08770", "#E0A891"),
-            new("#A3BE8C", "#BED3AD"), new("#81A1C1", "#A5BDD5"), new("#EBCB8B", "#F2DCAE"), new("#BF616A", "#E8AEB3")),
+            new("#B48EAD", "#D7C5D6"), new("#88C0D0", "#B0D7E1"), new("#C48BB5", "#DFC3DA"), new("#D08770", "#E4C2B5"),
+            new("#A3BE8C", "#C2D6B3"), new("#81A1C1", "#BCCDDF"), new("#EBCB8B", "#F2DCAE"), new("#BF616A", "#E9B8BD")),
 
         new("one-dark", "One Dark", true,
             ["#1B1D23", "#21252B", "#282C34", "#2F343E", "#3A3F4B", "#181A1F"],
@@ -124,10 +166,10 @@ public static class ThemeCatalog
         new("solarized-dark", "Solarized Dark", true,
             ["#00212B", "#002B36", "#073642", "#0A3D4A", "#104653", "#001B23"],
             ["#0E3F4C", "#284F59", "#3C626B"],
-            ["#EEE8D5", "#9EACAC", "#93A3A3", "#586E75"],
+            ["#EEE8D5", "#A2AFAE", "#93A3A3", "#586E75"],
             ["#2AA198", "#3CB8AD", "#1F8A82", "#4CC2B7"], "#002B36",
-            new("#6C71C4", "#9A9EE0"), new("#2AA198", "#4CC2B7"), new("#D33682", "#EC85B8"), new("#CB4B16", "#EA8C64"),
-            new("#859900", "#A8BD2E"), new("#268BD2", "#5CA6E0"), new("#B58900", "#D6A92A"), new("#DC322F", "#F2807D")),
+            new("#6C71C4", "#A3A6DF"), new("#2AA198", "#4CC2B7"), new("#D33682", "#EC85B8"), new("#CB4B16", "#EA8C64"),
+            new("#859900", "#A8BD2E"), new("#268BD2", "#78B3DE"), new("#B58900", "#D6A92A"), new("#DC322F", "#F2807D")),
 
         new("catppuccin-mocha", "Catppuccin Mocha", true,
             ["#11111B", "#181825", "#1E1E2E", "#282839", "#313244", "#0E0E16"],
@@ -143,7 +185,7 @@ public static class ThemeCatalog
             ["#171B22", "#525C6B", "#66707F", "#B3BAC5"],
             ["#0F766E", "#115E59", "#134E4A", "#0B7A70"], "#FFFFFF",
             new("#7C5CD6", "#5E3FB8"), new("#0A8FCB", "#0A6F9D"), new("#C9407F", "#A3305F"), new("#C4681F", "#94500F"),
-            new("#1E9E5E", "#177A49"), new("#3B6FE0", "#2A55B5"), new("#C98A12", "#8F6100"), new("#D7343E", "#B0232C")),
+            new("#1E9E5E", "#177848"), new("#3B6FE0", "#2A55B5"), new("#C98A12", "#8F6100"), new("#D7343E", "#B0232C")),
 
         new("gruvbox-light", "Gruvbox Light", false,
             ["#F2E5BC", "#F7ECC4", "#FBF1C7", "#F5E9C0", "#EBDBB2", "#F9F5D7"],
@@ -159,15 +201,15 @@ public static class ThemeCatalog
             ["#073642", "#4C5F66", "#586C73", "#93A1A1"],
             ["#2075B5", "#1A6399", "#155280", "#1A6399"], "#FFFFFF",
             new("#6C71C4", "#4F54A8"), new("#2AA198", "#177068"), new("#D33682", "#A8246A"), new("#CB4B16", "#A33A0F"),
-            new("#859900", "#5F6E00"), new("#268BD2", "#1A6399"), new("#B58900", "#8A6800"), new("#DC322F", "#B02623")),
+            new("#859900", "#5D6D01"), new("#268BD2", "#1A6399"), new("#B58900", "#7D6307"), new("#DC322F", "#B02623")),
 
         new("catppuccin-latte", "Catppuccin Latte", false,
             ["#E6E9EF", "#EAEDF2", "#EFF1F5", "#E9EBF1", "#DCE0E8", "#F4F5F8"],
             ["#DCE0E8", "#CCD0DA", "#ACB0BE"],
             ["#4C4F69", "#5C5F77", "#64677E", "#9CA0B0"],
             ["#8839EF", "#7A2EE0", "#6B25C9", "#7A2EE0"], "#FFFFFF",
-            new("#7287FD", "#3D50C8"), new("#04A5E5", "#036A93"), new("#EA76CB", "#B03A92"), new("#FE640B", "#B84804"),
-            new("#40A02B", "#2F7A1F"), new("#1E66F5", "#1550C7"), new("#DF8E1D", "#8A570A"), new("#D20F39", "#B00D30")),
+            new("#7287FD", "#3D50C8"), new("#04A5E5", "#036A93"), new("#EA76CB", "#A13D8C"), new("#FE640B", "#A14919"),
+            new("#40A02B", "#366F32"), new("#1E66F5", "#1550C7"), new("#DF8E1D", "#8A570A"), new("#D20F39", "#B00D30")),
     ];
 
     public static IReadOnlyList<ThemePalette> Dark { get; } = All.Where(theme => theme.IsDark).ToList();
diff --git a/src/Prompuff.App/Themes/Tokens.axaml b/src/Prompuff.App/Themes/Tokens.axaml
index 7f63371..7035ac6 100644
--- a/src/Prompuff.App/Themes/Tokens.axaml
+++ b/src/Prompuff.App/Themes/Tokens.axaml
@@ -27,6 +27,7 @@
       <SolidColorBrush x:Key="Border1Brush" Color="#1E242E" />
       <SolidColorBrush x:Key="Border2Brush" Color="#2A3240" />
       <SolidColorBrush x:Key="Border3Brush" Color="#3A4453" />
+      <SolidColorBrush x:Key="ControlBorderBrush" Color="#606B7A" />
       <SolidColorBrush x:Key="Text1Brush" Color="#E8ECF1" />
       <SolidColorBrush x:Key="Text2Brush" Color="#98A2B3" />
       <SolidColorBrush x:Key="Text3Brush" Color="#7D8898" />
@@ -38,6 +39,7 @@
       <BoxShadows x:Key="Shadow3">0 8 24 0 #80000000</BoxShadows>
       <BoxShadows x:Key="Shadow4">0 24 64 0 #99000000</BoxShadows>
       <BoxShadows x:Key="FocusRing">0 0 0 3 #1A2DD4BF</BoxShadows>
+      <BoxShadows x:Key="FocusOutline">inset 0 0 0 2 #2DD4BF</BoxShadows>
 
       <!-- Accent (interactive) -->
       <SolidColorBrush x:Key="AccentBrush" Color="#2DD4BF" />
@@ -85,8 +87,8 @@
       <SolidColorBrush x:Key="TextControlBackground" Color="#07090C" />
       <SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="#07090C" />
       <SolidColorBrush x:Key="TextControlBackgroundFocused" Color="#07090C" />
-      <SolidColorBrush x:Key="TextControlBorderBrush" Color="#2A3240" />
-      <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="#3A4453" />
+      <SolidColorBrush x:Key="TextControlBorderBrush" Color="#606B7A" />
+      <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="#7D8898" />
       <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="#2DD4BF" />
       <SolidColorBrush x:Key="TextControlForeground" Color="#E8ECF1" />
       <SolidColorBrush x:Key="TextControlForegroundPointerOver" Color="#E8ECF1" />
@@ -99,9 +101,9 @@
       <SolidColorBrush x:Key="ComboBoxBackgroundPointerOver" Color="#222834" />
       <SolidColorBrush x:Key="ComboBoxBackgroundPressed" Color="#222834" />
       <SolidColorBrush x:Key="ComboBoxBackgroundFocused" Color="#1B2029" />
-      <SolidColorBrush x:Key="ComboBoxBorderBrush" Color="#2A3240" />
-      <SolidColorBrush x:Key="ComboBoxBorderBrushPointerOver" Color="#3A4453" />
-      <SolidColorBrush x:Key="ComboBoxBorderBrushPressed" Color="#3A4453" />
+      <SolidColorBrush x:Key="ComboBoxBorderBrush" Color="#606B7A" />
+      <SolidColorBrush x:Key="ComboBoxBorderBrushPointerOver" Color="#7D8898" />
+      <SolidColorBrush x:Key="ComboBoxBorderBrushPressed" Color="#7D8898" />
       <SolidColorBrush x:Key="ComboBoxForeground" Color="#E8ECF1" />
       <SolidColorBrush x:Key="ComboBoxDropDownBackground" Color="#1B2029" />
       <SolidColorBrush x:Key="ComboBoxDropDownBorderBrush" Color="#2A3240" />
@@ -128,6 +130,7 @@
       <SolidColorBrush x:Key="Border1Brush" Color="#E6E8EC" />
       <SolidColorBrush x:Key="Border2Brush" Color="#D7DBE2" />
       <SolidColorBrush x:Key="Border3Brush" Color="#BCC3CE" />
+      <SolidColorBrush x:Key="ControlBorderBrush" Color="#858E9B" />
       <SolidColorBrush x:Key="Text1Brush" Color="#171B22" />
       <SolidColorBrush x:Key="Text2Brush" Color="#525C6B" />
       <SolidColorBrush x:Key="Text3Brush" Color="#66707F" />
@@ -139,6 +142,7 @@
       <BoxShadows x:Key="Shadow3">0 8 24 0 #1F171B22</BoxShadows>
       <BoxShadows x:Key="Shadow4">0 24 64 0 #2E171B22</BoxShadows>
       <BoxShadows x:Key="FocusRing">0 0 0 3 #1A0F766E</BoxShadows>
+      <BoxShadows x:Key="FocusOutline">inset 0 0 0 2 #0F766E</BoxShadows>
 
       <SolidColorBrush x:Key="AccentBrush" Color="#0F766E" />
       <SolidColorBrush x:Key="AccentHoverBrush" Color="#115E59" />
@@ -164,7 +168,7 @@
       <SolidColorBrush x:Key="PeachSubtleBrush" Color="#1AC4681F" />
       <SolidColorBrush x:Key="PeachBorderBrush" Color="#59C4681F" />
       <SolidColorBrush x:Key="MintBrush" Color="#1E9E5E" />
-      <SolidColorBrush x:Key="MintTextBrush" Color="#177A49" />
+      <SolidColorBrush x:Key="MintTextBrush" Color="#177848" />
       <SolidColorBrush x:Key="MintSubtleBrush" Color="#1A1E9E5E" />
       <SolidColorBrush x:Key="MintBorderBrush" Color="#591E9E5E" />
       <SolidColorBrush x:Key="BlueBrush" Color="#3B6FE0" />
@@ -183,8 +187,8 @@
       <SolidColorBrush x:Key="TextControlBackground" Color="#FFFFFF" />
       <SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="#FFFFFF" />
       <SolidColorBrush x:Key="TextControlBackgroundFocused" Color="#FFFFFF" />
-      <SolidColorBrush x:Key="TextControlBorderBrush" Color="#D7DBE2" />
-      <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="#BCC3CE" />
+      <SolidColorBrush x:Key="TextControlBorderBrush" Color="#858E9B" />
+      <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="#66707F" />
       <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="#0F766E" />
       <SolidColorBrush x:Key="TextControlForeground" Color="#171B22" />
       <SolidColorBrush x:Key="TextControlForegroundPointerOver" Color="#171B22" />
@@ -197,9 +201,9 @@
       <SolidColorBrush x:Key="ComboBoxBackgroundPointerOver" Color="#F6F7F9" />
       <SolidColorBrush x:Key="ComboBoxBackgroundPressed" Color="#EDEFF3" />
       <SolidColorBrush x:Key="ComboBoxBackgroundFocused" Color="#FFFFFF" />
-      <SolidColorBrush x:Key="ComboBoxBorderBrush" Color="#D7DBE2" />
-      <SolidColorBrush x:Key="ComboBoxBorderBrushPointerOver" Color="#BCC3CE" />
-      <SolidColorBrush x:Key="ComboBoxBorderBrushPressed" Color="#BCC3CE" />
+      <SolidColorBrush x:Key="ComboBoxBorderBrush" Color="#858E9B" />
+      <SolidColorBrush x:Key="ComboBoxBorderBrushPointerOver" Color="#66707F" />
+      <SolidColorBrush x:Key="ComboBoxBorderBrushPressed" Color="#66707F" />
       <SolidColorBrush x:Key="ComboBoxForeground" Color="#171B22" />
       <SolidColorBrush x:Key="ComboBoxDropDownBackground" Color="#FFFFFF" />
       <SolidColorBrush x:Key="ComboBoxDropDownBorderBrush" Color="#D7DBE2" />
diff --git a/src/Prompuff.App/Views/LibraryView.axaml b/src/Prompuff.App/Views/LibraryView.axaml
index ee5ad4d..0c62e8d 100644
--- a/src/Prompuff.App/Views/LibraryView.axaml
+++ b/src/Prompuff.App/Views/LibraryView.axaml
@@ -29,7 +29,7 @@
       <Setter Property="Height" Value="15" />
       <Setter Property="CornerRadius" Value="4" />
       <Setter Property="BorderThickness" Value="1.5" />
-      <Setter Property="BorderBrush" Value="{DynamicResource Border3Brush}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource ControlBorderBrush}" />
       <Setter Property="Background" Value="{DynamicResource Bg1Brush}" />
     </Style>
     <Style Selector="Border.check.checked">
diff --git a/tests/Prompuff.App.Tests/ThemeTests.cs b/tests/Prompuff.App.Tests/ThemeTests.cs
index c623525..e5b0117 100644
--- a/tests/Prompuff.App.Tests/ThemeTests.cs
+++ b/tests/Prompuff.App.Tests/ThemeTests.cs
@@ -62,7 +62,9 @@ public void Prompuff_themes_in_the_catalog_match_Tokens_axaml()
             Assert.Equal(palette.AccentColor, Resolve("AccentBrush", variant));
             Assert.Equal(palette.AccentText, Resolve("AccentTextBrush", variant));
             Assert.Equal(palette.Lavender.Text, Resolve("LavenderTextBrush", variant));
+            Assert.Equal(palette.Mint.Text, Resolve("MintTextBrush", variant));
             Assert.Equal(palette.Critical.Base, Resolve("CriticalBrush", variant));
+            Assert.Equal(palette.ControlBorder, Resolve("ControlBorderBrush", variant));
         }
     }
 
@@ -143,6 +145,61 @@ void Check(string what, Color text, Color background, string on, double minimum)
         Assert.True(failures.Count == 0, $"{theme.Name}:\n" + string.Join("\n", failures));
     }
 
+    /// <summary>
+    /// The pairs the 2026-10-10 audit found below the bar, read from the resources each theme actually resolves: control edges
+    /// and the accent at 3:1 against every background, tags and danger buttons on their own tint, the counts on the active
+    /// sidebar row, and the picked option in a segmented control at 4.5:1.
+    /// </summary>
+    [AvaloniaTheory]
+    [MemberData(nameof(ThemeIds))]
+    public void Controls_states_and_tints_reach_the_bar(string id)
+    {
+        var theme = ThemeCatalog.All.Single(palette => palette.Id == id);
+        var variant = ThemeBuilder.Variant(theme);
+        Color Key(string key) => Resolve(key, variant);
+        var failures = new List<string>();
+
+        void Check(string what, Color foreground, Color background, string on, double minimum)
+        {
+            var ratio = Contrast(foreground, background);
+            if (ratio < minimum)
+            {
+                failures.Add($"{what} on {on}: {ratio:0.00} < {minimum}");
+            }
+        }
+
+        var surfaces = new[] { "Bg0Brush", "Bg1Brush", "Bg2Brush", "Bg3Brush", "BgInsetBrush" };
+        foreach (var surface in surfaces)
+        {
+            Check("ControlBorder", Key("ControlBorderBrush"), Key(surface), surface, 3);
+            Check("Accent", Key("AccentBrush"), Key(surface), surface, 3);
+        }
+
+        foreach (var tone in new[] { "Lavender", "Sky", "Pink", "Peach", "Mint", "Blue", "Amber", "Critical" })
+        {
+            foreach (var surface in new[] { "Bg1Brush", "Bg2Brush", "Bg3Brush" })
+            {
+                Check($"{tone}Text", Key($"{tone}TextBrush"), Over(Key($"{tone}SubtleBrush"), Key(surface)), $"{tone}Subtle over {surface}", 4.5);
+            }
+        }
+
+        Check("Text2", Key("Text2Brush"), Key("Bg4Brush"), "Bg4", 4.5);
+        foreach (var surface in new[] { "BgInsetBrush", "Bg1Brush", "Bg2Brush" })
+        {
+            Check("Text1", Key("Text1Brush"), Over(Key("AccentSubtleBrush"), Key(surface)), $"AccentSubtle over {surface}", 4.5);
+        }
+
+        Assert.True(failures.Count == 0, $"{theme.Name}:\n" + string.Join("\n", failures));
+    }
+
+    /// <summary>A translucent color laid over an opaque one.</summary>
+    private static Color Over(Color top, Color bottom)
+    {
+        var alpha = top.A / 255.0;
+        byte Blend(byte front, byte back) => (byte)Math.Round((front * alpha) + (back * (1 - alpha)));
+        return Color.FromRgb(Blend(top.R, bottom.R), Blend(top.G, bottom.G), Blend(top.B, bottom.B));
+    }
+
     [AvaloniaFact]
     public async Task Picking_a_theme_restyles_the_app_at_once_and_is_remembered()
     {