diff --git a/CLAUDE.md b/CLAUDE.md
index 60dceef..baeee9d 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -4,7 +4,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## Build / Run
 
-The project is a WPF app targeting `net8.0-windows`. `EnableWindowsTargeting=true` is set in the csproj so it can be restored/built on non-Windows agents, but it can only be **run** on Windows.
+The project is a WPF app targeting `net10.0-windows`. `EnableWindowsTargeting=true` is set in the csproj so it can be restored/built on non-Windows agents, but it can only be **run** on Windows.
 
 ```powershell
 dotnet restore MoneyShot/MoneyShot.csproj
@@ -22,6 +22,17 @@ The base version lives in `MoneyShot/MoneyShot.csproj` (`<Version>`, `<AssemblyV
 
 ## Architecture
 
+### Theme & rendering rules (CocoaTheme)
+
+All visual styling lives in `MoneyShot/Themes/CocoaTheme.xaml` (merged in `App.xaml`): the cocoa-brown palette, vector icon geometries, and every control style (`ToolButton`, `AccentButton`, `SubtleButton`, `TitleBarButton`, `ColorSwatch`, `CocoaCheckBox`, `CocoaComboBox`, `CocoaSlider`, etc.). Rules:
+
+- **Never reintroduce `AllowsTransparency="True"`** on a window. Layered windows are composed in software for the whole surface — this was the editor's main source of lag. Custom title bars are done with `WindowChrome` (`CaptionHeight=0`, `GlassFrameThickness="0,0,0,1"` to keep the DWM shadow/rounded corners) plus `DragMove()` in the title-bar handler.
+- **No `DropShadowEffect`/`BlurEffect`** — WPF bitmap effects force per-element software rendering. Depth comes from the palette (surface vs. window colors), not shadows.
+- New surfaces pick brushes from the theme (`Cocoa.*Brush`); don't inline hex colors in views. (`RegionSelector.xaml` is the deliberate exception — it's a self-contained full-screen overlay.)
+- Icons are `Geometry` resources (`Icon.*`) rendered through the `ToolIcon`/`ToolIconFilled`/`CaptionIcon` Path styles — not emoji, which render inconsistently via font fallback.
+- Code-behind looks styles up with `FindResource` (App-scoped), not `Resources[...]` (window-scoped).
+- The pixelate tool (`CanvasRenderer.CreatePixelatedBrush`) copies only the covered region's pixels once and block-averages in that buffer. Don't go back to rendering the full image into a `RenderTargetBitmap` — at 4K that allocated ~33 MB per pixelation plus a `CroppedBitmap` per block.
+
 ### Two windows + service layer (no DI, no MVVM framework)
 
 Services are instantiated directly in `MainWindow` (`MainWindow.xaml.cs:31-35`). There is no DI container and no MVVM library — XAML is wired with code-behind throughout. New services should be added the same way; don't introduce a container for one or two extra dependencies.
@@ -62,7 +73,9 @@ Version comparison is **SemVer-only** (Major.Minor.Patch via `CompareSemVer`) 
 
 If a release lacks `SHA256SUMS.txt` (older releases), the update is allowed through with a logged warning rather than refused. New releases generated by `release.yml` always include it.
 
-The optional GitHub token read at line 50 is intentionally `Environment.GetEnvironmentVariable("")` — i.e. disabled. If you wire one up, do it through a real env-var name and treat it as a secret.
+An optional GitHub token is read from the `MONEYSHOT_GITHUB_TOKEN` environment variable (higher API rate limit). Treat it as a secret — never log it.
+
+**The repo/owner constants must track the repository's current name** (`Daolyap/Money-Shot` since the rename). GitHub redirects an old repo name only until someone re-registers it — at which point they own the update channel (repojacking). Update the constants immediately on any rename.
 
 ### Editor undo model
 
diff --git a/MoneyShot.Tests/SaveServiceTests.cs b/MoneyShot.Tests/SaveServiceTests.cs
new file mode 100644
index 0000000..9a06ef3
--- /dev/null
+++ b/MoneyShot.Tests/SaveServiceTests.cs
@@ -0,0 +1,64 @@
+using System.IO;
+using MoneyShot.Services;
+using Xunit;
+
+namespace MoneyShot.Tests;
+
+public class SaveServiceTests
+{
+    private readonly SaveService _service = new();
+
+    // Path validation runs before the image is touched, so a null image never reaches the
+    // encoder for these rejection cases — no WPF/STA setup needed.
+
+    [Fact]
+    public void SaveToFile_InsideWindowsDirectory_IsRejected()
+    {
+        var windows = Environment.GetFolderPath(Environment.SpecialFolder.Windows);
+        var path = Path.Combine(windows, "moneyshot-test.png");
+        Assert.Throws<ArgumentException>(() => _service.SaveToFile(null!, path));
+    }
+
+    [Fact]
+    public void SaveToFile_NestedUnderSystemDirectory_IsRejected()
+    {
+        var system = Environment.GetFolderPath(Environment.SpecialFolder.System);
+        var path = Path.Combine(system, "drivers", "moneyshot-test.png");
+        Assert.Throws<ArgumentException>(() => _service.SaveToFile(null!, path));
+    }
+
+    [Theory]
+    [InlineData("")]
+    [InlineData("   ")]
+    public void SaveToFile_EmptyPath_IsRejected(string path)
+    {
+        Assert.Throws<ArgumentException>(() => _service.SaveToFile(null!, path));
+    }
+
+    [Fact]
+    public void SaveToFile_BareDirectoryPath_IsRejected()
+    {
+        Assert.Throws<ArgumentException>(() => _service.SaveToFile(null!, Path.GetTempPath()));
+    }
+
+    [Fact]
+    public void SaveToFile_UserWritablePath_PassesValidation()
+    {
+        // With a valid path, validation must NOT throw ArgumentException; the failure (if any)
+        // comes from the null image and is wrapped as InvalidOperationException.
+        var path = Path.Combine(Path.GetTempPath(), "moneyshot-test.png");
+        var ex = Record.Exception(() => _service.SaveToFile(null!, path));
+        Assert.IsType<InvalidOperationException>(ex);
+    }
+
+    [Theory]
+    [InlineData("PNG", ".png")]
+    [InlineData("JPG", ".jpg")]
+    [InlineData("BMP", ".bmp")]
+    public void GenerateFileName_UsesLowercaseExtension(string format, string expectedExtension)
+    {
+        var name = _service.GenerateFileName(format);
+        Assert.StartsWith("Screenshot_", name);
+        Assert.EndsWith(expectedExtension, name);
+    }
+}
diff --git a/MoneyShot.Tests/SettingsServiceTests.cs b/MoneyShot.Tests/SettingsServiceTests.cs
index f2d494b..be1118d 100644
--- a/MoneyShot.Tests/SettingsServiceTests.cs
+++ b/MoneyShot.Tests/SettingsServiceTests.cs
@@ -10,6 +10,19 @@ public class SettingsServiceTests
     private static readonly string MyPictures =
         Environment.GetFolderPath(Environment.SpecialFolder.MyPictures);
 
+    [Theory]
+    [InlineData(-5, 0)]
+    [InlineData(0, 0)]
+    [InlineData(50, 50)]
+    [InlineData(500, 500)]
+    [InlineData(100_000, 500)]
+    public void HistoryRetentionCount_IsClampedToUiRange(int input, int expected)
+    {
+        var settings = new AppSettings { HistoryRetentionCount = input };
+        var sanitized = SettingsService.ValidateAndSanitizeSettings(settings);
+        Assert.Equal(expected, sanitized.HistoryRetentionCount);
+    }
+
     [Fact]
     public void EmptyDefaultSavePath_FallsBackToMyPictures()
     {
diff --git a/MoneyShot/App.xaml b/MoneyShot/App.xaml
index 0455290..cbc54fe 100644
--- a/MoneyShot/App.xaml
+++ b/MoneyShot/App.xaml
@@ -1,9 +1,20 @@
-<Application x:Class="MoneyShot.App"
+<Application x:Class="MoneyShot.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:MoneyShot"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-         
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Themes/CocoaTheme.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+
+            <!-- Implicit styles so tooltips, scrollbars and menus are themed everywhere without
+                 per-window opt-in. -->
+            <Style TargetType="ToolTip" BasedOn="{StaticResource CocoaToolTip}"/>
+            <Style TargetType="ScrollBar" BasedOn="{StaticResource CocoaScrollBar}"/>
+            <Style TargetType="ContextMenu" BasedOn="{StaticResource CocoaContextMenu}"/>
+            <Style TargetType="MenuItem" BasedOn="{StaticResource CocoaMenuItem}"/>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/MoneyShot/App.xaml.cs b/MoneyShot/App.xaml.cs
index dff182c..fb8a38c 100644
--- a/MoneyShot/App.xaml.cs
+++ b/MoneyShot/App.xaml.cs
@@ -1,5 +1,3 @@
-using System.Configuration;
-using System.Data;
 using System.Windows;
 using System.Threading;
 
@@ -11,14 +9,16 @@ namespace MoneyShot;
 public partial class App : Application
 {
     private static Mutex? _mutex;
-    
+    private static bool _ownsMutex;
+
     protected override void OnStartup(StartupEventArgs e)
     {
         // Create a unique mutex name for the application
         const string mutexName = "MoneyShot_SingleInstance_Mutex_3E6F8A2D";
-        
+
         _mutex = new Mutex(true, mutexName, out bool createdNew);
-        
+        _ownsMutex = createdNew;
+
         if (!createdNew)
         {
             // Another instance is already running
@@ -30,15 +30,20 @@ protected override void OnStartup(StartupEventArgs e)
             Shutdown();
             return;
         }
-        
+
         base.OnStartup(e);
     }
-    
+
     protected override void OnExit(ExitEventArgs e)
     {
-        _mutex?.ReleaseMutex();
+        // Only the instance that actually acquired the mutex may release it — calling
+        // ReleaseMutex without ownership throws and would crash the "already running"
+        // second instance on its way out.
+        if (_ownsMutex)
+        {
+            _mutex?.ReleaseMutex();
+        }
         _mutex?.Dispose();
         base.OnExit(e);
     }
 }
-
diff --git a/MoneyShot/Editor/CanvasRenderer.cs b/MoneyShot/Editor/CanvasRenderer.cs
index a104cef..4635149 100644
--- a/MoneyShot/Editor/CanvasRenderer.cs
+++ b/MoneyShot/Editor/CanvasRenderer.cs
@@ -52,56 +52,86 @@ public static BitmapSource CaptureCanvasAsImage(FrameworkElement imageCanvas, Bi
     }
 
     /// <summary>
-    /// Builds an ImageBrush whose contents are a downsampled version of the area beneath the
+    /// Builds an ImageBrush whose contents are a block-averaged version of the area beneath the
     /// supplied rectangle, producing the classic "censor bar" pixelation effect.
+    ///
+    /// Performance note: the previous implementation rendered the ENTIRE screenshot into a
+    /// RenderTargetBitmap (~33 MB at 4K) and allocated a CroppedBitmap per block. This version
+    /// copies only the covered region once and averages blocks in that single buffer, which is
+    /// both faster on mouse-up and a large RAM saving.
     /// </summary>
     public static Brush CreatePixelatedBrush(Rectangle pixelateRect, BitmapSource originalImage)
     {
-        var left = CanvasPosition.GetLeft(pixelateRect);
-        var top = CanvasPosition.GetTop(pixelateRect);
-
+        var left = (int)Math.Round(CanvasPosition.GetLeft(pixelateRect));
+        var top = (int)Math.Round(CanvasPosition.GetTop(pixelateRect));
         var width = (int)pixelateRect.Width;
         var height = (int)pixelateRect.Height;
         if (width <= 0 || height <= 0) return pixelateRect.Fill;
 
         try
         {
-            var renderBitmap = new RenderTargetBitmap(originalImage.PixelWidth, originalImage.PixelHeight, RenderDpi, RenderDpi, PixelFormats.Pbgra32);
-            var visual = new DrawingVisual();
-            using (var dc = visual.RenderOpen())
-            {
-                dc.DrawImage(originalImage, new Rect(0, 0, originalImage.PixelWidth, originalImage.PixelHeight));
-            }
-            renderBitmap.Render(visual);
-
-            var pixelatedBitmap = new RenderTargetBitmap(width, height, RenderDpi, RenderDpi, PixelFormats.Pbgra32);
-            var drawingVisual = new DrawingVisual();
-            using (var drawingContext = drawingVisual.RenderOpen())
+            // Clamp the sampled region to the image; the brush stretches to the rect, so a
+            // rectangle that hangs off the image edge still gets full coverage.
+            var srcX = Math.Max(0, Math.Min(left, originalImage.PixelWidth - 1));
+            var srcY = Math.Max(0, Math.Min(top, originalImage.PixelHeight - 1));
+            var srcW = Math.Min(width, originalImage.PixelWidth - srcX);
+            var srcH = Math.Min(height, originalImage.PixelHeight - srcY);
+            if (srcW <= 0 || srcH <= 0) return pixelateRect.Fill;
+
+            BitmapSource source = originalImage.Format == PixelFormats.Bgra32 || originalImage.Format == PixelFormats.Pbgra32
+                ? originalImage
+                : new FormatConvertedBitmap(originalImage, PixelFormats.Bgra32, null, 0);
+
+            var stride = srcW * 4;
+            var pixels = new byte[stride * srcH];
+            source.CopyPixels(new Int32Rect(srcX, srcY, srcW, srcH), pixels, stride, 0);
+
+            // Average each block, then write the averaged colour back over the block's pixels.
+            for (var blockTop = 0; blockTop < srcH; blockTop += PixelateBlockSize)
             {
-                for (int y = 0; y < height; y += PixelateBlockSize)
+                var blockH = Math.Min(PixelateBlockSize, srcH - blockTop);
+                for (var blockLeft = 0; blockLeft < srcW; blockLeft += PixelateBlockSize)
                 {
-                    for (int x = 0; x < width; x += PixelateBlockSize)
-                    {
-                        var blockWidth = Math.Min(PixelateBlockSize, width - x);
-                        var blockHeight = Math.Min(PixelateBlockSize, height - y);
+                    var blockW = Math.Min(PixelateBlockSize, srcW - blockLeft);
 
-                        var sampleX = (int)(left + x + blockWidth / 2);
-                        var sampleY = (int)(top + y + blockHeight / 2);
-                        sampleX = Math.Max(0, Math.Min(sampleX, originalImage.PixelWidth - 1));
-                        sampleY = Math.Max(0, Math.Min(sampleY, originalImage.PixelHeight - 1));
+                    long sumB = 0, sumG = 0, sumR = 0;
+                    for (var y = 0; y < blockH; y++)
+                    {
+                        var offset = (blockTop + y) * stride + blockLeft * 4;
+                        for (var x = 0; x < blockW; x++)
+                        {
+                            sumB += pixels[offset];
+                            sumG += pixels[offset + 1];
+                            sumR += pixels[offset + 2];
+                            offset += 4;
+                        }
+                    }
 
-                        var croppedBitmap = new CroppedBitmap(renderBitmap, new Int32Rect(sampleX, sampleY, 1, 1));
-                        var pixels = new byte[4];
-                        croppedBitmap.CopyPixels(pixels, 4, 0);
+                    var count = blockW * blockH;
+                    var b = (byte)(sumB / count);
+                    var g = (byte)(sumG / count);
+                    var r = (byte)(sumR / count);
 
-                        var color = Color.FromArgb(pixels[3], pixels[2], pixels[1], pixels[0]);
-                        drawingContext.DrawRectangle(new SolidColorBrush(color), null, new Rect(x, y, blockWidth, blockHeight));
+                    for (var y = 0; y < blockH; y++)
+                    {
+                        var offset = (blockTop + y) * stride + blockLeft * 4;
+                        for (var x = 0; x < blockW; x++)
+                        {
+                            pixels[offset] = b;
+                            pixels[offset + 1] = g;
+                            pixels[offset + 2] = r;
+                            pixels[offset + 3] = 0xFF;
+                            offset += 4;
+                        }
                     }
                 }
             }
-            pixelatedBitmap.Render(drawingVisual);
 
-            return new ImageBrush(pixelatedBitmap) { Stretch = Stretch.Fill };
+            var pixelated = BitmapSource.Create(srcW, srcH, RenderDpi, RenderDpi, PixelFormats.Bgra32, null, pixels, stride);
+            pixelated.Freeze();
+            var brush = new ImageBrush(pixelated) { Stretch = Stretch.Fill };
+            brush.Freeze();
+            return brush;
         }
         catch (ArgumentException)
         {
diff --git a/MoneyShot/MainWindow.xaml b/MoneyShot/MainWindow.xaml
index 7c6cf2d..d646861 100644
--- a/MoneyShot/MainWindow.xaml
+++ b/MoneyShot/MainWindow.xaml
@@ -5,192 +5,143 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:MoneyShot"
         mc:Ignorable="d"
-        Title="Money Shot - Screenshot Tool" Height="600" Width="750"
-        MinHeight="500" MinWidth="650"
+        Title="Money Shot" Height="600" Width="720"
+        MinHeight="500" MinWidth="600"
         WindowStartupLocation="CenterScreen"
-        Background="Transparent"
-        AllowsTransparency="True"
+        Background="{StaticResource Cocoa.WindowBrush}"
+        Foreground="{StaticResource Cocoa.TextBrush}"
+        FontFamily="Segoe UI"
         WindowStyle="None"
         ResizeMode="CanResize"
+        UseLayoutRounding="True"
+        TextOptions.TextFormattingMode="Display"
         StateChanged="Window_StateChanged"
         Closing="Window_Closing">
-    <Window.Resources>
-        <!-- Glassmorphism Button Style -->
-        <Style x:Key="GlassButton" TargetType="Button">
-            <Setter Property="Background">
-                <Setter.Value>
-                    <SolidColorBrush Color="#40FFFFFF" Opacity="0.15"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderBrush">
-                <Setter.Value>
-                    <SolidColorBrush Color="#80FFFFFF" Opacity="0.3"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding" Value="8,5"/>
-            <Setter Property="Margin" Value="2"/>
-            <Setter Property="FontSize" Value="12"/>
-            <Setter Property="FontWeight" Value="Medium"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Effect">
-                <Setter.Value>
-                    <DropShadowEffect Color="Black" Direction="270" ShadowDepth="2" Opacity="0.3" BlurRadius="8"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="6"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background">
-                        <Setter.Value>
-                            <SolidColorBrush Color="#60FFFFFF" Opacity="0.25"/>
-                        </Setter.Value>
-                    </Setter>
-                </Trigger>
-                <Trigger Property="IsPressed" Value="True">
-                    <Setter Property="Background">
-                        <Setter.Value>
-                            <SolidColorBrush Color="#80FFFFFF" Opacity="0.35"/>
-                        </Setter.Value>
-                    </Setter>
-                </Trigger>
-            </Style.Triggers>
-        </Style>
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="0"
+                      ResizeBorderThickness="6"
+                      GlassFrameThickness="0,0,0,1"
+                      CornerRadius="0"
+                      UseAeroCaptionButtons="False"/>
+    </WindowChrome.WindowChrome>
 
-        <!-- Primary Action Button Style -->
-        <Style x:Key="PrimaryButton" TargetType="Button" BasedOn="{StaticResource GlassButton}">
-            <Setter Property="Background">
-                <Setter.Value>
-                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                        <GradientStop Color="#0E639C" Offset="0"/>
-                        <GradientStop Color="#1177BB" Offset="1"/>
-                    </LinearGradientBrush>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="FontSize" Value="16"/>
-            <Setter Property="Padding" Value="20,15"/>
-        </Style>
-    </Window.Resources>
-    
-    <Border CornerRadius="12" BorderThickness="1">
-        <Border.BorderBrush>
-            <SolidColorBrush Color="White" Opacity="0.2"/>
-        </Border.BorderBrush>
-        <Border.Background>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" Opacity="0.95">
-                <GradientStop Color="#1a1a2e" Offset="0"/>
-                <GradientStop Color="#16213e" Offset="0.5"/>
-                <GradientStop Color="#0f3460" Offset="1"/>
-            </LinearGradientBrush>
-        </Border.Background>
-        <Border.Effect>
-            <DropShadowEffect Color="Black" Direction="270" ShadowDepth="10" Opacity="0.5" BlurRadius="30"/>
-        </Border.Effect>
-        
-        <Grid Margin="1">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
 
-            <!-- Window Title Bar -->
-            <Border Grid.Row="0" Background="#20FFFFFF" BorderBrush="#30FFFFFF" BorderThickness="0,0,0,1" 
-                    CornerRadius="12,12,0,0" MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
-                <Grid Height="35">
-                    <TextBlock Text="💰 Money Shot - Screenshot Tool" 
-                               Foreground="White" 
-                               FontSize="14" 
-                               FontWeight="SemiBold"
-                               VerticalAlignment="Center" 
-                               Margin="15,0,0,0"/>
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,5,0">
-                        <Button Content="🗕" Click="Minimize_Click" Style="{StaticResource GlassButton}" 
-                                Width="40" Height="28" Padding="0" Margin="2,0"/>
-                        <Button Content="🗖" Name="MaximizeRestoreButton" Click="MaximizeRestore_Click" Style="{StaticResource GlassButton}" 
-                                Width="40" Height="28" Padding="0" Margin="2,0"/>
-                        <Button Content="🗙" Click="Close_Click" Style="{StaticResource GlassButton}" 
-                                Width="40" Height="28" Padding="0" Margin="2,0"/>
-                    </StackPanel>
-                </Grid>
-            </Border>
+        <!-- ░░ Title bar ░░ -->
+        <Border Grid.Row="0" Background="{StaticResource Cocoa.TitleBarBrush}"
+                BorderBrush="{StaticResource Cocoa.BorderSubtleBrush}" BorderThickness="0,0,0,1"
+                MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
+            <Grid Height="32">
+                <TextBlock Text="Money Shot" FontSize="12.5" FontWeight="SemiBold"
+                           Foreground="{StaticResource Cocoa.TextBrush}"
+                           VerticalAlignment="Center" Margin="14,0,0,0"/>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Click="Minimize_Click" Style="{StaticResource TitleBarButton}" Focusable="False">
+                        <Path Style="{StaticResource CaptionIcon}" Data="{StaticResource Icon.WindowMinimize}"/>
+                    </Button>
+                    <Button Name="MaximizeRestoreButton" Click="MaximizeRestore_Click"
+                            Style="{StaticResource TitleBarButton}" Focusable="False">
+                        <Path Name="MaximizeRestoreIcon" Style="{StaticResource CaptionIcon}"
+                              Data="{StaticResource Icon.WindowMaximize}"/>
+                    </Button>
+                    <Button Click="Close_Click" Style="{StaticResource TitleBarCloseButton}" Focusable="False">
+                        <Path Style="{StaticResource CaptionIcon}" Data="{StaticResource Icon.WindowClose}"/>
+                    </Button>
+                </StackPanel>
+            </Grid>
+        </Border>
 
-            <!-- Main Content -->
-            <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
-                <ScrollViewer.Background>
-                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" Opacity="0.3">
-                        <GradientStop Color="#0a0a0a" Offset="0"/>
-                        <GradientStop Color="#1a1a1a" Offset="1"/>
-                    </LinearGradientBrush>
-                </ScrollViewer.Background>
-                <Grid Margin="30,20">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
+        <!-- ░░ Content ░░ -->
+        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
+            <Grid Margin="36,28">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
 
-                    <!-- Header -->
-                    <StackPanel Grid.Row="0" Margin="0,0,0,30">
-                        <TextBlock Text="💰 Money Shot" FontSize="36" FontWeight="Bold" Foreground="White" HorizontalAlignment="Center"/>
-                        <TextBlock Text="Modern Screenshot Tool for Windows 11+" FontSize="14" Foreground="#AAAAAA" HorizontalAlignment="Center" Margin="0,5,0,0"/>
-                    </StackPanel>
+                <!-- Header -->
+                <StackPanel Grid.Row="0" Margin="0,0,0,26">
+                    <TextBlock Text="Money Shot" FontSize="30" FontWeight="Bold"
+                               Foreground="{StaticResource Cocoa.TextBrush}" HorizontalAlignment="Center"/>
+                    <TextBlock Text="Capture, annotate, and share screenshots"
+                               FontSize="13" Foreground="{StaticResource Cocoa.TextSecondaryBrush}"
+                               HorizontalAlignment="Center" Margin="0,6,0,0"/>
+                </StackPanel>
 
-                    <!-- Capture Options -->
-                    <StackPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center">
-                        <Border Background="#15FFFFFF" BorderBrush="#25FFFFFF" BorderThickness="1" CornerRadius="12" Padding="30" Margin="0,0,0,20" MaxWidth="600">
-                            <Border.Effect>
-                                <DropShadowEffect Color="Black" Direction="270" ShadowDepth="3" Opacity="0.4" BlurRadius="15"/>
-                            </Border.Effect>
-                            <StackPanel>
-                                <TextBlock Text="Capture Options" FontSize="20" FontWeight="Bold" Foreground="White" Margin="0,0,0,20" HorizontalAlignment="Center"/>
-                                
-                                <Button Name="CaptureFullScreenButton" Content="📸 Capture Full Screen" Click="CaptureFullScreen_Click" 
-                                        Style="{StaticResource PrimaryButton}" Margin="0,5" MinWidth="300">
-                                    <Button.ToolTip>
-                                        <ToolTip Content="Capture all screens (Hotkey: Print Screen)"/>
-                                    </Button.ToolTip>
-                                </Button>
-                                
-                                <Button Name="CaptureRegionButton" Content="✂️ Capture Region" Click="CaptureRegion_Click" 
-                                        Style="{StaticResource PrimaryButton}" Margin="0,5" MinWidth="300">
-                                    <Button.ToolTip>
-                                        <ToolTip Content="Select a region to capture (Hotkey: Ctrl+Print Screen)"/>
-                                    </Button.ToolTip>
-                                </Button>
-                                
-                                <!-- Individual Monitor Captures (populated dynamically) -->
-                                <StackPanel Name="MonitorButtonsPanel" Margin="0,10,0,0"/>
-                            </StackPanel>
-                        </Border>
+                <!-- Capture options -->
+                <StackPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center">
+                    <Border Style="{StaticResource CocoaCard}" Padding="26" Margin="0,0,0,18" MinWidth="380" MaxWidth="520">
+                        <StackPanel>
+                            <TextBlock Text="Capture" FontSize="15" FontWeight="SemiBold"
+                                       Foreground="{StaticResource Cocoa.TextBrush}" Margin="0,0,0,16"/>
 
-                        <!-- Quick Actions -->
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                            <Button Content="⚙️ Settings" Click="Settings_Click" Style="{StaticResource GlassButton}" Padding="15,10" Margin="5"/>
-                            <Button Content="🔄 Check for Updates" Click="CheckForUpdates_Click" Style="{StaticResource GlassButton}" Padding="15,10" Margin="5"/>
-                            <Button Content="ℹ️ About" Click="About_Click" Style="{StaticResource GlassButton}" Padding="15,10" Margin="5"/>
+                            <Button Name="CaptureFullScreenButton" Click="CaptureFullScreen_Click"
+                                    Style="{StaticResource AccentButton}" Padding="16,11" Margin="0,0,0,8"
+                                    HorizontalContentAlignment="Left"
+                                    ToolTip="Capture all screens (hotkey: Print Screen)">
+                                <StackPanel Orientation="Horizontal">
+                                    <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Camera}"
+                                          Stroke="{StaticResource Cocoa.OnAccentBrush}"/>
+                                    <TextBlock Text="Capture full screen" FontSize="13" Margin="10,0,0,0" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </Button>
+
+                            <Button Name="CaptureRegionButton" Click="CaptureRegion_Click"
+                                    Style="{StaticResource AccentButton}" Padding="16,11"
+                                    HorizontalContentAlignment="Left"
+                                    ToolTip="Select a region to capture (hotkey: Ctrl+Print Screen)">
+                                <StackPanel Orientation="Horizontal">
+                                    <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Region}"
+                                          Stroke="{StaticResource Cocoa.OnAccentBrush}"/>
+                                    <TextBlock Text="Capture region" FontSize="13" Margin="10,0,0,0" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </Button>
+
+                            <!-- Individual monitor captures (populated dynamically) -->
+                            <StackPanel Name="MonitorButtonsPanel" Margin="0,4,0,0"/>
                         </StackPanel>
-                    </StackPanel>
+                    </Border>
 
-                    <!-- Footer -->
-                    <StackPanel Grid.Row="2" Margin="0,20,0,10">
-                        <TextBlock Text="Tip: Hotkeys are customizable in Settings" 
-                                   FontSize="12" Foreground="#888888" HorizontalAlignment="Center" TextWrapping="Wrap"/>
+                    <!-- Quick actions -->
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                        <Button Click="Settings_Click" Style="{StaticResource SubtleButton}" Padding="13,8" Margin="4,0">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Settings}"/>
+                                <TextBlock Text="Settings" Margin="7,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                        <Button Click="History_Click" Style="{StaticResource SubtleButton}" Padding="13,8" Margin="4,0">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.History}"/>
+                                <TextBlock Text="History" Margin="7,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                        <Button Click="CheckForUpdates_Click" Style="{StaticResource SubtleButton}" Padding="13,8" Margin="4,0">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Refresh}"/>
+                                <TextBlock Text="Updates" Margin="7,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                        <Button Click="About_Click" Style="{StaticResource SubtleButton}" Padding="13,8" Margin="4,0">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Info}"/>
+                                <TextBlock Text="About" Margin="7,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
                     </StackPanel>
-                </Grid>
-            </ScrollViewer>
-        </Grid>
-    </Border>
+                </StackPanel>
+
+                <!-- Footer -->
+                <TextBlock Grid.Row="2" Margin="0,22,0,4"
+                           Text="Tip: hotkeys are customizable in Settings — the app keeps running in the system tray."
+                           FontSize="11.5" Foreground="{StaticResource Cocoa.TextMutedBrush}"
+                           HorizontalAlignment="Center" TextWrapping="Wrap"/>
+            </Grid>
+        </ScrollViewer>
+    </Grid>
 </Window>
diff --git a/MoneyShot/MainWindow.xaml.cs b/MoneyShot/MainWindow.xaml.cs
index 4c6446d..32b8c66 100644
--- a/MoneyShot/MainWindow.xaml.cs
+++ b/MoneyShot/MainWindow.xaml.cs
@@ -135,44 +135,47 @@ private async Task CheckForUpdatesAsync(bool showUpToDateMessage, bool showError
     private void PopulateMonitorButtons()
     {
         var screens = _screenshotService.GetAllScreens();
-        if (screens.Count > 1)
+        if (screens.Count <= 1) return;
+
+        var label = new TextBlock
+        {
+            Text = "Individual monitors",
+            FontSize = 12,
+            Foreground = (Brush)FindResource("Cocoa.TextSecondaryBrush"),
+            Margin = new Thickness(0, 10, 0, 6)
+        };
+        MonitorButtonsPanel.Children.Add(label);
+
+        var subtleStyle = (Style)FindResource("SubtleButton");
+        var monitorIcon = (Geometry)FindResource("Icon.Monitor");
+        var iconStyle = (Style)FindResource("ToolIcon");
+        for (int i = 0; i < screens.Count; i++)
         {
-            var separator = new Separator
+            var screenIndex = i;
+            var screen = screens[i];
+            var isPrimary = screen.Primary ? "  ·  primary" : string.Empty;
+            var hotkeyHint = screenIndex < MaxMonitorHotkeys ? $"Ctrl+Shift+{screenIndex + 1}" : null;
+
+            var content = new StackPanel { Orientation = System.Windows.Controls.Orientation.Horizontal };
+            content.Children.Add(new System.Windows.Shapes.Path { Style = iconStyle, Data = monitorIcon });
+            content.Children.Add(new TextBlock
             {
-                Margin = new Thickness(0, 10, 0, 5),
-                Background = new SolidColorBrush(Color.FromRgb(85, 85, 85))
-            };
-            MonitorButtonsPanel.Children.Add(separator);
+                Text = $"Monitor {i + 1}{isPrimary}",
+                Margin = new Thickness(9, 0, 0, 0),
+                VerticalAlignment = System.Windows.VerticalAlignment.Center
+            });
 
-            var label = new TextBlock
+            var button = new System.Windows.Controls.Button
             {
-                Text = "Individual Monitors:",
-                FontSize = 14,
-                Foreground = new SolidColorBrush(Colors.White),
-                Margin = new Thickness(0, 5, 0, 5),
-                HorizontalAlignment = System.Windows.HorizontalAlignment.Center
+                Content = content,
+                Style = subtleStyle,
+                Padding = new Thickness(14, 9, 14, 9),
+                Margin = new Thickness(0, 3, 0, 3),
+                HorizontalContentAlignment = System.Windows.HorizontalAlignment.Left,
+                ToolTip = hotkeyHint == null ? null : $"Capture this monitor (hotkey: {hotkeyHint})"
             };
-            MonitorButtonsPanel.Children.Add(label);
-
-            for (int i = 0; i < screens.Count; i++)
-            {
-                var screenIndex = i;
-                var screen = screens[i];
-                var isPrimary = screen.Primary ? " (Primary)" : "";
-                var button = new System.Windows.Controls.Button
-                {
-                    Content = $"🖥️ Monitor {i + 1}{isPrimary}",
-                    Padding = new Thickness(20, 10, 20, 10),
-                    Margin = new Thickness(0, 3, 0, 3),
-                    FontSize = 14,
-                    Background = new SolidColorBrush(Color.FromRgb(62, 62, 66)),
-                    Foreground = new SolidColorBrush(Colors.White),
-                    BorderBrush = new SolidColorBrush(Color.FromRgb(85, 85, 85)),
-                    Cursor = System.Windows.Input.Cursors.Hand
-                };
-                button.Click += (s, ev) => CaptureMonitor(screenIndex);
-                MonitorButtonsPanel.Children.Add(button);
-            }
+            button.Click += (s, ev) => CaptureMonitor(screenIndex);
+            MonitorButtonsPanel.Children.Add(button);
         }
     }
 
@@ -389,36 +392,11 @@ private void OpenEditor(System.Windows.Media.Imaging.BitmapSource screenshot, st
         finally
         {
             // The editor's BitmapSource backings, RenderTargetBitmaps and pixelate brushes live in
-            // both managed and native heaps. Without forcing a collection plus a working-set trim,
-            // the process sits at several hundred MB until the next major GC — undesirable for a
-            // tray app that should hover near 80MB while idle.
-            ReleaseEditorMemory();
-        }
-    }
-
-    private static void ReleaseEditorMemory()
-    {
-        try
-        {
-            System.Runtime.GCSettings.LargeObjectHeapCompactionMode =
-                System.Runtime.GCLargeObjectHeapCompactionMode.CompactOnce;
-            GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, blocking: true, compacting: true);
-            GC.WaitForPendingFinalizers();
-            GC.Collect();
-
-            // Ask Windows to trim the working set. -1, -1 is the documented "trim now" sentinel.
-            using var process = System.Diagnostics.Process.GetCurrentProcess();
-            SetProcessWorkingSetSize(process.Handle, new IntPtr(-1), new IntPtr(-1));
-        }
-        catch (Exception ex)
-        {
-            MoneyShot.Services.Logger.Warn("Could not release editor memory", ex);
+            // both managed and native heaps — see MemoryTrimmer for why this is forced here.
+            MemoryTrimmer.TrimAfterEditorClose();
         }
     }
 
-    [System.Runtime.InteropServices.DllImport("kernel32.dll", SetLastError = true)]
-    private static extern bool SetProcessWorkingSetSize(IntPtr proc, IntPtr min, IntPtr max);
-
     private void ShowSettings()
     {
         var settings = new SettingsWindow();
@@ -461,32 +439,30 @@ private void Settings_Click(object sender, RoutedEventArgs e)
         ShowSettings();
     }
 
+    private void History_Click(object sender, RoutedEventArgs e)
+    {
+        ShowHistory();
+    }
+
     private void About_Click(object sender, RoutedEventArgs e)
     {
         var settings = _settingsService.LoadSettings();
         var screens = _screenshotService.GetAllScreens();
-        var monitorHotkeys = screens.Count > 1 ? $"\n• Ctrl+Shift+1-{Math.Min(screens.Count, MaxMonitorHotkeys)} - Capture individual monitors" : "";
-        
+        var monitorHotkeys = screens.Count > 1 ? $"\n• Ctrl+Shift+1-{Math.Min(screens.Count, MaxMonitorHotkeys)} — Capture individual monitors" : "";
+        // SemVer portion only — the 4th part is the CI build number and isn't meaningful to users.
+        var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+        var displayVersion = version == null ? "unknown" : $"{version.Major}.{version.Minor}.{version.Build}";
+
         System.Windows.MessageBox.Show(
-            "Money Shot - Incredible AI Slop\n\n" +
-            "Version 2.0.0\n\n" +
+            "Money Shot — screenshot capture and annotation for Windows\n\n" +
+            $"Version {displayVersion}\n" +
             "Developed by Daolyap & iSaluki\n\n" +
-            "Features:\n" +
-            "• Full screen, region, and individual monitor capture\n" +
-            "• Multi-monitor support\n" +
-            "• Rich annotation tools (shapes, text, arrows, numbers, blur)\n" +
-            "• Customizable hotkeys\n" +
-            "• Save to file or clipboard\n" +
-            "• System tray integration\n" +
-            "• Start in tray option\n" +
-            "• Disable default print screen behaviour\n\n" +
-            "Current Hotkeys:\n" +
-            $"• {settings.HotKeyCapture} - Capture full screen\n" +
-            $"• {settings.HotKeyRegionCapture} - Capture region" +
+            "Current hotkeys:\n" +
+            $"• {settings.HotKeyCapture} — Capture full screen\n" +
+            $"• {settings.HotKeyRegionCapture} — Capture region" +
             monitorHotkeys +
-            "\n\nContact:\n" +
-            "Features - https://github.com/daolyap/moneyshot/issues\n" +
-            "Security - moneyshot@daolyap.dev",
+            "\n\nFeedback & issues: https://github.com/Daolyap/Money-Shot/issues\n" +
+            "Security contact: moneyshot@daolyap.dev",
             "About Money Shot",
             MessageBoxButton.OK,
             MessageBoxImage.Information);
@@ -552,21 +528,15 @@ private void MaximizeRestore_Click(object sender, RoutedEventArgs e)
         if (WindowState == WindowState.Maximized)
         {
             WindowState = WindowState.Normal;
-            if (MaximizeRestoreButton != null)
-            {
-                MaximizeRestoreButton.Content = "🗖";
-            }
+            MaximizeRestoreIcon.Data = (Geometry)FindResource("Icon.WindowMaximize");
         }
         else
         {
             WindowState = WindowState.Maximized;
-            if (MaximizeRestoreButton != null)
-            {
-                MaximizeRestoreButton.Content = "🗗";
-            }
+            MaximizeRestoreIcon.Data = (Geometry)FindResource("Icon.WindowRestore");
         }
     }
-    
+
     private void Close_Click(object sender, RoutedEventArgs e)
     {
         Close();
diff --git a/MoneyShot/MoneyShot.csproj b/MoneyShot/MoneyShot.csproj
index c6a3c8d..952a93c 100644
--- a/MoneyShot/MoneyShot.csproj
+++ b/MoneyShot/MoneyShot.csproj
@@ -9,9 +9,9 @@
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>favicon.ico</ApplicationIcon>
-    <Version>2.0.0</Version>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <FileVersion>2.0.0.0</FileVersion>
+    <Version>2.1.0</Version>
+    <AssemblyVersion>2.1.0.0</AssemblyVersion>
+    <FileVersion>2.1.0.0</FileVersion>
     <Company>Daolyap &amp; iSaluki</Company>
     <Authors>Daolyap &amp; iSaluki</Authors>
     <Product>Money Shot Screenshot Tool</Product>
diff --git a/MoneyShot/Services/AutoUpdateService.cs b/MoneyShot/Services/AutoUpdateService.cs
index 740943e..cc7f42b 100644
--- a/MoneyShot/Services/AutoUpdateService.cs
+++ b/MoneyShot/Services/AutoUpdateService.cs
@@ -16,8 +16,12 @@ namespace MoneyShot.Services;
 
 public sealed class AutoUpdateService
 {
+    // SECURITY: must track the repository's CURRENT name. The repo was renamed from
+    // "MoneyShot" to "Money-Shot"; GitHub redirects the old name only until someone
+    // re-registers it, at which point they would control this app's update channel
+    // (repojacking). If the repo is ever renamed again, update this immediately.
     private const string Owner = "Daolyap";
-    private const string Repository = "MoneyShot";
+    private const string Repository = "Money-Shot";
     private const string LatestReleaseUrl = $"https://api.github.com/repos/{Owner}/{Repository}/releases/latest";
     private const string AllReleasesUrl = $"https://api.github.com/repos/{Owner}/{Repository}/releases?per_page=1";
     private static readonly Regex VersionNumberRegex = new(@"\d+", RegexOptions.Compiled);
@@ -48,7 +52,10 @@ public AutoUpdateService(HttpClient? httpClient = null)
             _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github+json"));
         }
 
-        var token = Environment.GetEnvironmentVariable(""); // I can put a GitHub token in here if I want authenticated API requests
+        // Optional: authenticated API requests (higher rate limit). The 401 guidance message
+        // below already documents this variable name. Treat the value as a secret — it is only
+        // ever sent to api.github.com over HTTPS and never logged.
+        var token = Environment.GetEnvironmentVariable("MONEYSHOT_GITHUB_TOKEN");
         if (!string.IsNullOrWhiteSpace(token) && _httpClient.DefaultRequestHeaders.Authorization == null)
         {
             _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Trim());
diff --git a/MoneyShot/Services/HotKeyService.cs b/MoneyShot/Services/HotKeyService.cs
index 7e8076e..da0b381 100644
--- a/MoneyShot/Services/HotKeyService.cs
+++ b/MoneyShot/Services/HotKeyService.cs
@@ -33,6 +33,10 @@ public int RegisterHotKey(uint modifiers, uint key, Action action)
             _hotKeyActions[_currentId] = action;
             return _currentId;
         }
+
+        // Most often the combination is already claimed by another application (or by a
+        // still-running instance). Without this log the hotkey just silently does nothing.
+        Logger.Warn($"RegisterHotKey failed for modifiers=0x{modifiers:X} key=0x{key:X} — combination may be in use by another application.");
         return -1;
     }
 
@@ -59,7 +63,16 @@ private IntPtr HwndHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref
             var id = wParam.ToInt32();
             if (_hotKeyActions.TryGetValue(id, out var action))
             {
-                action?.Invoke();
+                try
+                {
+                    action?.Invoke();
+                }
+                catch (Exception ex)
+                {
+                    // An exception escaping a window-procedure hook can take down the process;
+                    // a failed capture should be logged, not fatal.
+                    Logger.Error("Hotkey action threw", ex);
+                }
                 handled = true;
             }
         }
diff --git a/MoneyShot/Services/Logger.cs b/MoneyShot/Services/Logger.cs
index 411eda5..78a88ff 100644
--- a/MoneyShot/Services/Logger.cs
+++ b/MoneyShot/Services/Logger.cs
@@ -31,9 +31,13 @@ internal static class Logger
 
     private static void Write(string level, string message, Exception? exception)
     {
+        // Errors get the full exception (incl. stack trace) — "ERR ... :: IOException: access
+        // denied" alone is rarely enough to diagnose a user report. Warnings stay single-line.
         var line = exception == null
             ? $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff} [{level}] {message}"
-            : $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff} [{level}] {message} :: {exception.GetType().Name}: {exception.Message}";
+            : level == "ERR"
+                ? $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff} [{level}] {message} :: {exception}"
+                : $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff} [{level}] {message} :: {exception.GetType().Name}: {exception.Message}";
 
         System.Diagnostics.Debug.WriteLine(line);
 
diff --git a/MoneyShot/Services/MemoryTrimmer.cs b/MoneyShot/Services/MemoryTrimmer.cs
new file mode 100644
index 0000000..85eda59
--- /dev/null
+++ b/MoneyShot/Services/MemoryTrimmer.cs
@@ -0,0 +1,35 @@
+using System.Runtime;
+using System.Runtime.InteropServices;
+
+namespace MoneyShot.Services;
+
+/// <summary>
+/// Releases the large native/managed bitmap backings the editor leaves behind and asks Windows
+/// to trim the working set. Without this a tray app that should idle near ~80 MB sits at several
+/// hundred MB after the editor closes, until the next major GC happens on its own schedule.
+/// Shared by every code path that closes an <c>EditorWindow</c> (capture flow and history).
+/// </summary>
+internal static class MemoryTrimmer
+{
+    public static void TrimAfterEditorClose()
+    {
+        try
+        {
+            GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.CompactOnce;
+            GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, blocking: true, compacting: true);
+            GC.WaitForPendingFinalizers();
+            GC.Collect();
+
+            // Ask Windows to trim the working set. -1, -1 is the documented "trim now" sentinel.
+            using var process = System.Diagnostics.Process.GetCurrentProcess();
+            SetProcessWorkingSetSize(process.Handle, new IntPtr(-1), new IntPtr(-1));
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn("Could not release editor memory", ex);
+        }
+    }
+
+    [DllImport("kernel32.dll", SetLastError = true)]
+    private static extern bool SetProcessWorkingSetSize(IntPtr proc, IntPtr min, IntPtr max);
+}
diff --git a/MoneyShot/Services/SaveService.cs b/MoneyShot/Services/SaveService.cs
index 3fe9121..e559889 100644
--- a/MoneyShot/Services/SaveService.cs
+++ b/MoneyShot/Services/SaveService.cs
@@ -27,10 +27,12 @@ public void SaveToFile(BitmapSource image, string filePath, string format = "PNG
         
         try
         {
-            BitmapEncoder? encoder = format.ToUpper() switch
+            BitmapEncoder encoder = format.ToUpper() switch
             {
                 "PNG" => new PngBitmapEncoder(),
-                "JPG" or "JPEG" => new JpegBitmapEncoder(),
+                // Default JPEG quality (75) visibly smears text in screenshots; 90 keeps
+                // UI text legible at a still-reasonable file size.
+                "JPG" or "JPEG" => new JpegBitmapEncoder { QualityLevel = 90 },
                 "BMP" => new BmpBitmapEncoder(),
                 "GIF" => new GifBitmapEncoder(),
                 _ => new PngBitmapEncoder()
@@ -120,9 +122,16 @@ private void ValidateFilePath(string filePath)
             
             foreach (var sysDir in systemDirs)
             {
-                if (!string.IsNullOrEmpty(sysDir) && 
-                    !string.IsNullOrEmpty(directory) && 
-                    directory.StartsWith(sysDir, StringComparison.OrdinalIgnoreCase))
+                if (string.IsNullOrEmpty(sysDir) || string.IsNullOrEmpty(directory))
+                {
+                    continue;
+                }
+
+                // Compare with a trailing separator so "C:\Windows" blocks "C:\Windows\..."
+                // and "C:\Windows" itself, but not sibling folders like "C:\WindowsBackup".
+                var sysDirWithSeparator = Path.TrimEndingDirectorySeparator(sysDir) + Path.DirectorySeparatorChar;
+                var directoryWithSeparator = Path.TrimEndingDirectorySeparator(directory) + Path.DirectorySeparatorChar;
+                if (directoryWithSeparator.StartsWith(sysDirWithSeparator, StringComparison.OrdinalIgnoreCase))
                 {
                     throw new ArgumentException("Cannot save to system directories.", nameof(filePath));
                 }
diff --git a/MoneyShot/Services/SettingsService.cs b/MoneyShot/Services/SettingsService.cs
index 017fca8..f984ba9 100644
--- a/MoneyShot/Services/SettingsService.cs
+++ b/MoneyShot/Services/SettingsService.cs
@@ -152,7 +152,11 @@ internal static AppSettings ValidateAndSanitizeSettings(AppSettings settings)
         {
             settings.DefaultLineThickness = 3;
         }
-        
+
+        // Clamp history retention to the range the UI offers (0 disables retention
+        // enforcement) so a hand-edited settings.json can't request absurd values.
+        settings.HistoryRetentionCount = Math.Clamp(settings.HistoryRetentionCount, 0, 500);
+
         return settings;
     }
 
diff --git a/MoneyShot/Themes/CocoaTheme.xaml b/MoneyShot/Themes/CocoaTheme.xaml
new file mode 100644
index 0000000..8b07d84
--- /dev/null
+++ b/MoneyShot/Themes/CocoaTheme.xaml
@@ -0,0 +1,690 @@
+<!--
+    CocoaTheme.xaml — the single source of truth for Money Shot's visual identity.
+
+    Design rules (also documented in CLAUDE.md):
+      • Cocoa-brown dark palette. New surfaces pick from the brushes below — never inline hex.
+      • No DropShadowEffect / BlurEffect anywhere. WPF bitmap effects force expensive software
+        composition per element; the old per-button shadows were a measurable source of toolbar lag.
+      • All brushes are frozen (po:Freeze) so they can be shared across threads and skip
+        change-tracking overhead.
+      • Icons are vector Path geometries (20×20 design grid), not emoji — emoji glyphs render
+        inconsistently across Windows font fallback and read as unpolished.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    mc:Ignorable="po">
+
+    <!-- ═══════════════════════════ Palette ═══════════════════════════ -->
+
+    <Color x:Key="Cocoa.WindowColor">#221A13</Color>
+    <Color x:Key="Cocoa.TitleBarColor">#2A2018</Color>
+    <Color x:Key="Cocoa.SurfaceColor">#2E241A</Color>
+    <Color x:Key="Cocoa.SurfaceAltColor">#3A2D20</Color>
+    <Color x:Key="Cocoa.HoverColor">#46382A</Color>
+    <Color x:Key="Cocoa.PressedColor">#534333</Color>
+    <Color x:Key="Cocoa.BorderColor">#4C3C2B</Color>
+    <Color x:Key="Cocoa.BorderSubtleColor">#3A2E22</Color>
+    <Color x:Key="Cocoa.AccentColor">#C28E5C</Color>
+    <Color x:Key="Cocoa.AccentHoverColor">#D2A06E</Color>
+    <Color x:Key="Cocoa.AccentPressedColor">#AD7C4D</Color>
+    <Color x:Key="Cocoa.AccentSoftColor">#403122</Color>
+    <Color x:Key="Cocoa.OnAccentColor">#271C11</Color>
+    <Color x:Key="Cocoa.TextColor">#F1E9DE</Color>
+    <Color x:Key="Cocoa.TextSecondaryColor">#C8B69E</Color>
+    <Color x:Key="Cocoa.TextMutedColor">#97846C</Color>
+    <Color x:Key="Cocoa.DangerColor">#C75048</Color>
+    <Color x:Key="Cocoa.CanvasColor">#191209</Color>
+
+    <SolidColorBrush x:Key="Cocoa.WindowBrush"        Color="{StaticResource Cocoa.WindowColor}"        po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.TitleBarBrush"      Color="{StaticResource Cocoa.TitleBarColor}"      po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.SurfaceBrush"       Color="{StaticResource Cocoa.SurfaceColor}"       po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.SurfaceAltBrush"    Color="{StaticResource Cocoa.SurfaceAltColor}"    po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.HoverBrush"         Color="{StaticResource Cocoa.HoverColor}"         po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.PressedBrush"       Color="{StaticResource Cocoa.PressedColor}"       po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.BorderBrush"        Color="{StaticResource Cocoa.BorderColor}"        po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.BorderSubtleBrush"  Color="{StaticResource Cocoa.BorderSubtleColor}"  po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.AccentBrush"        Color="{StaticResource Cocoa.AccentColor}"        po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.AccentHoverBrush"   Color="{StaticResource Cocoa.AccentHoverColor}"   po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.AccentPressedBrush" Color="{StaticResource Cocoa.AccentPressedColor}" po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.AccentSoftBrush"    Color="{StaticResource Cocoa.AccentSoftColor}"    po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.OnAccentBrush"      Color="{StaticResource Cocoa.OnAccentColor}"      po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.TextBrush"          Color="{StaticResource Cocoa.TextColor}"          po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.TextSecondaryBrush" Color="{StaticResource Cocoa.TextSecondaryColor}" po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.TextMutedBrush"     Color="{StaticResource Cocoa.TextMutedColor}"     po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.DangerBrush"        Color="{StaticResource Cocoa.DangerColor}"        po:Freeze="True"/>
+    <SolidColorBrush x:Key="Cocoa.CanvasBrush"        Color="{StaticResource Cocoa.CanvasColor}"        po:Freeze="True"/>
+
+    <!-- ═══════════════════════════ Icon geometries (20×20 grid) ═══════════════════════════ -->
+
+    <Geometry x:Key="Icon.Cursor">M5,2 L5,15 L8.2,12.2 L10.4,17 L12.6,16 L10.4,11.4 L14.6,11.4 Z</Geometry>
+    <Geometry x:Key="Icon.Crop">M5.5,1.5 V14.5 H18.5 M1.5,5.5 H14.5 V18.5</Geometry>
+    <Geometry x:Key="Icon.Rectangle">M2.5,4.5 H17.5 V15.5 H2.5 Z</Geometry>
+    <Geometry x:Key="Icon.Ellipse">M10,4.5 A7.5,5.5 0 1 0 10,15.5 A7.5,5.5 0 1 0 10,4.5 Z</Geometry>
+    <Geometry x:Key="Icon.Arrow">M4,16 L15,5 M15,5 H9 M15,5 V11</Geometry>
+    <Geometry x:Key="Icon.Line">M3.5,16.5 L16.5,3.5</Geometry>
+    <Geometry x:Key="Icon.Freehand">M3,15 C5,7 7,17 10,10 C12,5.5 14,8 17,4.5</Geometry>
+    <Geometry x:Key="Icon.Number">M7.5,3.5 L6,16.5 M13.5,3.5 L12,16.5 M4,7.5 H16.5 M3.5,12.5 H16</Geometry>
+    <Geometry x:Key="Icon.Text">M4,5.5 V3.5 H16 V5.5 M10,3.5 V16.5 M8,16.5 H12</Geometry>
+    <Geometry x:Key="Icon.Pixelate">M3,3 H8 V8 H3 Z M8,8 H13 V13 H8 Z M13,3 H18 V8 H13 Z M3,13 H8 V18 H3 Z M13,13 H18 V18 H13 Z</Geometry>
+    <Geometry x:Key="Icon.Undo">M4,8 H12.5 A4.5,4.5 0 0 1 12.5,17 H7 M7.5,4.5 L4,8 L7.5,11.5</Geometry>
+    <Geometry x:Key="Icon.Refresh">M16.5,10 A6.5,6.5 0 1 1 13.2,4.35 M13.2,1.2 V4.7 H16.7</Geometry>
+    <Geometry x:Key="Icon.ZoomIn">M8.5,3 A5.5,5.5 0 1 0 8.5,14 A5.5,5.5 0 1 0 8.5,3 M12.7,12.7 L17,17 M8.5,6 V11 M6,8.5 H11</Geometry>
+    <Geometry x:Key="Icon.ZoomOut">M8.5,3 A5.5,5.5 0 1 0 8.5,14 A5.5,5.5 0 1 0 8.5,3 M12.7,12.7 L17,17 M6,8.5 H11</Geometry>
+    <Geometry x:Key="Icon.ZoomReset">M8.5,3 A5.5,5.5 0 1 0 8.5,14 A5.5,5.5 0 1 0 8.5,3 M12.7,12.7 L17,17</Geometry>
+    <Geometry x:Key="Icon.Save">M3.5,3.5 H13.5 L16.5,6.5 V16.5 H3.5 Z M6.5,3.5 V7.5 H12.5 V3.5 M5.5,16.5 V11.5 H14.5 V16.5</Geometry>
+    <Geometry x:Key="Icon.Copy">M7.5,5.5 V2.5 H17.5 V12.5 H14.5 M2.5,5.5 H12.5 V17.5 H2.5 Z</Geometry>
+    <Geometry x:Key="Icon.Camera">M3.5,6.5 H6.5 L8,4.5 H12 L13.5,6.5 H16.5 V15.5 H3.5 Z M10,8.5 A2.6,2.6 0 1 0 10,13.7 A2.6,2.6 0 1 0 10,8.5</Geometry>
+    <Geometry x:Key="Icon.Region">M3.5,6.5 V3.5 H6.5 M13.5,3.5 H16.5 V6.5 M16.5,13.5 V16.5 H13.5 M6.5,16.5 H3.5 V13.5</Geometry>
+    <Geometry x:Key="Icon.Monitor">M2.5,3.5 H17.5 V13.5 H2.5 Z M7,16.5 H13 M10,13.5 V16.5</Geometry>
+    <Geometry x:Key="Icon.History">M10,3 A7,7 0 1 0 10,17 A7,7 0 1 0 10,3 M10,6 V10 L13,12</Geometry>
+    <Geometry x:Key="Icon.Folder">M2.5,4.5 H8 L9.5,6.5 H17.5 V15.5 H2.5 Z</Geometry>
+    <Geometry x:Key="Icon.Settings">M3,5.5 H17 M3,10 H17 M3,14.5 H17 M7,3.5 V7.5 M13,8 V12 M5.5,12.5 V16.5</Geometry>
+    <Geometry x:Key="Icon.Info">M10,3 A7,7 0 1 0 10,17 A7,7 0 1 0 10,3 M10,9 V13.5 M10,6.4 V6.9</Geometry>
+    <Geometry x:Key="Icon.Help">M6.5,7 A3.5,3.5 0 1 1 10,10.5 V12.5 M10,15.4 V15.9</Geometry>
+
+    <!-- Window caption glyphs (10×10 grid) -->
+    <Geometry x:Key="Icon.WindowMinimize">M0,5 H10</Geometry>
+    <Geometry x:Key="Icon.WindowMaximize">M0.5,0.5 H9.5 V9.5 H0.5 Z</Geometry>
+    <Geometry x:Key="Icon.WindowRestore">M2.5,2.5 V0.5 H9.5 V7.5 H7.5 M0.5,2.5 H7.5 V9.5 H0.5 Z</Geometry>
+    <Geometry x:Key="Icon.WindowClose">M0.5,0.5 L9.5,9.5 M9.5,0.5 L0.5,9.5</Geometry>
+
+    <!-- Stroke-rendered icon inside a button. Stroke follows the button's Foreground so icons
+         recolor automatically on hover/active/disabled state changes. -->
+    <Style x:Key="ToolIcon" TargetType="Path">
+        <Setter Property="Stroke" Value="{Binding RelativeSource={RelativeSource AncestorType=ContentControl}, Path=Foreground}"/>
+        <Setter Property="StrokeThickness" Value="1.6"/>
+        <Setter Property="StrokeStartLineCap" Value="Round"/>
+        <Setter Property="StrokeEndLineCap" Value="Round"/>
+        <Setter Property="StrokeLineJoin" Value="Round"/>
+        <Setter Property="Width" Value="16"/>
+        <Setter Property="Height" Value="16"/>
+        <Setter Property="Stretch" Value="Uniform"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="SnapsToDevicePixels" Value="False"/>
+    </Style>
+
+    <!-- Fill-rendered variant for solid glyphs (cursor pointer, pixelate blocks). -->
+    <Style x:Key="ToolIconFilled" TargetType="Path" BasedOn="{StaticResource ToolIcon}">
+        <Setter Property="Stroke" Value="{x:Null}"/>
+        <Setter Property="Fill" Value="{Binding RelativeSource={RelativeSource AncestorType=ContentControl}, Path=Foreground}"/>
+    </Style>
+
+    <!-- ═══════════════════════════ Buttons ═══════════════════════════ -->
+
+    <!-- Quiet toolbar / utility button: transparent until hovered. -->
+    <Style x:Key="ToolButton" TargetType="Button">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.TextSecondaryBrush}"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="10,6"/>
+        <Setter Property="Margin" Value="1,0"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="6"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{StaticResource Cocoa.HoverBrush}"/>
+                <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{StaticResource Cocoa.PressedBrush}"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="{StaticResource Cocoa.TextMutedBrush}"/>
+                <Setter Property="Opacity" Value="0.6"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Active (selected) tool: caramel outline + warm fill so the current tool is obvious. -->
+    <Style x:Key="ToolButtonActive" TargetType="Button" BasedOn="{StaticResource ToolButton}">
+        <Setter Property="Background" Value="{StaticResource Cocoa.AccentSoftBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Cocoa.AccentBrush}"/>
+    </Style>
+
+    <!-- Bordered secondary button (dialogs, settings). -->
+    <Style x:Key="SubtleButton" TargetType="Button" BasedOn="{StaticResource ToolButton}">
+        <Setter Property="Background" Value="{StaticResource Cocoa.SurfaceAltBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Cocoa.BorderBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+    </Style>
+
+    <!-- Primary call-to-action: caramel accent with dark text. -->
+    <Style x:Key="AccentButton" TargetType="Button">
+        <Setter Property="Background" Value="{StaticResource Cocoa.AccentBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.OnAccentBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="14,7"/>
+        <Setter Property="Margin" Value="1,0"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}"
+                            CornerRadius="6"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{StaticResource Cocoa.AccentHoverBrush}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{StaticResource Cocoa.AccentPressedBrush}"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Opacity" Value="0.5"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Title-bar caption buttons. -->
+    <Style x:Key="TitleBarButton" TargetType="Button">
+        <Setter Property="Width" Value="44"/>
+        <Setter Property="Height" Value="32"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.TextSecondaryBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{StaticResource Cocoa.HoverBrush}"/>
+                <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{StaticResource Cocoa.PressedBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Close button hovers red, matching Windows convention. -->
+    <Style x:Key="TitleBarCloseButton" TargetType="Button" BasedOn="{StaticResource TitleBarButton}">
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#C42B1C"/>
+                <Setter Property="Foreground" Value="#FFFFFF"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="#B02315"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Caption glyph inside title-bar buttons. -->
+    <Style x:Key="CaptionIcon" TargetType="Path">
+        <Setter Property="Stroke" Value="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}"/>
+        <Setter Property="StrokeThickness" Value="1"/>
+        <Setter Property="Width" Value="10"/>
+        <Setter Property="Height" Value="10"/>
+        <Setter Property="Stretch" Value="None"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+    </Style>
+
+    <!-- Round colour swatch for the annotation palette. The colour lives in Background so
+         code-behind (ColorButton_Click) can read it back as a SolidColorBrush. -->
+    <Style x:Key="ColorSwatch" TargetType="Button">
+        <Setter Property="Width" Value="24"/>
+        <Setter Property="Height" Value="24"/>
+        <Setter Property="Margin" Value="2,0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="BorderThickness" Value="1.5"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Cocoa.BorderBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="12">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{StaticResource Cocoa.TextBrush}"/>
+                <Setter Property="BorderThickness" Value="2"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- ═══════════════════════════ Inputs ═══════════════════════════ -->
+
+    <Style x:Key="CocoaTextBox" TargetType="TextBox">
+        <Setter Property="Background" Value="{StaticResource Cocoa.SurfaceAltBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+        <Setter Property="CaretBrush" Value="{StaticResource Cocoa.AccentBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource Cocoa.AccentBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Cocoa.BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TextBox">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="5">
+                        <ScrollViewer x:Name="PART_ContentHost" Margin="{TemplateBinding Padding}"
+                                      VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsKeyboardFocused" Value="True">
+                <Setter Property="BorderBrush" Value="{StaticResource Cocoa.AccentBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="CocoaCheckBox" TargetType="CheckBox">
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CheckBox">
+                    <StackPanel Orientation="Horizontal" Background="Transparent">
+                        <Border x:Name="Box" Width="17" Height="17" CornerRadius="4"
+                                Background="{StaticResource Cocoa.SurfaceAltBrush}"
+                                BorderBrush="{StaticResource Cocoa.BorderBrush}"
+                                BorderThickness="1.5"
+                                VerticalAlignment="Center">
+                            <Path x:Name="Check" Data="M3,8.5 L6.5,12 L13,4.5"
+                                  Stroke="{StaticResource Cocoa.OnAccentBrush}" StrokeThickness="2"
+                                  StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeLineJoin="Round"
+                                  Width="14" Height="14" Stretch="Uniform" Visibility="Collapsed"/>
+                        </Border>
+                        <ContentPresenter Margin="8,0,0,0" VerticalAlignment="Center"
+                                          RecognizesAccessKey="True"/>
+                    </StackPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="Box" Property="Background" Value="{StaticResource Cocoa.AccentBrush}"/>
+                            <Setter TargetName="Box" Property="BorderBrush" Value="{StaticResource Cocoa.AccentBrush}"/>
+                            <Setter TargetName="Check" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Box" Property="BorderBrush" Value="{StaticResource Cocoa.AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="CocoaRadioButton" TargetType="RadioButton">
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RadioButton">
+                    <StackPanel Orientation="Horizontal" Background="Transparent">
+                        <Border x:Name="Outer" Width="17" Height="17" CornerRadius="9"
+                                Background="{StaticResource Cocoa.SurfaceAltBrush}"
+                                BorderBrush="{StaticResource Cocoa.BorderBrush}"
+                                BorderThickness="1.5"
+                                VerticalAlignment="Center">
+                            <Ellipse x:Name="Dot" Width="7" Height="7"
+                                     Fill="{StaticResource Cocoa.AccentBrush}" Visibility="Collapsed"/>
+                        </Border>
+                        <ContentPresenter Margin="8,0,0,0" VerticalAlignment="Center"
+                                          RecognizesAccessKey="True"/>
+                    </StackPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="Outer" Property="BorderBrush" Value="{StaticResource Cocoa.AccentBrush}"/>
+                            <Setter TargetName="Dot" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Outer" Property="BorderBrush" Value="{StaticResource Cocoa.AccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="CocoaComboBoxItem" TargetType="ComboBoxItem">
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Padding" Value="9,6"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBoxItem">
+                    <Border x:Name="Bd"
+                            Background="{TemplateBinding Background}"
+                            Padding="{TemplateBinding Padding}"
+                            CornerRadius="4" Margin="3,1">
+                        <ContentPresenter/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource Cocoa.HoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource Cocoa.AccentSoftBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="CocoaComboBox" TargetType="ComboBox">
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+        <Setter Property="Background" Value="{StaticResource Cocoa.SurfaceAltBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Cocoa.BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="9,6"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource CocoaComboBoxItem}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBox">
+                    <Grid>
+                        <ToggleButton Focusable="False" ClickMode="Press"
+                                      IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
+                            <ToggleButton.Template>
+                                <ControlTemplate TargetType="ToggleButton">
+                                    <Border x:Name="Bd"
+                                            Background="{StaticResource Cocoa.SurfaceAltBrush}"
+                                            BorderBrush="{StaticResource Cocoa.BorderBrush}"
+                                            BorderThickness="1"
+                                            CornerRadius="5">
+                                        <Path HorizontalAlignment="Right" VerticalAlignment="Center"
+                                              Margin="0,0,10,0"
+                                              Data="M0,0 L4,4 L8,0"
+                                              Stroke="{StaticResource Cocoa.TextSecondaryBrush}"
+                                              StrokeThickness="1.5" StrokeStartLineCap="Round" StrokeEndLineCap="Round"/>
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsMouseOver" Value="True">
+                                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource Cocoa.HoverBrush}"/>
+                                        </Trigger>
+                                        <Trigger Property="IsChecked" Value="True">
+                                            <Setter TargetName="Bd" Property="BorderBrush" Value="{StaticResource Cocoa.AccentBrush}"/>
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </ToggleButton.Template>
+                        </ToggleButton>
+                        <ContentPresenter IsHitTestVisible="False"
+                                          Content="{TemplateBinding SelectionBoxItem}"
+                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                          Margin="10,0,28,0"
+                                          VerticalAlignment="Center" HorizontalAlignment="Left">
+                            <ContentPresenter.Resources>
+                                <Style TargetType="TextBlock">
+                                    <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+                                </Style>
+                            </ContentPresenter.Resources>
+                        </ContentPresenter>
+                        <Popup Placement="Bottom"
+                               IsOpen="{TemplateBinding IsDropDownOpen}"
+                               AllowsTransparency="True"
+                               Focusable="False"
+                               PopupAnimation="Fade">
+                            <Border Background="{StaticResource Cocoa.SurfaceBrush}"
+                                    BorderBrush="{StaticResource Cocoa.BorderBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="6"
+                                    Margin="0,3,0,0"
+                                    MinWidth="{TemplateBinding ActualWidth}"
+                                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                    SnapsToDevicePixels="True">
+                                <ScrollViewer Margin="0,3" SnapsToDevicePixels="True">
+                                    <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained"/>
+                                </ScrollViewer>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Minimal modern slider: 4px rounded track, round caramel thumb. -->
+    <Style x:Key="CocoaSlider" TargetType="Slider">
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Slider">
+                    <Grid VerticalAlignment="Center">
+                        <Border Height="4" CornerRadius="2"
+                                Background="{StaticResource Cocoa.SurfaceAltBrush}"
+                                BorderBrush="{StaticResource Cocoa.BorderSubtleBrush}" BorderThickness="1"/>
+                        <Track x:Name="PART_Track">
+                            <Track.DecreaseRepeatButton>
+                                <RepeatButton Command="Slider.DecreaseLarge" Focusable="False">
+                                    <RepeatButton.Template>
+                                        <ControlTemplate TargetType="RepeatButton">
+                                            <Border Height="4" CornerRadius="2" Background="{StaticResource Cocoa.AccentBrush}"/>
+                                        </ControlTemplate>
+                                    </RepeatButton.Template>
+                                </RepeatButton>
+                            </Track.DecreaseRepeatButton>
+                            <Track.IncreaseRepeatButton>
+                                <RepeatButton Command="Slider.IncreaseLarge" Focusable="False">
+                                    <RepeatButton.Template>
+                                        <ControlTemplate TargetType="RepeatButton">
+                                            <Border Background="Transparent" Height="14"/>
+                                        </ControlTemplate>
+                                    </RepeatButton.Template>
+                                </RepeatButton>
+                            </Track.IncreaseRepeatButton>
+                            <Track.Thumb>
+                                <Thumb Focusable="False">
+                                    <Thumb.Template>
+                                        <ControlTemplate TargetType="Thumb">
+                                            <Ellipse Width="14" Height="14"
+                                                     Fill="{StaticResource Cocoa.AccentBrush}"
+                                                     Stroke="{StaticResource Cocoa.WindowBrush}" StrokeThickness="2"/>
+                                        </ControlTemplate>
+                                    </Thumb.Template>
+                                </Thumb>
+                            </Track.Thumb>
+                        </Track>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ═══════════════════════════ Chrome bits ═══════════════════════════ -->
+
+    <Style x:Key="CocoaToolTip" TargetType="ToolTip">
+        <Setter Property="Background" Value="{StaticResource Cocoa.SurfaceAltBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Cocoa.BorderBrush}"/>
+        <Setter Property="FontSize" Value="11.5"/>
+        <Setter Property="Padding" Value="9,5"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToolTip">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="5"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Thin vertical divider between toolbar groups. -->
+    <Style x:Key="ToolbarDivider" TargetType="Rectangle">
+        <Setter Property="Width" Value="1"/>
+        <Setter Property="Margin" Value="9,4"/>
+        <Setter Property="Fill" Value="{StaticResource Cocoa.BorderSubtleBrush}"/>
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
+    </Style>
+
+    <!-- Slim scrollbars that match the theme. Applied per-window via implicit style scope. -->
+    <Style x:Key="CocoaScrollBarThumb" TargetType="Thumb">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Thumb">
+                    <Border x:Name="Bd" Background="{StaticResource Cocoa.BorderBrush}" CornerRadius="4" Margin="2"/>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource Cocoa.TextMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="ScrollBar" x:Key="CocoaScrollBar">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Width" Value="11"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ScrollBar">
+                    <Grid Background="Transparent">
+                        <Track x:Name="PART_Track" IsDirectionReversed="True">
+                            <Track.DecreaseRepeatButton>
+                                <RepeatButton Command="ScrollBar.PageUpCommand" Opacity="0" Focusable="False"/>
+                            </Track.DecreaseRepeatButton>
+                            <Track.IncreaseRepeatButton>
+                                <RepeatButton Command="ScrollBar.PageDownCommand" Opacity="0" Focusable="False"/>
+                            </Track.IncreaseRepeatButton>
+                            <Track.Thumb>
+                                <Thumb Style="{StaticResource CocoaScrollBarThumb}"/>
+                            </Track.Thumb>
+                        </Track>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Horizontal">
+                <Setter Property="Width" Value="Auto"/>
+                <Setter Property="Height" Value="11"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="ScrollBar">
+                            <Grid Background="Transparent">
+                                <Track x:Name="PART_Track">
+                                    <Track.DecreaseRepeatButton>
+                                        <RepeatButton Command="ScrollBar.PageLeftCommand" Opacity="0" Focusable="False"/>
+                                    </Track.DecreaseRepeatButton>
+                                    <Track.IncreaseRepeatButton>
+                                        <RepeatButton Command="ScrollBar.PageRightCommand" Opacity="0" Focusable="False"/>
+                                    </Track.IncreaseRepeatButton>
+                                    <Track.Thumb>
+                                        <Thumb Style="{StaticResource CocoaScrollBarThumb}"/>
+                                    </Track.Thumb>
+                                </Track>
+                            </Grid>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Context menu (history tiles). -->
+    <Style x:Key="CocoaContextMenu" TargetType="ContextMenu">
+        <Setter Property="Background" Value="{StaticResource Cocoa.SurfaceBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Cocoa.BorderBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ContextMenu">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="6"
+                            Padding="4">
+                        <StackPanel IsItemsHost="True"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="CocoaMenuItem" TargetType="MenuItem">
+        <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="MenuItem">
+                    <Border x:Name="Bd" Background="Transparent" CornerRadius="4" Padding="10,6">
+                        <ContentPresenter ContentSource="Header" RecognizesAccessKey="True"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource Cocoa.HoverBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="CocoaMenuSeparator" TargetType="Separator">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Separator">
+                    <Rectangle Height="1" Fill="{StaticResource Cocoa.BorderSubtleBrush}" Margin="6,4"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Card container used for grouped content (settings sections, main-window panels). -->
+    <Style x:Key="CocoaCard" TargetType="Border">
+        <Setter Property="Background" Value="{StaticResource Cocoa.SurfaceBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Cocoa.BorderSubtleBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="8"/>
+        <Setter Property="Padding" Value="20"/>
+    </Style>
+
+</ResourceDictionary>
diff --git a/MoneyShot/Views/EditorWindow.xaml b/MoneyShot/Views/EditorWindow.xaml
index 2d4d4e6..a3985ba 100644
--- a/MoneyShot/Views/EditorWindow.xaml
+++ b/MoneyShot/Views/EditorWindow.xaml
@@ -1,477 +1,332 @@
 <Window x:Class="MoneyShot.Views.EditorWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Money Shot - Editor" Height="900" Width="1500"
-        MinHeight="700" MinWidth="1200"
+        Title="Money Shot — Editor" Height="900" Width="1500"
+        MinHeight="640" MinWidth="1000"
         WindowStartupLocation="CenterScreen"
-        Background="Transparent"
-        AllowsTransparency="True"
+        Background="{StaticResource Cocoa.WindowBrush}"
+        Foreground="{StaticResource Cocoa.TextBrush}"
+        FontFamily="Segoe UI"
         WindowStyle="None"
-        ResizeMode="CanResize">
-    <Window.Resources>
-        <!-- Glassmorphism Button Style -->
-        <Style x:Key="GlassButton" TargetType="Button">
-            <Setter Property="Background">
-                <Setter.Value>
-                    <SolidColorBrush Color="#40FFFFFF" Opacity="0.15"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderBrush">
-                <Setter.Value>
-                    <SolidColorBrush Color="#80FFFFFF" Opacity="0.3"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding" Value="8,5"/>
-            <Setter Property="Margin" Value="2"/>
-            <Setter Property="FontSize" Value="12"/>
-            <Setter Property="FontWeight" Value="Medium"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Effect">
-                <Setter.Value>
-                    <DropShadowEffect Color="Black" Direction="270" ShadowDepth="2" Opacity="0.3" BlurRadius="8"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="6"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background">
-                        <Setter.Value>
-                            <SolidColorBrush Color="#60FFFFFF" Opacity="0.25"/>
-                        </Setter.Value>
-                    </Setter>
-                </Trigger>
-                <Trigger Property="IsPressed" Value="True">
-                    <Setter Property="Background">
-                        <Setter.Value>
-                            <SolidColorBrush Color="#80FFFFFF" Opacity="0.35"/>
-                        </Setter.Value>
-                    </Setter>
-                </Trigger>
-            </Style.Triggers>
-        </Style>
+        ResizeMode="CanResize"
+        UseLayoutRounding="True"
+        TextOptions.TextFormattingMode="Display">
+    <!-- WindowChrome instead of AllowsTransparency: layered (transparent) windows are composed
+         in software, which made the whole editor laggy at 4K. Chrome keeps the custom title bar
+         while staying on the hardware-accelerated path. GlassFrameThickness 0,0,0,1 preserves the
+         DWM shadow + Win11 rounded corners. -->
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="0"
+                      ResizeBorderThickness="6"
+                      GlassFrameThickness="0,0,0,1"
+                      CornerRadius="0"
+                      UseAeroCaptionButtons="False"/>
+    </WindowChrome.WindowChrome>
 
-        <!-- Primary Action Button Style -->
-        <Style x:Key="PrimaryButton" TargetType="Button" BasedOn="{StaticResource GlassButton}">
-            <Setter Property="Background">
-                <Setter.Value>
-                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                        <GradientStop Color="#0E639C" Offset="0"/>
-                        <GradientStop Color="#1177BB" Offset="1"/>
-                    </LinearGradientBrush>
-                </Setter.Value>
-            </Setter>
-        </Style>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
 
-        <!-- Color Button Style -->
-        <Style x:Key="ColorButton" TargetType="Button">
-            <Setter Property="Width" Value="30"/>
-            <Setter Property="Height" Value="30"/>
-            <Setter Property="Margin" Value="2"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="BorderThickness" Value="2"/>
-            <Setter Property="BorderBrush">
-                <Setter.Value>
-                    <SolidColorBrush Color="White" Opacity="0.3"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Effect">
-                <Setter.Value>
-                    <DropShadowEffect Color="Black" Direction="270" ShadowDepth="1" Opacity="0.5" BlurRadius="6"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="15"/>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="BorderBrush" Value="White"/>
-                    <Setter Property="BorderThickness" Value="3"/>
-                </Trigger>
-            </Style.Triggers>
-        </Style>
+        <!-- ░░ Title bar ░░ -->
+        <Border Grid.Row="0" Background="{StaticResource Cocoa.TitleBarBrush}"
+                BorderBrush="{StaticResource Cocoa.BorderSubtleBrush}" BorderThickness="0,0,0,1"
+                MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
+            <Grid Height="32">
+                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="14,0,0,0">
+                    <TextBlock Text="Money Shot" FontSize="12.5" FontWeight="SemiBold"
+                               Foreground="{StaticResource Cocoa.TextBrush}" VerticalAlignment="Center"/>
+                    <TextBlock Text="Editor" FontSize="12.5" Margin="8,0,0,0"
+                               Foreground="{StaticResource Cocoa.TextMutedBrush}" VerticalAlignment="Center"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Click="Minimize_Click" Style="{StaticResource TitleBarButton}" Focusable="False">
+                        <Path Style="{StaticResource CaptionIcon}" Data="{StaticResource Icon.WindowMinimize}"/>
+                    </Button>
+                    <Button Name="MaximizeRestoreButton" Click="MaximizeRestore_Click"
+                            Style="{StaticResource TitleBarButton}" Focusable="False">
+                        <Path Name="MaximizeRestoreIcon" Style="{StaticResource CaptionIcon}"
+                              Data="{StaticResource Icon.WindowMaximize}"/>
+                    </Button>
+                    <Button Click="Close_Click" Style="{StaticResource TitleBarCloseButton}" Focusable="False">
+                        <Path Style="{StaticResource CaptionIcon}" Data="{StaticResource Icon.WindowClose}"/>
+                    </Button>
+                </StackPanel>
+            </Grid>
+        </Border>
 
-        <!-- Active tool button: brighter background + visible outline so the user can tell at a
-             glance which tool is selected. Toggled by EditorWindow.UpdateActiveToolButton via Tag. -->
-        <Style x:Key="ActiveToolButton" TargetType="Button" BasedOn="{StaticResource GlassButton}">
-            <Setter Property="Background">
-                <Setter.Value>
-                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                        <GradientStop Color="#FF1177BB" Offset="0"/>
-                        <GradientStop Color="#FF0E5C8E" Offset="1"/>
-                    </LinearGradientBrush>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="BorderBrush" Value="White"/>
-            <Setter Property="BorderThickness" Value="2"/>
-        </Style>
-    </Window.Resources>
-    
-    <Border CornerRadius="12" BorderThickness="1">
-        <Border.BorderBrush>
-            <SolidColorBrush Color="White" Opacity="0.2"/>
-        </Border.BorderBrush>
-        <Border.Background>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" Opacity="0.95">
-                <GradientStop Color="#1a1a2e" Offset="0"/>
-                <GradientStop Color="#16213e" Offset="0.5"/>
-                <GradientStop Color="#0f3460" Offset="1"/>
-            </LinearGradientBrush>
-        </Border.Background>
-        <Border.Effect>
-            <DropShadowEffect Color="Black" Direction="270" ShadowDepth="10" Opacity="0.5" BlurRadius="30"/>
-        </Border.Effect>
-        
-        <Grid Margin="1">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
+        <!-- ░░ Toolbar ░░ -->
+        <Border Grid.Row="1" Padding="10,8" Background="{StaticResource Cocoa.SurfaceBrush}"
+                BorderBrush="{StaticResource Cocoa.BorderSubtleBrush}" BorderThickness="0,0,0,1">
+            <StackPanel>
+                <!-- Row 1: tools + appearance -->
+                <WrapPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                    <WrapPanel Name="ToolButtonsPanel" Orientation="Horizontal" VerticalAlignment="Center">
+                        <Button Tag="Cursor" Click="ToolButton_Click" Style="{StaticResource ToolButton}"
+                                ToolTip="Select and move elements (Esc deselects)">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIconFilled}" Data="{StaticResource Icon.Cursor}"/>
+                                <TextBlock Text="Select" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                        <Button Tag="Crop" Click="ToolButton_Click" Style="{StaticResource ToolButton}"
+                                ToolTip="Crop the image">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Crop}"/>
+                                <TextBlock Text="Crop" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                        <Button Tag="Rectangle" Click="ToolButton_Click" Style="{StaticResource ToolButton}"
+                                ToolTip="Rectangle (R)">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Rectangle}"/>
+                                <TextBlock Text="Rectangle" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                        <Button Tag="Circle" Click="ToolButton_Click" Style="{StaticResource ToolButton}"
+                                ToolTip="Ellipse (C)">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Ellipse}"/>
+                                <TextBlock Text="Ellipse" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                        <Button Tag="Arrow" Click="ToolButton_Click" Style="{StaticResource ToolButton}"
+                                ToolTip="Arrow (A)">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Arrow}"/>
+                                <TextBlock Text="Arrow" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                        <Button Tag="Line" Click="ToolButton_Click" Style="{StaticResource ToolButton}"
+                                ToolTip="Line (L)">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Line}"/>
+                                <TextBlock Text="Line" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                        <Button Tag="Freehand" Click="ToolButton_Click" Style="{StaticResource ToolButton}"
+                                ToolTip="Freehand drawing (F)">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Freehand}"/>
+                                <TextBlock Text="Draw" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                        <Button Tag="Number" Click="ToolButton_Click" Style="{StaticResource ToolButton}"
+                                ToolTip="Numbered label (1) — click to place 1, 2, 3…">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Number}"/>
+                                <TextBlock Text="Number" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                        <Button Tag="Text" Click="ToolButton_Click" Style="{StaticResource ToolButton}"
+                                ToolTip="Text label (T)">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Text}"/>
+                                <TextBlock Text="Text" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                        <Button Tag="Blur" Click="ToolButton_Click" Style="{StaticResource ToolButton}"
+                                ToolTip="Pixelate (P) — obscure sensitive information">
+                            <StackPanel Orientation="Horizontal">
+                                <Path Style="{StaticResource ToolIconFilled}" Data="{StaticResource Icon.Pixelate}"/>
+                                <TextBlock Text="Pixelate" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
+                    </WrapPanel>
 
-            <!-- Window Title Bar -->
-            <Border Grid.Row="0" Background="#20FFFFFF" BorderBrush="#30FFFFFF" BorderThickness="0,0,0,1" 
-                    CornerRadius="12,12,0,0" MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
-                <Grid Height="35">
-                    <TextBlock Text="💰 Money Shot - Editor" 
-                               Foreground="White" 
-                               FontSize="14" 
-                               FontWeight="SemiBold"
-                               VerticalAlignment="Center" 
-                               Margin="15,0,0,0"/>
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,5,0">
-                        <Button Content="🗕" Click="Minimize_Click" Style="{StaticResource GlassButton}" 
-                                Width="40" Height="28" Padding="0" Margin="2,0"/>
-                        <Button Content="🗖" Name="MaximizeRestoreButton" Click="MaximizeRestore_Click" Style="{StaticResource GlassButton}" 
-                                Width="40" Height="28" Padding="0" Margin="2,0"/>
-                        <Button Content="🗙" Click="Close_Click" Style="{StaticResource GlassButton}" 
-                                Width="40" Height="28" Padding="0" Margin="2,0"/>
-                    </StackPanel>
-                </Grid>
-            </Border>
+                    <Rectangle Style="{StaticResource ToolbarDivider}"/>
 
-            <!-- Toolbar with Glassmorphism -->
-            <Border Grid.Row="1" Padding="10" Background="#15FFFFFF" BorderBrush="#25FFFFFF" BorderThickness="0,0,0,1">
-                <Border.Effect>
-                    <BlurEffect Radius="0"/>
-                </Border.Effect>
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
-                    <WrapPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center">
-                        <!-- Tool Selection -->
-                        <StackPanel Orientation="Horizontal" Margin="0,0,15,0">
-                            <Button Content="↖️ Cursor" Tag="Cursor" Click="ToolButton_Click" Style="{StaticResource GlassButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Cursor Tool - Select and move elements"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Content="✂️ Crop" Tag="Crop" Click="ToolButton_Click" Style="{StaticResource GlassButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Crop Tool"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Content="✏️ Rectangle (R)" Tag="Rectangle" Click="ToolButton_Click" Style="{StaticResource GlassButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Rectangle Tool (Shortcut: R)"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Content="⭕ Circle (C)" Tag="Circle" Click="ToolButton_Click" Style="{StaticResource GlassButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Circle Tool (Shortcut: C)"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Content="➡️ Arrow (A)" Tag="Arrow" Click="ToolButton_Click" Style="{StaticResource GlassButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Arrow Tool (Shortcut: A)"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Content="📏 Line (L)" Tag="Line" Click="ToolButton_Click" Style="{StaticResource GlassButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Line Tool (Shortcut: L)"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Content="✍️ Freehand (F)" Tag="Freehand" Click="ToolButton_Click" Style="{StaticResource GlassButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Freehand Drawing Tool (Shortcut: F)"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Content="🔢 Number (1)" Tag="Number" Click="ToolButton_Click" Style="{StaticResource GlassButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Number Tool (Shortcut: 1)"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Content="📝 Text (T)" Tag="Text" Click="ToolButton_Click" Style="{StaticResource GlassButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Text Tool (Shortcut: T)"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Content="⬛ Pixelate (P)" Tag="Blur" Click="ToolButton_Click" Style="{StaticResource GlassButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Pixelate Tool (Shortcut: P) - Obscure sensitive info"/>
-                                </Button.ToolTip>
-                            </Button>
-                        </StackPanel>
+                    <!-- Colour palette -->
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                        <Button Background="#E5484D" Click="ColorButton_Click" Style="{StaticResource ColorSwatch}" ToolTip="Red"/>
+                        <Button Background="#3B82F6" Click="ColorButton_Click" Style="{StaticResource ColorSwatch}" ToolTip="Blue"/>
+                        <Button Background="#30A46C" Click="ColorButton_Click" Style="{StaticResource ColorSwatch}" ToolTip="Green"/>
+                        <Button Background="#F5D90A" Click="ColorButton_Click" Style="{StaticResource ColorSwatch}" ToolTip="Yellow"/>
+                        <Button Background="#F76B15" Click="ColorButton_Click" Style="{StaticResource ColorSwatch}" ToolTip="Orange"/>
+                        <Button Background="#8E4EC6" Click="ColorButton_Click" Style="{StaticResource ColorSwatch}" ToolTip="Purple"/>
+                        <Button Background="#1A1A1A" Click="ColorButton_Click" Style="{StaticResource ColorSwatch}" ToolTip="Black"/>
+                        <Button Background="#FFFFFF" Click="ColorButton_Click" Style="{StaticResource ColorSwatch}" ToolTip="White"/>
+                        <Button Name="CustomColorButton" Click="CustomColorButton_Click"
+                                Style="{StaticResource ColorSwatch}" Background="{StaticResource Cocoa.SurfaceAltBrush}"
+                                ToolTip="Pick a custom colour…">
+                            <TextBlock Text="+" Foreground="{StaticResource Cocoa.TextBrush}" FontSize="14"
+                                       FontWeight="Bold" Margin="0,-2,0,0"/>
+                        </Button>
+                    </StackPanel>
 
-                        <!-- Color Selection -->
-                        <StackPanel Orientation="Horizontal" Margin="0,0,15,0">
-                            <Button Background="Red" Click="ColorButton_Click" Style="{StaticResource ColorButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Red"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Background="Blue" Click="ColorButton_Click" Style="{StaticResource ColorButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Blue"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Background="Green" Click="ColorButton_Click" Style="{StaticResource ColorButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Green"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Background="Yellow" Click="ColorButton_Click" Style="{StaticResource ColorButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Yellow"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Background="Orange" Click="ColorButton_Click" Style="{StaticResource ColorButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Orange"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Background="Purple" Click="ColorButton_Click" Style="{StaticResource ColorButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Purple"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Background="Black" Click="ColorButton_Click" Style="{StaticResource ColorButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="Black"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <Button Background="White" Click="ColorButton_Click" Style="{StaticResource ColorButton}">
-                                <Button.ToolTip>
-                                    <ToolTip Content="White"/>
-                                </Button.ToolTip>
-                            </Button>
-                            <!-- Custom colour picker: opens the system ColorDialog and sets the
-                                 swatch background so the chosen colour persists for the session. -->
-                            <Button Name="CustomColorButton" Click="CustomColorButton_Click"
-                                    Style="{StaticResource ColorButton}" Background="#444444">
-                                <Button.Content>
-                                    <TextBlock Text="…" Foreground="White" FontSize="16" FontWeight="Bold"
-                                               HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                </Button.Content>
-                                <Button.ToolTip>
-                                    <ToolTip Content="Pick custom colour"/>
-                                </Button.ToolTip>
-                            </Button>
-                        </StackPanel>
+                    <Rectangle Style="{StaticResource ToolbarDivider}"/>
 
-                        <!-- Stroke thickness slider — bound to _lineThickness in code-behind. -->
-                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,15,0">
-                            <TextBlock Text="Stroke:" Foreground="White" VerticalAlignment="Center" Margin="0,0,6,0"/>
-                            <Slider Name="StrokeThicknessSlider"
-                                    Width="100"
-                                    Minimum="1" Maximum="10"
-                                    Value="3"
-                                    TickFrequency="1" IsSnapToTickEnabled="True"
-                                    VerticalAlignment="Center"
-                                    ValueChanged="StrokeThicknessSlider_ValueChanged"/>
-                            <TextBlock Name="StrokeThicknessLabel" Text="3" Foreground="White"
-                                       VerticalAlignment="Center" Margin="6,0,0,0" MinWidth="16"/>
-                        </StackPanel>
+                    <!-- Stroke thickness -->
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                        <TextBlock Text="Stroke" Foreground="{StaticResource Cocoa.TextSecondaryBrush}"
+                                   VerticalAlignment="Center" Margin="0,0,8,0" FontSize="12"/>
+                        <Slider Name="StrokeThicknessSlider" Style="{StaticResource CocoaSlider}"
+                                Width="90" Minimum="1" Maximum="10" Value="3"
+                                TickFrequency="1" IsSnapToTickEnabled="True"
+                                VerticalAlignment="Center"
+                                ValueChanged="StrokeThicknessSlider_ValueChanged"/>
+                        <TextBlock Name="StrokeThicknessLabel" Text="3"
+                                   Foreground="{StaticResource Cocoa.TextBrush}" FontSize="12"
+                                   VerticalAlignment="Center" Margin="8,0,0,0" MinWidth="14"/>
+                    </StackPanel>
 
-                        <!-- Text Background -->
-                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,15,0">
-                            <TextBlock Text="Text BG:" Foreground="White" VerticalAlignment="Center" Margin="0,0,6,0"/>
-                            <ComboBox Name="TextBackgroundComboBox"
-                              Width="125"
-                              Background="#3E3E42"
-                              Foreground="Black"
-                              BorderBrush="#555"
-                              SelectionChanged="TextBackgroundComboBox_SelectionChanged">
+                    <Rectangle Style="{StaticResource ToolbarDivider}"/>
 
-                                <!-- Fix dropdown + item colors -->
-                                <ComboBox.ItemContainerStyle>
-                                    <Style TargetType="ComboBoxItem">
-                                        <Setter Property="Background" Value="#3E3E42"/>
-                                        <Setter Property="Foreground" Value="White"/>
-                                        <Setter Property="BorderBrush" Value="#555"/>
+                    <!-- Text background -->
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                        <TextBlock Text="Text fill" Foreground="{StaticResource Cocoa.TextSecondaryBrush}"
+                                   VerticalAlignment="Center" Margin="0,0,8,0" FontSize="12"/>
+                        <ComboBox Name="TextBackgroundComboBox" Style="{StaticResource CocoaComboBox}"
+                                  Width="116" Height="30"
+                                  SelectionChanged="TextBackgroundComboBox_SelectionChanged">
+                            <ComboBoxItem Content="Transparent" IsSelected="True"/>
+                            <ComboBoxItem Content="White"/>
+                            <ComboBoxItem Content="Black"/>
+                            <ComboBoxItem Content="Yellow"/>
+                            <ComboBoxItem Content="Red"/>
+                            <ComboBoxItem Content="Blue"/>
+                            <ComboBoxItem Content="Green"/>
+                        </ComboBox>
+                    </StackPanel>
+                </WrapPanel>
 
-                                        <Style.Triggers>
-                                            <!-- Hover -->
-                                            <Trigger Property="IsHighlighted" Value="True">
-                                                <Setter Property="Background" Value="#555"/>
-                                            </Trigger>
+                <!-- Row 2: actions -->
+                <WrapPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,8,0,0">
+                    <Button Click="Undo_Click" Style="{StaticResource ToolButton}" ToolTip="Undo (Ctrl+Z)">
+                        <StackPanel Orientation="Horizontal">
+                            <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Undo}"/>
+                            <TextBlock Text="Undo" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                    <Button Click="ResetNumbering_Click" Style="{StaticResource ToolButton}"
+                            ToolTip="Restart number labels at 1">
+                        <StackPanel Orientation="Horizontal">
+                            <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Refresh}"/>
+                            <TextBlock Text="Reset numbering" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
 
-                                            <!-- Selected -->
-                                            <Trigger Property="IsSelected" Value="True">
-                                                <Setter Property="Background" Value="#007ACC"/>
-                                                <Setter Property="Foreground" Value="White"/>
-                                            </Trigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </ComboBox.ItemContainerStyle>
+                    <Rectangle Style="{StaticResource ToolbarDivider}"/>
 
-                                <!-- Fix system highlight colors -->
-                                <ComboBox.Resources>
-                                    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="#3E3E42"/>
-                                    <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="#007ACC"/>
-                                    <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="#3E3E42"/>
-                                </ComboBox.Resources>
+                    <Button Click="ZoomOut_Click" Style="{StaticResource ToolButton}" ToolTip="Zoom out (Ctrl+- or Ctrl+Scroll)">
+                        <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.ZoomOut}"/>
+                    </Button>
+                    <TextBlock Name="ZoomLevelLabel" Text="100%" MinWidth="42" TextAlignment="Center"
+                               Foreground="{StaticResource Cocoa.TextSecondaryBrush}" FontSize="12"
+                               VerticalAlignment="Center" ToolTip="Current zoom level"/>
+                    <Button Click="ZoomIn_Click" Style="{StaticResource ToolButton}" ToolTip="Zoom in (Ctrl++ or Ctrl+Scroll)">
+                        <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.ZoomIn}"/>
+                    </Button>
+                    <Button Click="ZoomReset_Click" Style="{StaticResource ToolButton}" ToolTip="Reset zoom and pan (Ctrl+0)">
+                        <StackPanel Orientation="Horizontal">
+                            <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.ZoomReset}"/>
+                            <TextBlock Text="Fit" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
 
-                                <!-- Your items -->
-                                <ComboBoxItem Content="Transparent" IsSelected="True"/>
-                                <ComboBoxItem Content="White"/>
-                                <ComboBoxItem Content="Black"/>
-                                <ComboBoxItem Content="Yellow"/>
-                                <ComboBoxItem Content="Red"/>
-                                <ComboBoxItem Content="Blue"/>
-                                <ComboBoxItem Content="Green"/>
+                    <Rectangle Style="{StaticResource ToolbarDivider}"/>
 
-                            </ComboBox>
+                    <Button Click="Save_Click" Style="{StaticResource AccentButton}" ToolTip="Save to file (Ctrl+S)">
+                        <StackPanel Orientation="Horizontal">
+                            <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Save}"
+                                  Stroke="{StaticResource Cocoa.OnAccentBrush}"/>
+                            <TextBlock Text="Save" Margin="6,0,0,0" VerticalAlignment="Center"/>
                         </StackPanel>
+                    </Button>
+                    <Button Click="SaveToClipboard_Click" Style="{StaticResource AccentButton}" Margin="6,0,0,0"
+                            ToolTip="Copy to clipboard (Ctrl+C)">
+                        <StackPanel Orientation="Horizontal">
+                            <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Copy}"
+                                  Stroke="{StaticResource Cocoa.OnAccentBrush}"/>
+                            <TextBlock Text="Copy" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
 
-                    </WrapPanel>
-                    <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,8,0,0">
-                        <Button Content="↶ Undo (Ctrl+Z)" Click="Undo_Click" Style="{StaticResource GlassButton}">
-                            <Button.ToolTip>
-                                <ToolTip Content="Undo (Ctrl+Z)"/>
-                            </Button.ToolTip>
-                        </Button>
-                        <Button Content="🔢 Reset numbering" Click="ResetNumbering_Click" Style="{StaticResource GlassButton}">
-                            <Button.ToolTip>
-                                <ToolTip Content="Restart number labels at 1"/>
-                            </Button.ToolTip>
-                        </Button>
-                        <Button Content="🔍+ Zoom" Click="ZoomIn_Click" Style="{StaticResource GlassButton}">
-                            <Button.ToolTip>
-                                <ToolTip Content="Zoom In (Ctrl++)"/>
-                            </Button.ToolTip>
-                        </Button>
-                        <Button Content="🔍- Zoom" Click="ZoomOut_Click" Style="{StaticResource GlassButton}">
-                            <Button.ToolTip>
-                                <ToolTip Content="Zoom Out (Ctrl+-)"/>
-                            </Button.ToolTip>
-                        </Button>
-                        <Button Content="🔍 Reset" Click="ZoomReset_Click" Style="{StaticResource GlassButton}">
-                            <Button.ToolTip>
-                                <ToolTip Content="Reset Zoom (Ctrl+0)"/>
-                            </Button.ToolTip>
-                        </Button>
-                        <Button Content="💾 Save (Ctrl+S)" Click="Save_Click" Style="{StaticResource PrimaryButton}">
-                            <Button.ToolTip>
-                                <ToolTip Content="Save (Ctrl+S)"/>
-                            </Button.ToolTip>
-                        </Button>
-                        <Button Content="📋 Copy (Ctrl+C)" Click="SaveToClipboard_Click" Style="{StaticResource PrimaryButton}">
-                            <Button.ToolTip>
-                                <ToolTip Content="Copy to Clipboard (Ctrl+C)"/>
-                            </Button.ToolTip>
-                        </Button>
-                        <Button Content="❓ Shortcuts (?)" Click="ShortcutsHelp_Click" Style="{StaticResource GlassButton}">
-                            <Button.ToolTip>
-                                <ToolTip Content="Show keyboard shortcuts (press ?)"/>
-                            </Button.ToolTip>
-                        </Button>
-                    </StackPanel>
-                </Grid>
-            </Border>
+                    <Rectangle Style="{StaticResource ToolbarDivider}"/>
 
-            <!-- Keyboard shortcut overlay. Hidden by default; toggled by `?` keypress or the
-                 toolbar button. Click anywhere on it to dismiss. -->
-            <Border Name="ShortcutsOverlay" Grid.Row="2" Visibility="Collapsed"
-                    Background="#CC000000" Panel.ZIndex="100"
-                    MouseLeftButtonDown="ShortcutsOverlay_MouseLeftButtonDown">
-                <Border HorizontalAlignment="Center" VerticalAlignment="Center"
-                        Background="#1F2937" BorderBrush="#3B82F6" BorderThickness="2"
-                        CornerRadius="10" Padding="24" MaxWidth="640">
-                    <StackPanel>
-                        <TextBlock Text="Keyboard Shortcuts" Foreground="White"
-                                   FontSize="20" FontWeight="Bold" Margin="0,0,0,16"/>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <StackPanel Grid.Column="0" Margin="0,0,12,0">
-                                <TextBlock Text="Tools" Foreground="#93C5FD" FontWeight="SemiBold" Margin="0,0,0,6"/>
-                                <TextBlock Text="R — Rectangle"     Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="C — Circle"        Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="A — Arrow"         Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="L — Line"          Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="F — Freehand"      Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="T — Text"          Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="P — Pixelate"      Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="1 — Number label"  Foreground="White" Margin="0,2"/>
-                            </StackPanel>
-                            <StackPanel Grid.Column="1" Margin="12,0,0,0">
-                                <TextBlock Text="Editor" Foreground="#93C5FD" FontWeight="SemiBold" Margin="0,0,0,6"/>
-                                <TextBlock Text="Ctrl+Z — Undo"           Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="Ctrl+C — Copy to clipboard" Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="Ctrl+S — Save"           Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="Ctrl++ / Ctrl+- — Zoom"   Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="Ctrl+0 — Reset zoom"      Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="Delete — Remove selected" Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="Esc — Close editor"       Foreground="White" Margin="0,2"/>
-                                <TextBlock Text="? — Toggle this overlay"  Foreground="White" Margin="0,2"/>
-                            </StackPanel>
-                        </Grid>
-                        <TextBlock Text="Click anywhere or press any key to dismiss"
-                                   Foreground="#9CA3AF" FontStyle="Italic"
-                                   HorizontalAlignment="Center" Margin="0,16,0,0"/>
-                    </StackPanel>
-                </Border>
+                    <Button Click="ShortcutsHelp_Click" Style="{StaticResource ToolButton}"
+                            ToolTip="Keyboard shortcuts (?)">
+                        <StackPanel Orientation="Horizontal">
+                            <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Help}"/>
+                            <TextBlock Text="Shortcuts" Margin="6,0,0,0" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
+                </WrapPanel>
+            </StackPanel>
+        </Border>
+
+        <!-- ░░ Keyboard shortcut overlay ░░ -->
+        <Border Name="ShortcutsOverlay" Grid.Row="2" Visibility="Collapsed"
+                Background="#D8191209" Panel.ZIndex="100"
+                MouseLeftButtonDown="ShortcutsOverlay_MouseLeftButtonDown">
+            <Border HorizontalAlignment="Center" VerticalAlignment="Center"
+                    Background="{StaticResource Cocoa.SurfaceBrush}"
+                    BorderBrush="{StaticResource Cocoa.BorderBrush}" BorderThickness="1"
+                    CornerRadius="10" Padding="28" MaxWidth="680">
+                <StackPanel>
+                    <TextBlock Text="Keyboard shortcuts" Foreground="{StaticResource Cocoa.TextBrush}"
+                               FontSize="19" FontWeight="SemiBold" Margin="0,0,0,18"/>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <StackPanel Grid.Column="0" Margin="0,0,18,0">
+                            <TextBlock Text="TOOLS" Foreground="{StaticResource Cocoa.AccentBrush}"
+                                       FontSize="11" FontWeight="SemiBold" Margin="0,0,0,8"/>
+                            <TextBlock Text="R — Rectangle"     Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="C — Ellipse"       Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="A — Arrow"         Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="L — Line"          Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="F — Freehand"      Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="T — Text"          Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="P — Pixelate"      Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="1 — Number label"  Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                        </StackPanel>
+                        <StackPanel Grid.Column="1" Margin="18,0,0,0">
+                            <TextBlock Text="EDITOR" Foreground="{StaticResource Cocoa.AccentBrush}"
+                                       FontSize="11" FontWeight="SemiBold" Margin="0,0,0,8"/>
+                            <TextBlock Text="Ctrl+Z — Undo"               Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="Ctrl+C — Copy to clipboard"  Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="Ctrl+S — Save"               Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="Ctrl+Scroll — Zoom"          Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="Ctrl+0 — Reset zoom"         Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="Middle mouse — Pan the view" Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="Delete — Remove selected"    Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                            <TextBlock Text="Esc — Close editor"          Foreground="{StaticResource Cocoa.TextSecondaryBrush}" Margin="0,2.5"/>
+                        </StackPanel>
+                    </Grid>
+                    <TextBlock Text="Click anywhere or press any key to dismiss"
+                               Foreground="{StaticResource Cocoa.TextMutedBrush}" FontStyle="Italic"
+                               HorizontalAlignment="Center" Margin="0,18,0,0" FontSize="11.5"/>
+                </StackPanel>
             </Border>
+        </Border>
 
-            <!-- Main Canvas Area -->
-            <ScrollViewer Grid.Row="2" Name="EditorScrollViewer" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
-                <ScrollViewer.Background>
-                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" Opacity="0.3">
-                        <GradientStop Color="#0a0a0a" Offset="0"/>
-                        <GradientStop Color="#1a1a1a" Offset="1"/>
-                    </LinearGradientBrush>
-                </ScrollViewer.Background>
-                <Grid Name="ImageCanvas" HorizontalAlignment="Center" VerticalAlignment="Center" UseLayoutRounding="True" SnapsToDevicePixels="True">
-                    <Grid.RenderTransform>
-                        <TransformGroup>
-                            <ScaleTransform x:Name="ZoomTransform" ScaleX="1" ScaleY="1" CenterX="0" CenterY="0"/>
-                            <TranslateTransform x:Name="PanTransform" X="0" Y="0"/>
-                        </TransformGroup>
-                    </Grid.RenderTransform>
-                    <Image Name="ImageDisplay" />
-                    <Canvas Name="DrawingCanvas" 
-                            MouseDown="Canvas_MouseDown"
-                            MouseMove="Canvas_MouseMove"
-                            MouseUp="Canvas_MouseUp"
-                            Background="Transparent"
-                            SnapsToDevicePixels="True"/>
-                </Grid>
-            </ScrollViewer>
-        </Grid>
-    </Border>
+        <!-- ░░ Canvas ░░ -->
+        <ScrollViewer Grid.Row="2" Name="EditorScrollViewer"
+                      HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
+                      Background="{StaticResource Cocoa.CanvasBrush}">
+            <Grid Name="ImageCanvas" HorizontalAlignment="Center" VerticalAlignment="Center"
+                  UseLayoutRounding="True" SnapsToDevicePixels="True">
+                <Grid.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform x:Name="ZoomTransform" ScaleX="1" ScaleY="1" CenterX="0" CenterY="0"/>
+                        <TranslateTransform x:Name="PanTransform" X="0" Y="0"/>
+                    </TransformGroup>
+                </Grid.RenderTransform>
+                <!-- HighQuality scaling avoids the shimmer/moiré artifacts the default linear
+                     sampler produces when the screenshot is shown below 100% zoom. -->
+                <Image Name="ImageDisplay" RenderOptions.BitmapScalingMode="HighQuality"/>
+                <Canvas Name="DrawingCanvas"
+                        MouseDown="Canvas_MouseDown"
+                        MouseMove="Canvas_MouseMove"
+                        MouseUp="Canvas_MouseUp"
+                        Background="Transparent"
+                        SnapsToDevicePixels="True"/>
+            </Grid>
+        </ScrollViewer>
+    </Grid>
 </Window>
diff --git a/MoneyShot/Views/EditorWindow.xaml.cs b/MoneyShot/Views/EditorWindow.xaml.cs
index 09990e3..b61fd45 100644
--- a/MoneyShot/Views/EditorWindow.xaml.cs
+++ b/MoneyShot/Views/EditorWindow.xaml.cs
@@ -78,6 +78,17 @@ public partial class EditorWindow : Window
     // Cached pen for hit testing to avoid repeated allocations
     private static readonly Pen HitTestPen = new(Brushes.Black, 10);
 
+    // Selection chrome (border + handles). Bright caramel matches the cocoa theme and stays
+    // visible against most screenshot content. Frozen so it can be shared by every handle.
+    private static readonly SolidColorBrush SelectionBrush = CreateFrozen(Color.FromRgb(0xE8, 0xA8, 0x5C));
+
+    private static SolidColorBrush CreateFrozen(Color color)
+    {
+        var brush = new SolidColorBrush(color);
+        brush.Freeze();
+        return brush;
+    }
+
     // Middle-mouse pan state. Held while the user is dragging with MMB to translate the view.
     private bool _isPanning;
     private Point _panStartPoint;
@@ -91,7 +102,6 @@ public EditorWindow(BitmapSource image)
         _originalImage = image;
         _saveService = new SaveService();
         DisplayImage();
-        SetupToolbar();
 
         // Add keyboard event handler for Delete key
         KeyDown += EditorWindow_KeyDown;
@@ -169,36 +179,36 @@ private void EditorWindow_KeyDown(object sender, KeyEventArgs e)
             switch (e.Key)
             {
                 case Key.R:
-                    _currentTool = AnnotationTool.Rectangle;
+                    SelectTool(AnnotationTool.Rectangle);
                     e.Handled = true;
                     break;
                 case Key.C when !e.KeyboardDevice.Modifiers.HasFlag(ModifierKeys.Control):
-                    _currentTool = AnnotationTool.Circle;
+                    SelectTool(AnnotationTool.Circle);
                     e.Handled = true;
                     break;
                 case Key.A when !e.KeyboardDevice.Modifiers.HasFlag(ModifierKeys.Control):
-                    _currentTool = AnnotationTool.Arrow;
+                    SelectTool(AnnotationTool.Arrow);
                     e.Handled = true;
                     break;
                 case Key.L:
-                    _currentTool = AnnotationTool.Line;
+                    SelectTool(AnnotationTool.Line);
                     e.Handled = true;
                     break;
                 case Key.F:
-                    _currentTool = AnnotationTool.Freehand;
+                    SelectTool(AnnotationTool.Freehand);
                     e.Handled = true;
                     break;
                 case Key.T:
-                    _currentTool = AnnotationTool.Text;
+                    SelectTool(AnnotationTool.Text);
                     e.Handled = true;
                     break;
                 case Key.P:
-                    _currentTool = AnnotationTool.Blur;
+                    SelectTool(AnnotationTool.Blur);
                     e.Handled = true;
                     break;
                 case Key.D1:
                 case Key.NumPad1:
-                    _currentTool = AnnotationTool.Number;
+                    SelectTool(AnnotationTool.Number);
                     e.Handled = true;
                     break;
                 case Key.Escape:
@@ -409,7 +419,7 @@ internal void UndoCrop(BitmapSource previousImage, IReadOnlyList<UIElement> prev
         _cropRectangle = null;
         _isCropping = false;
         _numberCounter = previousNumberCounter;
-        _currentTool = AnnotationTool.Cursor;
+        SelectTool(AnnotationTool.Cursor);
         ClearSelection();
     }
 
@@ -429,11 +439,6 @@ private void DisplayImage()
         DrawingCanvas.Height = _originalImage.PixelHeight;
     }
 
-    private void SetupToolbar()
-    {
-        // Tool buttons will be set up in XAML
-    }
-
     private Point ClampToCanvasBounds(Point point)
     {
         var clampedX = Math.Max(0, Math.Min(point.X, DrawingCanvas.Width));
@@ -862,65 +867,64 @@ private TextBlock CreateNumberLabel()
 
     private TextBlock? CreateTextLabel()
     {
-        // Show a simple input dialog
+        // Small modal prompt for the label text, styled from the cocoa theme.
         var inputDialog = new Window
         {
-            Title = "Enter Text",
-            Width = 300,
-            Height = 150,
+            Title = "Add text",
+            Width = 340,
+            SizeToContent = SizeToContent.Height,
+            ResizeMode = ResizeMode.NoResize,
             WindowStartupLocation = WindowStartupLocation.CenterOwner,
             Owner = this,
-            Background = new SolidColorBrush(Color.FromRgb(45, 45, 48))
+            Background = (Brush)FindResource("Cocoa.WindowBrush"),
+            Foreground = (Brush)FindResource("Cocoa.TextBrush")
         };
 
-        var grid = new Grid { Margin = new Thickness(10) };
+        var grid = new Grid { Margin = new Thickness(16) };
+        grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
         grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
-        grid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
         grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
 
         var label = new TextBlock
         {
-            Text = "Enter text:",
-            Foreground = Brushes.White,
-            Margin = new Thickness(0, 0, 0, 5)
+            Text = "Label text",
+            Foreground = (Brush)FindResource("Cocoa.TextSecondaryBrush"),
+            Margin = new Thickness(0, 0, 0, 6)
         };
         Grid.SetRow(label, 0);
         grid.Children.Add(label);
 
         var textBox = new TextBox
         {
-            Margin = new Thickness(0, 5, 0, 10),
-            Padding = new Thickness(5),
-            Background = new SolidColorBrush(Color.FromRgb(62, 62, 66)),
-            Foreground = Brushes.White,
-            BorderBrush = new SolidColorBrush(Color.FromRgb(85, 85, 85))
+            Style = (Style)FindResource("CocoaTextBox"),
+            Margin = new Thickness(0, 0, 0, 14)
         };
         Grid.SetRow(textBox, 1);
         grid.Children.Add(textBox);
 
         var okButton = new Button
         {
-            Content = "OK",
-            Padding = new Thickness(20, 5, 20, 5),
-            Background = new SolidColorBrush(Color.FromRgb(14, 99, 156)),
-            Foreground = Brushes.White,
-            BorderBrush = new SolidColorBrush(Color.FromRgb(17, 119, 187)),
-            HorizontalAlignment = HorizontalAlignment.Right
+            Content = "Add",
+            Style = (Style)FindResource("AccentButton"),
+            MinWidth = 76,
+            IsDefault = true
         };
         okButton.Click += (s, e) => inputDialog.DialogResult = true;
 
+        var cancelButton = new Button
+        {
+            Content = "Cancel",
+            Style = (Style)FindResource("SubtleButton"),
+            MinWidth = 76,
+            Margin = new Thickness(0, 0, 8, 0),
+            IsCancel = true
+        };
+
         var buttonPanel = new StackPanel
         {
             Orientation = Orientation.Horizontal,
             HorizontalAlignment = HorizontalAlignment.Right
         };
-        var cancelButton = new Button
-        {
-            Content = "Cancel",
-            Padding = new Thickness(20, 5, 20, 5),
-            Margin = new Thickness(0, 0, 8, 0)
-        };
-        cancelButton.Click += (s, e) => inputDialog.DialogResult = false;
         buttonPanel.Children.Add(cancelButton);
         buttonPanel.Children.Add(okButton);
         Grid.SetRow(buttonPanel, 2);
@@ -1083,12 +1087,8 @@ private void UpdateArrow(Point currentPoint)
 
     private bool IsPointInElement(UIElement element, Point point)
     {
-        var left = Canvas.GetLeft(element);
-        var top = Canvas.GetTop(element);
-        
-        // Handle NaN values (elements without explicit positioning)
-        if (double.IsNaN(left)) left = 0;
-        if (double.IsNaN(top)) top = 0;
+        var left = CanvasPosition.GetLeft(element);
+        var top = CanvasPosition.GetTop(element);
 
         if (element is Path path)
         {
@@ -1155,7 +1155,7 @@ private void SelectElement(UIElement element)
         // Add visual indicator for selection
         _selectionBorder = new Border
         {
-            BorderBrush = new SolidColorBrush(Colors.Blue),
+            BorderBrush = SelectionBrush,
             BorderThickness = new Thickness(2),
             IsHitTestVisible = false
         };
@@ -1224,7 +1224,7 @@ private void CreateResizeHandles(double left, double top, double width, double h
     {
         ClearResizeHandlesOnly();
 
-        var handleColor = new SolidColorBrush(Colors.Blue);
+        var handleColor = SelectionBrush;
 
         // 8-handle bounding box. Corner handles drive proportional resize, edges drive single-axis.
         _resizeHandles.Add(CreateResizeHandle(left - 2,                  top - 2,                   handleColor, ElementResizeMode.TopLeft));
@@ -1240,7 +1240,7 @@ private void CreateResizeHandles(double left, double top, double width, double h
     private void CreateEndpointHandles(Point start, Point end)
     {
         ClearResizeHandlesOnly();
-        var handleColor = new SolidColorBrush(Colors.Blue);
+        var handleColor = SelectionBrush;
         var startHandle = CreateEndpointHandle(start, handleColor, isStart: true);
         var endHandle   = CreateEndpointHandle(end,   handleColor, isStart: false);
         _resizeHandles.Add(startHandle);
@@ -1704,28 +1704,26 @@ private void ToolButton_Click(object sender, RoutedEventArgs e)
         {
             if (Enum.TryParse<AnnotationTool>(toolName, out var tool))
             {
-                _currentTool = tool;
-                UpdateActiveToolButton(button);
+                SelectTool(tool);
             }
         }
     }
 
     /// <summary>
-    /// Highlights the toolbar button for the active tool by swapping its style. Walks up the
-    /// visual tree to find the WrapPanel that holds all tool buttons so we don't need named
-    /// references for each one.
+    /// Switches the active tool and highlights its toolbar button. Used by both toolbar clicks
+    /// and keyboard shortcuts so the highlight never goes out of sync with the actual tool.
     /// </summary>
-    private void UpdateActiveToolButton(Button activeButton)
+    private void SelectTool(AnnotationTool tool)
     {
-        var glassStyle = (Style)Resources["GlassButton"];
-        var activeStyle = (Style)Resources["ActiveToolButton"];
-        var parent = System.Windows.Media.VisualTreeHelper.GetParent(activeButton);
-        if (parent is not Panel toolPanel) return;
-        foreach (var child in toolPanel.Children)
+        _currentTool = tool;
+        var normalStyle = (Style)FindResource("ToolButton");
+        var activeStyle = (Style)FindResource("ToolButtonActive");
+        var toolName = tool.ToString();
+        foreach (var child in ToolButtonsPanel.Children)
         {
-            if (child is Button b && b.Tag is string)
+            if (child is Button b && b.Tag is string tag)
             {
-                b.Style = ReferenceEquals(b, activeButton) ? activeStyle : glassStyle;
+                b.Style = tag == toolName ? activeStyle : normalStyle;
             }
         }
     }
@@ -1842,10 +1840,12 @@ private void ChangeElementColor(UIElement element, Color newColor)
     
     private bool IsColorChangeableElement(UIElement element)
     {
-        // Pixelate rectangles have DrawingBrush and should not be color-changed
-        if (element is Rectangle rect && rect.Fill is DrawingBrush)
+        // Pixelate rectangles render an ImageBrush of the underlying pixels; recolouring them
+        // makes no sense and would just paint a visible stroke. (Detect via tag — the fill is
+        // an ImageBrush, not a DrawingBrush, so a brush-type check doesn't identify them.)
+        if (element is Rectangle { Tag: PixelateTag })
             return false;
-            
+
         return element is Shape || element is TextBlock;
     }
 
@@ -1921,7 +1921,7 @@ private void ApplyCrop()
             _numberCounter = 1;
 
             // Reset to cursor tool
-            _currentTool = AnnotationTool.Cursor;
+            SelectTool(AnnotationTool.Cursor);
             _undo.Push(new UndoController.CropUndoAction(previousImage, previousElements, previousNumberCounter));
         }
         catch (Exception ex)
@@ -1937,12 +1937,18 @@ private void Save_Click(object sender, RoutedEventArgs e)
         try
         {
             var finalImage = CaptureCanvasAsImage();
-            
+
+            // Honour the user's configured save folder and default format — previously the
+            // dialog always opened wherever Windows last left it, defaulting to PNG.
+            var settings = new SettingsService().LoadSettings();
+            var defaultFormat = settings.DefaultFileFormat.ToUpperInvariant();
             var saveDialog = new Microsoft.Win32.SaveFileDialog
             {
                 Filter = "PNG Image|*.png|JPEG Image|*.jpg|Bitmap Image|*.bmp",
-                DefaultExt = ".png",
-                FileName = _saveService.GenerateFileName("PNG")
+                FilterIndex = defaultFormat switch { "JPG" or "JPEG" => 2, "BMP" => 3, _ => 1 },
+                DefaultExt = defaultFormat switch { "JPG" or "JPEG" => ".jpg", "BMP" => ".bmp", _ => ".png" },
+                InitialDirectory = settings.DefaultSavePath,
+                FileName = _saveService.GenerateFileName(settings.DefaultFileFormat)
             };
 
             if (saveDialog.ShowDialog() == true)
@@ -2015,6 +2021,10 @@ private void ApplyZoom()
     {
         ZoomTransform.ScaleX = _zoomLevel;
         ZoomTransform.ScaleY = _zoomLevel;
+        if (ZoomLevelLabel != null)
+        {
+            ZoomLevelLabel.Text = $"{Math.Round(_zoomLevel * 100)}%";
+        }
     }
 
     private BitmapSource CaptureCanvasAsImage() =>
@@ -2051,21 +2061,15 @@ private void MaximizeRestore_Click(object sender, RoutedEventArgs e)
         if (WindowState == WindowState.Maximized)
         {
             WindowState = WindowState.Normal;
-            if (MaximizeRestoreButton != null)
-            {
-                MaximizeRestoreButton.Content = "🗖";
-            }
+            MaximizeRestoreIcon.Data = (Geometry)FindResource("Icon.WindowMaximize");
         }
         else
         {
             WindowState = WindowState.Maximized;
-            if (MaximizeRestoreButton != null)
-            {
-                MaximizeRestoreButton.Content = "🗗";
-            }
+            MaximizeRestoreIcon.Data = (Geometry)FindResource("Icon.WindowRestore");
         }
     }
-    
+
     private void Close_Click(object sender, RoutedEventArgs e)
     {
         Close();
diff --git a/MoneyShot/Views/HistoryWindow.xaml b/MoneyShot/Views/HistoryWindow.xaml
index 59e7c9a..de93d63 100644
--- a/MoneyShot/Views/HistoryWindow.xaml
+++ b/MoneyShot/Views/HistoryWindow.xaml
@@ -1,41 +1,86 @@
 <Window x:Class="MoneyShot.Views.HistoryWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Money Shot - Capture History"
+        Title="Money Shot — Capture History"
         Height="640" Width="900"
         MinHeight="480" MinWidth="720"
         WindowStartupLocation="CenterScreen"
-        Background="#0F172A">
+        Background="{StaticResource Cocoa.WindowBrush}"
+        Foreground="{StaticResource Cocoa.TextBrush}"
+        FontFamily="Segoe UI"
+        WindowStyle="None"
+        ResizeMode="CanResize"
+        UseLayoutRounding="True"
+        TextOptions.TextFormattingMode="Display">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="0"
+                      ResizeBorderThickness="6"
+                      GlassFrameThickness="0,0,0,1"
+                      CornerRadius="0"
+                      UseAeroCaptionButtons="False"/>
+    </WindowChrome.WindowChrome>
+
     <Window.Resources>
         <Style x:Key="ThumbBorder" TargetType="Border">
-            <Setter Property="BorderBrush" Value="#334155"/>
+            <Setter Property="BorderBrush" Value="{StaticResource Cocoa.BorderSubtleBrush}"/>
             <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="CornerRadius" Value="6"/>
-            <Setter Property="Background" Value="#1E293B"/>
+            <Setter Property="CornerRadius" Value="8"/>
+            <Setter Property="Background" Value="{StaticResource Cocoa.SurfaceBrush}"/>
             <Setter Property="Margin" Value="6"/>
-            <Setter Property="Padding" Value="6"/>
+            <Setter Property="Padding" Value="8"/>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="BorderBrush" Value="#3B82F6"/>
+                    <Setter Property="BorderBrush" Value="{StaticResource Cocoa.AccentBrush}"/>
+                    <Setter Property="Background" Value="{StaticResource Cocoa.SurfaceAltBrush}"/>
                 </Trigger>
             </Style.Triggers>
         </Style>
     </Window.Resources>
+
     <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <Border Grid.Row="0" Background="#1E293B" Padding="16,10">
+        <!-- ░░ Title bar ░░ -->
+        <Border Grid.Row="0" Background="{StaticResource Cocoa.TitleBarBrush}"
+                BorderBrush="{StaticResource Cocoa.BorderSubtleBrush}" BorderThickness="0,0,0,1"
+                MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
+            <Grid Height="32">
+                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="14,0,0,0">
+                    <TextBlock Text="Money Shot" FontSize="12.5" FontWeight="SemiBold"
+                               Foreground="{StaticResource Cocoa.TextBrush}" VerticalAlignment="Center"/>
+                    <TextBlock Text="Capture history" FontSize="12.5" Margin="8,0,0,0"
+                               Foreground="{StaticResource Cocoa.TextMutedBrush}" VerticalAlignment="Center"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Click="Minimize_Click" Style="{StaticResource TitleBarButton}" Focusable="False">
+                        <Path Style="{StaticResource CaptionIcon}" Data="{StaticResource Icon.WindowMinimize}"/>
+                    </Button>
+                    <Button Click="Close_Click" Style="{StaticResource TitleBarCloseButton}" Focusable="False">
+                        <Path Style="{StaticResource CaptionIcon}" Data="{StaticResource Icon.WindowClose}"/>
+                    </Button>
+                </StackPanel>
+            </Grid>
+        </Border>
+
+        <!-- ░░ Header ░░ -->
+        <Border Grid.Row="1" Background="{StaticResource Cocoa.SurfaceBrush}"
+                BorderBrush="{StaticResource Cocoa.BorderSubtleBrush}" BorderThickness="0,0,0,1"
+                Padding="18,12">
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="Capture History" FontSize="18" FontWeight="SemiBold" Foreground="White"/>
-                <TextBlock Name="CountLabel" Foreground="#94A3B8" FontSize="13" VerticalAlignment="Center" Margin="12,0,0,0"/>
+                <TextBlock Text="Capture history" FontSize="16" FontWeight="SemiBold"
+                           Foreground="{StaticResource Cocoa.TextBrush}"/>
+                <TextBlock Name="CountLabel" Foreground="{StaticResource Cocoa.TextSecondaryBrush}"
+                           FontSize="12.5" VerticalAlignment="Center" Margin="12,0,0,0"/>
             </StackPanel>
         </Border>
 
-        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
+        <!-- ░░ Thumbnail grid ░░ -->
+        <ScrollViewer Grid.Row="2" VerticalScrollBarVisibility="Auto" Padding="10">
             <ItemsControl Name="HistoryList">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
@@ -45,13 +90,19 @@
             </ItemsControl>
         </ScrollViewer>
 
-        <Border Grid.Row="2" Background="#1E293B" Padding="16,10">
+        <!-- ░░ Footer ░░ -->
+        <Border Grid.Row="3" Background="{StaticResource Cocoa.SurfaceBrush}"
+                BorderBrush="{StaticResource Cocoa.BorderSubtleBrush}" BorderThickness="0,1,0,0"
+                Padding="18,12">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                <Button Name="OpenFolderButton" Content="Open History Folder" Padding="14,6"
-                        Background="#334155" Foreground="White" BorderBrush="#475569"
-                        Click="OpenFolder_Click" Margin="0,0,8,0"/>
-                <Button Content="Close" Padding="14,6" Background="#3B82F6" Foreground="White"
-                        BorderBrush="#1D4ED8" Click="Close_Click"/>
+                <Button Name="OpenFolderButton" Click="OpenFolder_Click"
+                        Style="{StaticResource SubtleButton}" Padding="14,7" Margin="0,0,8,0">
+                    <StackPanel Orientation="Horizontal">
+                        <Path Style="{StaticResource ToolIcon}" Data="{StaticResource Icon.Folder}"/>
+                        <TextBlock Text="Open history folder" Margin="7,0,0,0" VerticalAlignment="Center"/>
+                    </StackPanel>
+                </Button>
+                <Button Content="Close" Click="Close_Click" Style="{StaticResource AccentButton}" Padding="20,7"/>
             </StackPanel>
         </Border>
     </Grid>
diff --git a/MoneyShot/Views/HistoryWindow.xaml.cs b/MoneyShot/Views/HistoryWindow.xaml.cs
index b1faf1d..26fdb78 100644
--- a/MoneyShot/Views/HistoryWindow.xaml.cs
+++ b/MoneyShot/Views/HistoryWindow.xaml.cs
@@ -49,7 +49,7 @@ private FrameworkElement BuildThumbnailTile(HistoryEntry entry)
         var meta = new TextBlock
         {
             Text = $"{entry.CapturedAt:yyyy-MM-dd HH:mm:ss}\n{entry.Width}×{entry.Height} · {entry.Source}",
-            Foreground = new SolidColorBrush(Color.FromRgb(0xCB, 0xD5, 0xE1)),
+            Foreground = (Brush)FindResource("Cocoa.TextSecondaryBrush"),
             FontSize = 11,
             Margin = new Thickness(0, 6, 0, 0),
             TextWrapping = TextWrapping.Wrap,
@@ -83,7 +83,7 @@ private ContextMenu BuildContextMenu(HistoryEntry entry)
         copyItem.Click += (_, _) => CopyToClipboard(entry);
         menu.Items.Add(copyItem);
 
-        menu.Items.Add(new Separator());
+        menu.Items.Add(new Separator { Style = (Style)FindResource("CocoaMenuSeparator") });
 
         var deleteItem = new MenuItem { Header = "Delete" };
         deleteItem.Click += (_, _) =>
@@ -112,8 +112,17 @@ private void OpenInEditor(HistoryEntry entry)
                 MessageBoxButton.OK, MessageBoxImage.Warning);
             return;
         }
-        var editor = new EditorWindow(image);
-        editor.ShowDialog();
+        try
+        {
+            var editor = new EditorWindow(image);
+            editor.ShowDialog();
+        }
+        finally
+        {
+            // Same working-set trim the capture flow does — without it, opening a capture from
+            // history left hundreds of MB of bitmap backings resident after the editor closed.
+            MemoryTrimmer.TrimAfterEditorClose();
+        }
     }
 
     private void CopyToClipboard(HistoryEntry entry)
@@ -145,4 +154,22 @@ private void OpenFolder_Click(object sender, RoutedEventArgs e)
     }
 
     private void Close_Click(object sender, RoutedEventArgs e) => Close();
+
+    private void Minimize_Click(object sender, RoutedEventArgs e)
+    {
+        WindowState = WindowState.Minimized;
+    }
+
+    private void TitleBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ClickCount != 1) return;
+        try
+        {
+            DragMove();
+        }
+        catch (InvalidOperationException)
+        {
+            // DragMove throws if the mouse is released before the drag starts.
+        }
+    }
 }
diff --git a/MoneyShot/Views/RegionSelector.xaml b/MoneyShot/Views/RegionSelector.xaml
index bbfde0e..e395d8b 100644
--- a/MoneyShot/Views/RegionSelector.xaml
+++ b/MoneyShot/Views/RegionSelector.xaml
@@ -1,13 +1,30 @@
 <Window x:Class="MoneyShot.Views.RegionSelector"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Select Region" 
+        Title="Select Region"
+        Background="Black"
         MouseDown="Window_MouseDown"
         MouseMove="Window_MouseMove"
         MouseUp="Window_MouseUp"
         KeyDown="Window_KeyDown">
     <Grid>
         <Image Name="BackgroundImage" Stretch="Fill"/>
+        <!-- Dims everything outside the active selection. Geometry is updated from code-behind;
+             before a drag starts it covers the whole surface. -->
+        <Path Name="DimOverlay" Fill="#5C000000" IsHitTestVisible="False"/>
         <Canvas Name="SelectionCanvas"/>
+        <!-- Instruction hint, hidden once the user starts dragging. -->
+        <Border Name="HintBadge" HorizontalAlignment="Center" VerticalAlignment="Top"
+                Margin="0,28,0,0" Background="#D8221A13" BorderBrush="#C28E5C" BorderThickness="1"
+                CornerRadius="6" Padding="14,8" IsHitTestVisible="False">
+            <TextBlock Text="Drag to select a region  ·  Esc to cancel"
+                       Foreground="#F1E9DE" FontFamily="Segoe UI" FontSize="13"/>
+        </Border>
+        <!-- Live dimensions badge that follows the selection. -->
+        <Border Name="SizeBadge" HorizontalAlignment="Left" VerticalAlignment="Top"
+                Background="#D8221A13" BorderBrush="#C28E5C" BorderThickness="1"
+                CornerRadius="4" Padding="8,3" Visibility="Collapsed" IsHitTestVisible="False">
+            <TextBlock Name="SizeBadgeText" Foreground="#F1E9DE" FontFamily="Segoe UI" FontSize="12"/>
+        </Border>
     </Grid>
 </Window>
diff --git a/MoneyShot/Views/RegionSelector.xaml.cs b/MoneyShot/Views/RegionSelector.xaml.cs
index cddb0eb..4d918c1 100644
--- a/MoneyShot/Views/RegionSelector.xaml.cs
+++ b/MoneyShot/Views/RegionSelector.xaml.cs
@@ -46,42 +46,77 @@ private void SetupFullScreenOverlay(BitmapSource frozenScreen)
         _virtualScreenLeft = minX;
         _virtualScreenTop = minY;
 
-        // Set window to cover all screens
+        // Set window to cover all screens. Deliberately NOT AllowsTransparency: the frozen
+        // screenshot fully covers the window, and a layered (transparent) window this size is
+        // composed in software across every monitor — visibly laggy at 4K. The dimming effect
+        // is done with the DimOverlay path instead.
         WindowStyle = WindowStyle.None;
         ResizeMode = ResizeMode.NoResize;
-        AllowsTransparency = true; // Required for transparent overlay with WindowStyle.None
         Topmost = true;
-        
+
         // Position and size to cover entire virtual screen
         Left = minX;
         Top = minY;
         Width = maxX - minX;
         Height = maxY - minY;
-        
+
         Cursor = Cursors.Cross;
-        
+
         // Show immediately to prevent black screen
         ShowInTaskbar = false;
-        
+
         // Display the frozen screen in the background
         try
         {
-            // Set the frozen screenshot as the background
             if (BackgroundImage != null)
             {
                 BackgroundImage.Source = frozenScreen;
                 BackgroundImage.Stretch = Stretch.Fill;
             }
-            
-            // Add semi-transparent overlay on top
-            Background = new SolidColorBrush(Color.FromArgb(100, 0, 0, 0));
         }
         catch (Exception ex)
         {
             MoneyShot.Services.Logger.Error("Error displaying frozen screen", ex);
-            // Fallback to just the overlay without frozen background
-            Background = new SolidColorBrush(Color.FromArgb(100, 0, 0, 0));
         }
+
+        // Dim the whole surface until a selection exists.
+        UpdateDimOverlay(null);
+    }
+
+    /// <summary>
+    /// Dims everything outside <paramref name="selection"/>. Null dims the entire surface,
+    /// which doubles as the "no selection yet" state.
+    /// </summary>
+    private void UpdateDimOverlay(Rect? selection)
+    {
+        var full = new RectangleGeometry(new Rect(0, 0, Width, Height));
+        if (selection is { } rect)
+        {
+            DimOverlay.Data = new CombinedGeometry(GeometryCombineMode.Exclude, full, new RectangleGeometry(rect));
+        }
+        else
+        {
+            DimOverlay.Data = full;
+        }
+    }
+
+    /// <summary>Moves the size badge under the selection (or above it near the bottom edge).</summary>
+    private void UpdateSizeBadge(Rect selection)
+    {
+        SizeBadge.Visibility = Visibility.Visible;
+        SizeBadgeText.Text = $"{(int)selection.Width} × {(int)selection.Height}";
+
+        SizeBadge.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+        var badgeWidth = SizeBadge.DesiredSize.Width;
+        var badgeHeight = SizeBadge.DesiredSize.Height;
+
+        var x = Math.Max(4, Math.Min(selection.Right - badgeWidth, Width - badgeWidth - 4));
+        var y = selection.Bottom + 8;
+        if (y + badgeHeight > Height - 4)
+        {
+            y = selection.Top - badgeHeight - 8;
+        }
+        SizeBadge.Margin = new Thickness(x, Math.Max(4, y), 0, 0);
     }
 
     private void Window_MouseDown(object sender, MouseButtonEventArgs e)
@@ -90,12 +125,13 @@ private void Window_MouseDown(object sender, MouseButtonEventArgs e)
         {
             _isSelecting = true;
             _startPoint = e.GetPosition(this);
+            HintBadge.Visibility = Visibility.Collapsed;
 
             _selectionRectangle = new Rectangle
             {
-                Stroke = Brushes.Red,
-                StrokeThickness = 2,
-                Fill = new SolidColorBrush(Color.FromArgb(50, 255, 0, 0))
+                Stroke = new SolidColorBrush(Color.FromRgb(0xC2, 0x8E, 0x5C)),
+                StrokeThickness = 1.5,
+                Fill = Brushes.Transparent
             };
 
             Canvas.SetLeft(_selectionRectangle, _startPoint.X);
@@ -119,6 +155,10 @@ private void Window_MouseMove(object sender, MouseEventArgs e)
             Canvas.SetTop(_selectionRectangle, y);
             _selectionRectangle.Width = width;
             _selectionRectangle.Height = height;
+
+            var selection = new Rect(x, y, width, height);
+            UpdateDimOverlay(selection);
+            UpdateSizeBadge(selection);
         }
     }
 
diff --git a/MoneyShot/Views/SettingsWindow.xaml b/MoneyShot/Views/SettingsWindow.xaml
index 9bfb322..df0448c 100644
--- a/MoneyShot/Views/SettingsWindow.xaml
+++ b/MoneyShot/Views/SettingsWindow.xaml
@@ -1,358 +1,218 @@
 <Window x:Class="MoneyShot.Views.SettingsWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Settings - Money Shot" Height="600" Width="700"
+        Title="Settings — Money Shot" Height="640" Width="700"
         MinHeight="500" MinWidth="600"
         WindowStartupLocation="CenterScreen"
-        Background="Transparent"
-        AllowsTransparency="True"
+        Background="{StaticResource Cocoa.WindowBrush}"
+        Foreground="{StaticResource Cocoa.TextBrush}"
+        FontFamily="Segoe UI"
         WindowStyle="None"
-        ResizeMode="CanResize">
+        ResizeMode="CanResize"
+        UseLayoutRounding="True"
+        TextOptions.TextFormattingMode="Display">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="0"
+                      ResizeBorderThickness="6"
+                      GlassFrameThickness="0,0,0,1"
+                      CornerRadius="0"
+                      UseAeroCaptionButtons="False"/>
+    </WindowChrome.WindowChrome>
+
     <Window.Resources>
-        <!-- Glassmorphism Button Style -->
-        <Style x:Key="GlassButton" TargetType="Button">
-            <Setter Property="Background">
-                <Setter.Value>
-                    <SolidColorBrush Color="#40FFFFFF" Opacity="0.15"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderBrush">
-                <Setter.Value>
-                    <SolidColorBrush Color="#80FFFFFF" Opacity="0.3"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding" Value="8,5"/>
-            <Setter Property="Margin" Value="2"/>
+        <Style x:Key="SectionTitle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="Foreground" Value="{StaticResource Cocoa.TextBrush}"/>
+            <Setter Property="Margin" Value="0,0,0,12"/>
+        </Style>
+        <Style x:Key="FieldLabel" TargetType="TextBlock">
             <Setter Property="FontSize" Value="12"/>
-            <Setter Property="FontWeight" Value="Medium"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Effect">
-                <Setter.Value>
-                    <DropShadowEffect Color="Black" Direction="270" ShadowDepth="2" Opacity="0.3" BlurRadius="8"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="6"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background">
-                        <Setter.Value>
-                            <SolidColorBrush Color="#60FFFFFF" Opacity="0.25"/>
-                        </Setter.Value>
-                    </Setter>
-                </Trigger>
-                <Trigger Property="IsPressed" Value="True">
-                    <Setter Property="Background">
-                        <Setter.Value>
-                            <SolidColorBrush Color="#80FFFFFF" Opacity="0.35"/>
-                        </Setter.Value>
-                    </Setter>
-                </Trigger>
-            </Style.Triggers>
+            <Setter Property="Foreground" Value="{StaticResource Cocoa.TextSecondaryBrush}"/>
+            <Setter Property="Margin" Value="0,0,0,5"/>
         </Style>
-
-        <!-- Primary Action Button Style -->
-        <Style x:Key="PrimaryButton" TargetType="Button" BasedOn="{StaticResource GlassButton}">
-            <Setter Property="Background">
-                <Setter.Value>
-                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                        <GradientStop Color="#0E639C" Offset="0"/>
-                        <GradientStop Color="#1177BB" Offset="1"/>
-                    </LinearGradientBrush>
-                </Setter.Value>
-            </Setter>
+        <Style TargetType="CheckBox" BasedOn="{StaticResource CocoaCheckBox}">
+            <Setter Property="Margin" Value="0,5"/>
         </Style>
-
-        <!-- Glassmorphism ComboBox Style -->
-        <Style TargetType="ComboBox">
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="Background" Value="#3E3E42"/>
-            <Setter Property="BorderBrush" Value="#555"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding" Value="8,5"/>
-            <Setter Property="FontSize" Value="12"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ComboBox">
-                        <Grid>
-                            <ToggleButton Name="ToggleButton" 
-                                          Grid.Column="2"
-                                          Focusable="false"
-                                          IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                          ClickMode="Press"
-                                          Background="{TemplateBinding Background}"
-                                          BorderBrush="{TemplateBinding BorderBrush}"
-                                          BorderThickness="{TemplateBinding BorderThickness}">
-                                <ToggleButton.Template>
-                                    <ControlTemplate TargetType="ToggleButton">
-                                        <Border Name="Border" 
-                                                Background="{TemplateBinding Background}"
-                                                BorderBrush="{TemplateBinding BorderBrush}"
-                                                BorderThickness="{TemplateBinding BorderThickness}"
-                                                CornerRadius="4">
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition/>
-                                                    <ColumnDefinition Width="20"/>
-                                                </Grid.ColumnDefinitions>
-                                                <ContentPresenter Grid.Column="0" Margin="5,0,0,0" VerticalAlignment="Center"/>
-                                                <Path Grid.Column="1" 
-                                                      HorizontalAlignment="Center" 
-                                                      VerticalAlignment="Center"
-                                                      Data="M 0 0 L 4 4 L 8 0 Z" 
-                                                      Fill="White"/>
-                                            </Grid>
-                                        </Border>
-                                        <ControlTemplate.Triggers>
-                                            <Trigger Property="IsMouseOver" Value="True">
-                                                <Setter TargetName="Border" Property="Background" Value="#4E4E52"/>
-                                            </Trigger>
-                                        </ControlTemplate.Triggers>
-                                    </ControlTemplate>
-                                </ToggleButton.Template>
-                            </ToggleButton>
-                            <ContentPresenter Name="ContentSite"
-                                              IsHitTestVisible="False"
-                                              Content="{TemplateBinding SelectionBoxItem}"
-                                              ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                                              ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                              Margin="8,5,25,5"
-                                              VerticalAlignment="Center"
-                                              HorizontalAlignment="Left">
-                                <ContentPresenter.Resources>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="Foreground" Value="White"/>
-                                    </Style>
-                                </ContentPresenter.Resources>
-                            </ContentPresenter>
-                            <Popup Name="Popup"
-                                   Placement="Bottom"
-                                   IsOpen="{TemplateBinding IsDropDownOpen}"
-                                   AllowsTransparency="True"
-                                   Focusable="False"
-                                   PopupAnimation="Slide">
-                                <Grid Name="DropDown"
-                                      SnapsToDevicePixels="True"
-                                      MinWidth="{TemplateBinding ActualWidth}"
-                                      MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                                    <Border Name="DropDownBorder"
-                                            Background="#3E3E42"
-                                            BorderThickness="1"
-                                            BorderBrush="#555"
-                                            CornerRadius="4"
-                                            Margin="0,1,0,0">
-                                        <ScrollViewer Margin="4,6,4,6" SnapsToDevicePixels="True">
-                                            <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained"/>
-                                        </ScrollViewer>
-                                    </Border>
-                                </Grid>
-                            </Popup>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
+        <Style TargetType="RadioButton" BasedOn="{StaticResource CocoaRadioButton}">
+            <Setter Property="Margin" Value="0,4"/>
         </Style>
-
-        <!-- ComboBoxItem Style -->
-        <Style TargetType="ComboBoxItem">
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Padding" Value="8,5"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ComboBoxItem">
-                        <Border Name="Border" 
-                                Background="{TemplateBinding Background}"
-                                Padding="{TemplateBinding Padding}"
-                                CornerRadius="3">
-                            <ContentPresenter>
-                                <ContentPresenter.Resources>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="Foreground" Value="White"/>
-                                    </Style>
-                                </ContentPresenter.Resources>
-                            </ContentPresenter>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsHighlighted" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="#1177BB"/>
-                            </Trigger>
-                            <Trigger Property="IsSelected" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="#0E639C"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
+        <Style TargetType="ComboBox" BasedOn="{StaticResource CocoaComboBox}">
+            <Setter Property="Height" Value="32"/>
         </Style>
     </Window.Resources>
-    
-    <Border CornerRadius="12" BorderThickness="1">
-        <Border.BorderBrush>
-            <SolidColorBrush Color="White" Opacity="0.2"/>
-        </Border.BorderBrush>
-        <Border.Background>
-            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" Opacity="0.95">
-                <GradientStop Color="#1a1a2e" Offset="0"/>
-                <GradientStop Color="#16213e" Offset="0.5"/>
-                <GradientStop Color="#0f3460" Offset="1"/>
-            </LinearGradientBrush>
-        </Border.Background>
-        <Border.Effect>
-            <DropShadowEffect Color="Black" Direction="270" ShadowDepth="10" Opacity="0.5" BlurRadius="30"/>
-        </Border.Effect>
-        
-        <Grid Margin="1">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <!-- ░░ Title bar ░░ -->
+        <Border Grid.Row="0" Background="{StaticResource Cocoa.TitleBarBrush}"
+                BorderBrush="{StaticResource Cocoa.BorderSubtleBrush}" BorderThickness="0,0,0,1"
+                MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
+            <Grid Height="32">
+                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="14,0,0,0">
+                    <TextBlock Text="Money Shot" FontSize="12.5" FontWeight="SemiBold"
+                               Foreground="{StaticResource Cocoa.TextBrush}" VerticalAlignment="Center"/>
+                    <TextBlock Text="Settings" FontSize="12.5" Margin="8,0,0,0"
+                               Foreground="{StaticResource Cocoa.TextMutedBrush}" VerticalAlignment="Center"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Click="Minimize_Click" Style="{StaticResource TitleBarButton}" Focusable="False">
+                        <Path Style="{StaticResource CaptionIcon}" Data="{StaticResource Icon.WindowMinimize}"/>
+                    </Button>
+                    <Button Name="MaximizeRestoreButton" Click="MaximizeRestore_Click"
+                            Style="{StaticResource TitleBarButton}" Focusable="False">
+                        <Path Name="MaximizeRestoreIcon" Style="{StaticResource CaptionIcon}"
+                              Data="{StaticResource Icon.WindowMaximize}"/>
+                    </Button>
+                    <Button Click="Close_Click" Style="{StaticResource TitleBarCloseButton}" Focusable="False">
+                        <Path Style="{StaticResource CaptionIcon}" Data="{StaticResource Icon.WindowClose}"/>
+                    </Button>
+                </StackPanel>
+            </Grid>
+        </Border>
+
+        <!-- ░░ Content ░░ -->
+        <Grid Grid.Row="1" Margin="22,18,22,18">
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
                 <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
-            <!-- Window Title Bar -->
-            <Border Grid.Row="0" Background="#20FFFFFF" BorderBrush="#30FFFFFF" BorderThickness="0,0,0,1" 
-                    CornerRadius="12,12,0,0" MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
-                <Grid Height="35">
-                    <TextBlock Text="⚙️ Money Shot - Settings" 
-                               Foreground="White" 
-                               FontSize="14" 
-                               FontWeight="SemiBold"
-                               VerticalAlignment="Center" 
-                               Margin="15,0,0,0"/>
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,5,0">
-                        <Button Content="🗕" Click="Minimize_Click" Style="{StaticResource GlassButton}" 
-                                Width="40" Height="28" Padding="0" Margin="2,0"/>
-                        <Button Content="🗖" Name="MaximizeRestoreButton" Click="MaximizeRestore_Click" Style="{StaticResource GlassButton}" 
-                                Width="40" Height="28" Padding="0" Margin="2,0"/>
-                        <Button Content="🗙" Click="Close_Click" Style="{StaticResource GlassButton}" 
-                                Width="40" Height="28" Padding="0" Margin="2,0"/>
-                    </StackPanel>
-                </Grid>
-            </Border>
+            <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Auto">
+                <StackPanel Margin="0,0,6,0">
+                    <!-- General -->
+                    <Border Style="{StaticResource CocoaCard}" Margin="0,0,0,14">
+                        <StackPanel>
+                            <TextBlock Text="General" Style="{StaticResource SectionTitle}"/>
+                            <CheckBox Name="StartInTrayCheckbox" Content="Start in system tray"/>
+                            <CheckBox Name="RunOnStartupCheckbox" Content="Run on Windows startup"/>
+                            <CheckBox Name="MinimizeToTrayCheckbox" Content="Minimize to system tray"/>
+                            <CheckBox Name="CheckForUpdatesCheckbox" Content="Check for updates on startup"
+                                      ToolTip="Automatically check for new versions when the application starts"/>
+                            <CheckBox Name="DisableWindowsPrintScreenCheckbox"
+                                      Content="Disable Windows built-in Print Screen snipping shortcut"
+                                      ToolTip="Controls the Windows setting 'Use Print Screen key to open screen capture' so Money Shot can own the key"/>
+                            <CheckBox Name="HideUiFromScreenshotsCheckbox"
+                                      Content="Hide Money Shot windows from screenshots"
+                                      ToolTip="Captures a frozen frame before showing any selection UI, so Money Shot never appears in your screenshots"/>
+                        </StackPanel>
+                    </Border>
 
-            <!-- Main Content -->
-            <Grid Grid.Row="1" Margin="20">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*"/>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
+                    <!-- Hotkeys -->
+                    <Border Style="{StaticResource CocoaCard}" Margin="0,0,0,14">
+                        <StackPanel>
+                            <TextBlock Text="Hotkeys" Style="{StaticResource SectionTitle}"/>
 
-                <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Auto">
-                    <StackPanel>
-                        <!-- General Settings -->
-                        <Border Background="#15FFFFFF" BorderBrush="#25FFFFFF" BorderThickness="1" CornerRadius="8" Padding="20" Margin="0,0,0,15">
-                            <StackPanel>
-                                <TextBlock Text="General" FontSize="18" FontWeight="Bold" Foreground="White" Margin="0,0,0,10"/>
-                                <CheckBox Name="StartInTrayCheckbox" Content="Start in system tray" Foreground="White" Margin="0,5"/>
-                                <CheckBox Name="RunOnStartupCheckbox" Content="Run on Windows startup" Foreground="White" Margin="0,5"/>
-                                <CheckBox Name="MinimizeToTrayCheckbox" Content="Minimize to system tray" Foreground="White" Margin="0,5"/>
-                                <CheckBox Name="CheckForUpdatesCheckbox" Content="Check for updates on startup" Foreground="White" Margin="0,5">
-                                    <CheckBox.ToolTip>
-                                        <ToolTip Content="Automatically check for new versions when the application starts"/>
-                                    </CheckBox.ToolTip>
-                                </CheckBox>
-                                <CheckBox Name="DisableWindowsPrintScreenCheckbox" Content="Disable Windows built-in Print Screen snipping shortcut" Foreground="White" Margin="0,5">
-                                    <CheckBox.ToolTip>
-                                        <ToolTip Content="Controls the Windows setting 'Use Print Screen key to open screen capture'"/>
-                                    </CheckBox.ToolTip>
-                                </CheckBox>
-                                <CheckBox Name="HideUiFromScreenshotsCheckbox" Content="Invisibility Cloak" Foreground="White" Margin="0,5">
-                                    <CheckBox.ToolTip>
-                                        <ToolTip Content="Hides UI from screenshots"/>
-                                    </CheckBox.ToolTip>
-                                </CheckBox>
-                            </StackPanel>
-                        </Border>
+                            <TextBlock Text="Full screen capture" Style="{StaticResource FieldLabel}"/>
+                            <ComboBox Name="HotKeyCaptureComboBox">
+                                <ComboBoxItem Content="PrintScreen" IsSelected="True"/>
+                                <ComboBoxItem Content="Ctrl+PrintScreen"/>
+                                <ComboBoxItem Content="Alt+PrintScreen"/>
+                                <ComboBoxItem Content="Shift+PrintScreen"/>
+                                <ComboBoxItem Content="Ctrl+Shift+PrintScreen"/>
+                                <ComboBoxItem Content="F1"/>
+                                <ComboBoxItem Content="Ctrl+F1"/>
+                                <ComboBoxItem Content="Alt+F1"/>
+                                <ComboBoxItem Content="F5"/>
+                                <ComboBoxItem Content="Ctrl+F5"/>
+                            </ComboBox>
 
-                        <!-- Hotkey Settings -->
-                        <Border Background="#15FFFFFF" BorderBrush="#25FFFFFF" BorderThickness="1" CornerRadius="8" Padding="20" Margin="0,0,0,15">
-                            <StackPanel>
-                                <TextBlock Text="Hotkeys" FontSize="18" FontWeight="Bold" Foreground="White" Margin="0,0,0,10"/>
-                                
-                                <TextBlock Text="Full Screen Capture:" Foreground="White" Margin="0,5,0,2"/>
-                                <ComboBox Name="HotKeyCaptureComboBox" Background="#3E3E42" Foreground="White" BorderBrush="#555" Padding="5">
-                                    <ComboBoxItem Content="PrintScreen" Foreground="White" IsSelected="True"/>
-                                    <ComboBoxItem Content="Ctrl+PrintScreen" Foreground="White"/>
-                                    <ComboBoxItem Content="Alt+PrintScreen" Foreground="White"/>
-                                    <ComboBoxItem Content="Shift+PrintScreen" Foreground="White"/>
-                                    <ComboBoxItem Content="Ctrl+Shift+PrintScreen" Foreground="White"/>
-                                    <ComboBoxItem Content="F1" Foreground="White"/>
-                                    <ComboBoxItem Content="Ctrl+F1" Foreground="White"/>
-                                    <ComboBoxItem Content="Alt+F1" Foreground="White"/>
-                                    <ComboBoxItem Content="F5" Foreground="White"/>
-                                    <ComboBoxItem Content="Ctrl+F5" Foreground="White"/>
-                                </ComboBox>
-                                
-                                <TextBlock Text="Region Capture:" Foreground="White" Margin="0,10,0,2"/>
-                                <ComboBox Name="HotKeyRegionCaptureComboBox" Background="#3E3E42" Foreground="White" BorderBrush="#555" Padding="5">
-                                    <ComboBoxItem Content="PrintScreen" Foreground="White"/>
-                                    <ComboBoxItem Content="Ctrl+PrintScreen" Foreground="White" IsSelected="True"/>
-                                    <ComboBoxItem Content="Alt+PrintScreen" Foreground="White"/>
-                                    <ComboBoxItem Content="Shift+PrintScreen" Foreground="White"/>
-                                    <ComboBoxItem Content="Ctrl+Shift+PrintScreen" Foreground="White"/>
-                                    <ComboBoxItem Content="F2" Foreground="White"/>
-                                    <ComboBoxItem Content="Ctrl+F2" Foreground="White"/>
-                                    <ComboBoxItem Content="Alt+F2" Foreground="White"/>
-                                    <ComboBoxItem Content="F6" Foreground="White"/>
-                                    <ComboBoxItem Content="Ctrl+F6" Foreground="White"/>
-                                </ComboBox>
-                                
-                                <TextBlock Text="Individual Monitor Capture:" Foreground="White" Margin="0,15,0,2" FontWeight="Bold"/>
-                                <TextBlock Name="MonitorHotkeysInfo" Foreground="#AAAAAA" Margin="0,0,0,2" TextWrapping="Wrap"/>
-                                <TextBlock Text="(Individual monitor hotkeys are fixed and cannot be customized)" 
-                                           Foreground="#888888" FontSize="10" FontStyle="Italic" Margin="0,2,0,0"/>
-                            </StackPanel>
-                        </Border>
+                            <TextBlock Text="Region capture" Style="{StaticResource FieldLabel}" Margin="0,12,0,5"/>
+                            <ComboBox Name="HotKeyRegionCaptureComboBox">
+                                <ComboBoxItem Content="PrintScreen"/>
+                                <ComboBoxItem Content="Ctrl+PrintScreen" IsSelected="True"/>
+                                <ComboBoxItem Content="Alt+PrintScreen"/>
+                                <ComboBoxItem Content="Shift+PrintScreen"/>
+                                <ComboBoxItem Content="Ctrl+Shift+PrintScreen"/>
+                                <ComboBoxItem Content="F2"/>
+                                <ComboBoxItem Content="Ctrl+F2"/>
+                                <ComboBoxItem Content="Alt+F2"/>
+                                <ComboBoxItem Content="F6"/>
+                                <ComboBoxItem Content="Ctrl+F6"/>
+                            </ComboBox>
+
+                            <TextBlock Text="Individual monitor capture" Style="{StaticResource FieldLabel}" Margin="0,14,0,4"/>
+                            <TextBlock Name="MonitorHotkeysInfo" Foreground="{StaticResource Cocoa.TextSecondaryBrush}"
+                                       FontSize="12" TextWrapping="Wrap"/>
+                            <TextBlock Text="Individual monitor hotkeys are fixed and cannot be customized."
+                                       Foreground="{StaticResource Cocoa.TextMutedBrush}" FontSize="11"
+                                       FontStyle="Italic" Margin="0,4,0,0"/>
+                        </StackPanel>
+                    </Border>
+
+                    <!-- Saving -->
+                    <Border Style="{StaticResource CocoaCard}" Margin="0,0,0,14">
+                        <StackPanel>
+                            <TextBlock Text="Saving" Style="{StaticResource SectionTitle}"/>
 
-                        <!-- Save Settings -->
-                        <Border Background="#15FFFFFF" BorderBrush="#25FFFFFF" BorderThickness="1" CornerRadius="8" Padding="20" Margin="0,0,0,15">
-                            <StackPanel>
-                                <TextBlock Text="Save Settings" FontSize="18" FontWeight="Bold" Foreground="White" Margin="0,0,0,10"/>
-                                
-                                <TextBlock Text="Default save destination:" Foreground="White" Margin="0,5"/>
-                                <RadioButton Name="SaveToClipboardRadio" Content="Clipboard only" GroupName="SaveDestination" Foreground="White" Margin="0,5"/>
-                                <RadioButton Name="SaveToFileRadio" Content="File only" GroupName="SaveDestination" Foreground="White" Margin="0,5"/>
-                                <RadioButton Name="SaveToBothRadio" Content="Both clipboard and file" GroupName="SaveDestination" Foreground="White" Margin="0,5"/>
+                            <TextBlock Text="Default save destination" Style="{StaticResource FieldLabel}"/>
+                            <RadioButton Name="SaveToClipboardRadio" Content="Clipboard only" GroupName="SaveDestination"/>
+                            <RadioButton Name="SaveToFileRadio" Content="File only" GroupName="SaveDestination"/>
+                            <RadioButton Name="SaveToBothRadio" Content="Both clipboard and file" GroupName="SaveDestination"/>
 
-                                <TextBlock Text="Default save path:" Foreground="White" Margin="0,15,0,5"/>
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-                                    <TextBox Name="SavePathTextBox" Grid.Column="0" Margin="0,0,10,0" Padding="5" Background="#3E3E42" Foreground="White" BorderBrush="#555"/>
-                                    <Button Grid.Column="1" Content="Browse..." Click="BrowsePath_Click" Style="{StaticResource GlassButton}" Padding="10,5"/>
-                                </Grid>
+                            <TextBlock Text="Default save folder" Style="{StaticResource FieldLabel}" Margin="0,14,0,5"/>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <TextBox Name="SavePathTextBox" Grid.Column="0" Margin="0,0,10,0"
+                                         Style="{StaticResource CocoaTextBox}"/>
+                                <Button Grid.Column="1" Content="Browse…" Click="BrowsePath_Click"
+                                        Style="{StaticResource SubtleButton}" Padding="14,7"/>
+                            </Grid>
 
-                                <TextBlock Text="Default file format:" Foreground="White" Margin="0,15,0,5"/>
-                                <ComboBox Name="FormatComboBox" Background="#3E3E42" Foreground="White" BorderBrush="#555" Padding="5">
-                                    <ComboBoxItem Content="PNG" IsSelected="True"/>
-                                    <ComboBoxItem Content="JPG"/>
-                                    <ComboBoxItem Content="BMP"/>
-                                </ComboBox>
+                            <TextBlock Text="Default file format" Style="{StaticResource FieldLabel}" Margin="0,14,0,5"/>
+                            <ComboBox Name="FormatComboBox" Width="160" HorizontalAlignment="Left">
+                                <ComboBoxItem Content="PNG" IsSelected="True"/>
+                                <ComboBoxItem Content="JPG"/>
+                                <ComboBoxItem Content="BMP"/>
+                            </ComboBox>
+                        </StackPanel>
+                    </Border>
+
+                    <!-- History -->
+                    <Border Style="{StaticResource CocoaCard}">
+                        <StackPanel>
+                            <TextBlock Text="Capture history" Style="{StaticResource SectionTitle}"/>
+                            <CheckBox Name="SaveToHistoryCheckbox" Content="Keep a local history of captures"
+                                      ToolTip="Stores each capture on this PC so you can reopen it later. Never uploaded anywhere."/>
+
+                            <TextBlock Text="Keep the most recent" Style="{StaticResource FieldLabel}" Margin="0,12,0,5"/>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBox Name="HistoryRetentionTextBox" Width="70" Style="{StaticResource CocoaTextBox}"/>
+                                <TextBlock Text="captures (0–500)" Foreground="{StaticResource Cocoa.TextMutedBrush}"
+                                           FontSize="12" VerticalAlignment="Center" Margin="9,0,0,0"/>
                             </StackPanel>
-                        </Border>
-                    </StackPanel>
-                </ScrollViewer>
 
-                <!-- Buttons -->
-                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,20,0,0">
-                    <Button Content="Save" Click="Save_Click" Style="{StaticResource PrimaryButton}" Padding="20,10" Margin="0,0,10,0"/>
-                    <Button Content="Cancel" Click="Cancel_Click" Style="{StaticResource GlassButton}" Padding="20,10"/>
+                            <StackPanel Orientation="Horizontal" Margin="0,14,0,0">
+                                <Button Content="Open history folder" Click="OpenHistoryFolder_Click"
+                                        Style="{StaticResource SubtleButton}" Padding="13,7" Margin="0,0,8,0"/>
+                                <Button Content="Clear history…" Click="ClearHistory_Click"
+                                        Style="{StaticResource SubtleButton}" Padding="13,7"/>
+                            </StackPanel>
+                            <TextBlock Name="HistoryFolderText" Foreground="{StaticResource Cocoa.TextMutedBrush}"
+                                       FontSize="11" Margin="0,8,0,0" TextWrapping="Wrap"/>
+                        </StackPanel>
+                    </Border>
+                </StackPanel>
+            </ScrollViewer>
+
+            <!-- Footer -->
+            <Grid Grid.Row="1" Margin="0,16,0,0">
+                <Button Content="View logs" Click="ViewLogs_Click" Style="{StaticResource ToolButton}"
+                        HorizontalAlignment="Left" Padding="12,8"
+                        ToolTip="Open the Money Shot log folder"/>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Content="Cancel" Click="Cancel_Click" Style="{StaticResource SubtleButton}"
+                            Padding="18,9" Margin="0,0,8,0"/>
+                    <Button Content="Save" Click="Save_Click" Style="{StaticResource AccentButton}" Padding="22,9"/>
                 </StackPanel>
             </Grid>
         </Grid>
-    </Border>
+    </Grid>
 </Window>
diff --git a/MoneyShot/Views/SettingsWindow.xaml.cs b/MoneyShot/Views/SettingsWindow.xaml.cs
index 2e8b1d7..cfacf06 100644
--- a/MoneyShot/Views/SettingsWindow.xaml.cs
+++ b/MoneyShot/Views/SettingsWindow.xaml.cs
@@ -57,13 +57,18 @@ private void LoadSettings()
 
         DisableWindowsPrintScreenCheckbox.IsChecked = _settings.DisableWindowsPrintScreen;
         SavePathTextBox.Text = _settings.DefaultSavePath;
-        
+
         SaveToClipboardRadio.IsChecked = _settings.DefaultSaveDestination == SaveDestination.Clipboard;
         SaveToFileRadio.IsChecked = _settings.DefaultSaveDestination == SaveDestination.File;
         SaveToBothRadio.IsChecked = _settings.DefaultSaveDestination == SaveDestination.Both;
 
-        FormatComboBox.SelectedItem = _settings.DefaultFileFormat;
-        
+        SelectComboBoxItem(FormatComboBox, _settings.DefaultFileFormat);
+
+        // History settings
+        SaveToHistoryCheckbox.IsChecked = _settings.SaveCapturesToHistory;
+        HistoryRetentionTextBox.Text = _settings.HistoryRetentionCount.ToString();
+        HistoryFolderText.Text = new HistoryService().HistoryDirectory;
+
         // Load hotkey settings
         SelectComboBoxItem(HotKeyCaptureComboBox, _settings.HotKeyCapture);
         SelectComboBoxItem(HotKeyRegionCaptureComboBox, _settings.HotKeyRegionCapture);
@@ -128,8 +133,16 @@ private void Save_Click(object sender, RoutedEventArgs e)
             else
                 _settings.DefaultSaveDestination = SaveDestination.Both;
 
-            if (FormatComboBox.SelectedItem is string format)
-                _settings.DefaultFileFormat = format;
+            // Items are ComboBoxItems, not raw strings — reading SelectedItem as a string used to
+            // silently skip saving the format.
+            if (FormatComboBox.SelectedItem is System.Windows.Controls.ComboBoxItem formatItem)
+                _settings.DefaultFileFormat = formatItem.Content?.ToString() ?? "PNG";
+
+            _settings.SaveCapturesToHistory = SaveToHistoryCheckbox.IsChecked ?? true;
+            if (int.TryParse(HistoryRetentionTextBox.Text, out var retention))
+            {
+                _settings.HistoryRetentionCount = Math.Clamp(retention, 0, 500);
+            }
 
             // Save hotkey settings
             if (HotKeyCaptureComboBox.SelectedItem is System.Windows.Controls.ComboBoxItem captureItem)
@@ -179,6 +192,59 @@ private void Cancel_Click(object sender, RoutedEventArgs e)
     {
         Close();
     }
+
+    private void ViewLogs_Click(object sender, RoutedEventArgs e)
+    {
+        OpenFolderInExplorer(Logger.LogDirectoryPath);
+    }
+
+    private void OpenHistoryFolder_Click(object sender, RoutedEventArgs e)
+    {
+        OpenFolderInExplorer(new HistoryService().HistoryDirectory);
+    }
+
+    private static void OpenFolderInExplorer(string path)
+    {
+        try
+        {
+            System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo
+            {
+                FileName = path,
+                UseShellExecute = true
+            });
+        }
+        catch (Exception ex)
+        {
+            Logger.Error($"Failed to open folder '{path}'", ex);
+            MessageBox.Show($"Could not open folder:\n{path}", "Money Shot",
+                MessageBoxButton.OK, MessageBoxImage.Warning);
+        }
+    }
+
+    private void ClearHistory_Click(object sender, RoutedEventArgs e)
+    {
+        var history = new HistoryService();
+        var entries = history.List();
+        if (entries.Count == 0)
+        {
+            MessageBox.Show("History is already empty.", "Money Shot",
+                MessageBoxButton.OK, MessageBoxImage.Information);
+            return;
+        }
+
+        var result = MessageBox.Show(
+            $"Delete all {entries.Count} captures from local history? This cannot be undone.",
+            "Clear history",
+            MessageBoxButton.YesNo,
+            MessageBoxImage.Warning);
+        if (result != MessageBoxResult.Yes) return;
+
+        foreach (var entry in entries)
+        {
+            history.Delete(entry);
+        }
+        MessageBox.Show("History cleared.", "Money Shot", MessageBoxButton.OK, MessageBoxImage.Information);
+    }
     
     private void TitleBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
     {
@@ -211,18 +277,12 @@ private void MaximizeRestore_Click(object sender, RoutedEventArgs e)
         if (WindowState == WindowState.Maximized)
         {
             WindowState = WindowState.Normal;
-            if (MaximizeRestoreButton != null)
-            {
-                MaximizeRestoreButton.Content = "🗖";
-            }
+            MaximizeRestoreIcon.Data = (System.Windows.Media.Geometry)FindResource("Icon.WindowMaximize");
         }
         else
         {
             WindowState = WindowState.Maximized;
-            if (MaximizeRestoreButton != null)
-            {
-                MaximizeRestoreButton.Content = "🗗";
-            }
+            MaximizeRestoreIcon.Data = (System.Windows.Media.Geometry)FindResource("Icon.WindowRestore");
         }
     }
     
diff --git a/Opus-Speaks.md b/Opus-Speaks.md
index 3f2974f..4bb05da 100644
--- a/Opus-Speaks.md
+++ b/Opus-Speaks.md
@@ -67,6 +67,18 @@ SHA-256 verification protects against tampering between GitHub Releases and the
 >
 > Until this lands, the SHA-256 check is the only integrity guarantee — that's still meaningfully better than nothing.
 
+## E2. Region selector is only pixel-accurate at 100 % display scaling
+
+Found during the 2026-06 security/code audit. The app manifest declares `PerMonitorV2` DPI awareness, but `RegionSelector` sets its window `Width`/`Height` (DIPs) directly from physical pixel bounds and maps mouse DIP positions 1:1 onto frozen-bitmap pixel coordinates. At 100 % scaling DIP == pixel and everything lines up; at 125 %/150 % (or mixed-DPI multi-monitor) the window oversizes and crops drift.
+
+> Fixing this properly needs one selector window per monitor (each in its own DPI context) or explicit `CompositionTarget.TransformToDevice` math when converting selection rects to bitmap pixels. The mixed-DPI virtual-screen mapping is nonlinear — don't try to patch it with a single global scale factor.
+
+## E3. Auto-update can't swap a per-machine install
+
+`StageAndPrepareUpdateAsync` writes the swap script to user temp and runs it unelevated. For per-user installs that's fine, but the MSI installs to `C:\Program Files\Money Shot\` (per-machine), where `move /Y` will fail with access denied and the update silently doesn't apply (script exits 1, nothing re-launches).
+
+> Either: detect a Program Files install and direct the user to download the MSI instead of self-swapping; or run the script elevated (UAC prompt) via `UseShellExecute = true` + `Verb = "runas"`. Decide deliberately — silent elevation prompts from a background updater are hostile UX.
+
 ## F. Migrate to `Microsoft.Extensions.Logging` if a real DI need ever appears
 
 The current `Logger` static facade closes the "no Release-build output" gap, but it doesn't enable structured logging, log levels controlled by config, or per-namespace filtering. If the project ever takes on a complexity that justifies DI (multiple loggers, multiple sinks, `ILogger<T>` for testability), the right move is the originally-proposed migration from this document — replace `Logger` with `Microsoft.Extensions.Logging` + a logger factory in `App.xaml.cs`, then take constructor-injected `ILogger<T>` in each service.