fix: replace SystemEvents with DispatcherTimer to avoid missing package crash

.github/workflows/release-windows-beta.yml

@@ -53,19 +53,25 @@ jobs:
 
       - name: Update version-windows-beta.json on main
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         shell: bash
         run: |
           notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows beta ${{ steps.version.outputs.version }}")
-          git config user.name "github-actions[bot]"
+          content=$(jq -n \
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git fetch origin main
-          git checkout main
-          jq -n \
             --arg version "${{ steps.version.outputs.version }}" \
             --arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker-Windows.zip" \
             --arg notes "$notes" \
-            '{version: $version, url: $url, notes: $notes}' > version-windows-beta.json
+            '{version: $version, url: $url, notes: $notes}' | base64 -w0)
-          git add version-windows-beta.json
+          sha=$(gh api "repos/${{ github.repository }}/contents/version-windows-beta.json?ref=main" --jq .sha 2>/dev/null || echo "")
-          git commit -m "Windows beta release ${{ github.ref_name }}"
+          if [ -n "$sha" ]; then
-          git push origin main
+            gh api --method PUT "repos/${{ github.repository }}/contents/version-windows-beta.json" \
+              --field "message=Windows beta release ${{ github.ref_name }}" \
+              --field "content=$content" \
+              --field "branch=main" \
+              --field "sha=$sha"
+          else
+            gh api --method PUT "repos/${{ github.repository }}/contents/version-windows-beta.json" \
+              --field "message=Windows beta release ${{ github.ref_name }}" \
+              --field "content=$content" \
+              --field "branch=main"
+          fi

.github/workflows/release-windows.yml

@@ -3,7 +3,7 @@ name: Release Windows
 on:
   push:
     tags:
-      - 'win-v*'
+      - 'win-v[0-9]*'
       - '!win-v*-*'
 
 jobs:
@@ -53,19 +53,25 @@ jobs:
 
       - name: Update version-windows.json on main
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         shell: bash
         run: |
           notes=$(cat windows/RELEASE_NOTES.md 2>/dev/null || echo "Windows release ${{ steps.version.outputs.version }}")
-          git config user.name "github-actions[bot]"
+          content=$(jq -n \
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git fetch origin main
-          git checkout main
-          jq -n \
             --arg version "${{ steps.version.outputs.version }}" \
             --arg url "https://github.com/${{ github.repository }}/releases/download/${{ github.ref_name }}/ClaudeChecker-Windows.zip" \
             --arg notes "$notes" \
-            '{version: $version, url: $url, notes: $notes}' > version-windows.json
+            '{version: $version, url: $url, notes: $notes}' | base64 -w0)
-          git add version-windows.json
+          sha=$(gh api "repos/${{ github.repository }}/contents/version-windows.json?ref=main" --jq .sha 2>/dev/null || echo "")
-          git commit -m "Windows release ${{ github.ref_name }}"
+          if [ -n "$sha" ]; then
-          git push origin main
+            gh api --method PUT "repos/${{ github.repository }}/contents/version-windows.json" \
+              --field "message=Windows release ${{ github.ref_name }}" \
+              --field "content=$content" \
+              --field "branch=main" \
+              --field "sha=$sha"
+          else
+            gh api --method PUT "repos/${{ github.repository }}/contents/version-windows.json" \
+              --field "message=Windows release ${{ github.ref_name }}" \
+              --field "content=$content" \
+              --field "branch=main"
+          fi

windows/App.xaml

@@ -3,64 +3,47 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              ShutdownMode="OnExplicitShutdown">
     <Application.Resources>
-        <SolidColorBrush x:Key="BackgroundBrush"    Color="#1C1C1E"/>
+        <SolidColorBrush x:Key="BackgroundBrush"   Color="#F3F3F3"/>
-        <SolidColorBrush x:Key="CardBrush"          Color="#2C2C2E"/>
+        <SolidColorBrush x:Key="CardBrush"         Color="#FFFFFF"/>
-        <SolidColorBrush x:Key="AccentBrush"        Color="#F97316"/>
+        <SolidColorBrush x:Key="AccentBrush"       Color="#F97316"/>
-        <SolidColorBrush x:Key="SecondaryBrush"     Color="#888888"/>
+        <SolidColorBrush x:Key="TextBrush"         Color="#1C1C1C"/>
-        <SolidColorBrush x:Key="BorderBrush"        Color="#38383A"/>
+        <SolidColorBrush x:Key="SecondaryBrush"    Color="#6E6E6E"/>
-        <SolidColorBrush x:Key="BlueBrush"          Color="#3B82F6"/>
+        <SolidColorBrush x:Key="BorderBrush"       Color="#E0E0E0"/>
+        <SolidColorBrush x:Key="BlueBrush"         Color="#0078D4"/>
+        <SolidColorBrush x:Key="ButtonBrush"       Color="#FFFFFF"/>
+        <SolidColorBrush x:Key="SurfaceBrush"      Color="#FAFAFA"/>
+        <SolidColorBrush x:Key="BannerBgBrush"     Color="#E8F2FB"/>
+        <SolidColorBrush x:Key="BannerBorderBrush" Color="#B3D6F5"/>
 
         <Style x:Key="HeaderText" TargetType="TextBlock">
             <Setter Property="FontSize"   Value="10"/>
             <Setter Property="FontWeight" Value="SemiBold"/>
             <Setter Property="Foreground" Value="{StaticResource SecondaryBrush}"/>
-        </Style>
+            <Setter Property="FontFamily" Value="Segoe UI"/>
-
-        <Style x:Key="IconButton" TargetType="Button">
-            <Setter Property="Background"  Value="Transparent"/>
-            <Setter Property="BorderBrush" Value="#33FFFFFF"/>
-            <Setter Property="BorderThickness" Value="0.5"/>
-            <Setter Property="Foreground"  Value="{StaticResource SecondaryBrush}"/>
-            <Setter Property="Width"       Value="26"/>
-            <Setter Property="Height"      Value="26"/>
-            <Setter Property="Cursor"      Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="5">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#1AFFFFFF"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
         </Style>
 
         <Style x:Key="PrimaryButton" TargetType="Button">
-            <Setter Property="Background"  Value="{StaticResource BlueBrush}"/>
+            <Setter Property="Background"      Value="{StaticResource BlueBrush}"/>
-            <Setter Property="Foreground"  Value="White"/>
+            <Setter Property="Foreground"      Value="White"/>
             <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding"     Value="14,6"/>
+            <Setter Property="Padding"         Value="14,6"/>
-            <Setter Property="FontSize"    Value="12"/>
+            <Setter Property="FontSize"        Value="12"/>
-            <Setter Property="FontWeight"  Value="SemiBold"/>
+            <Setter Property="FontWeight"      Value="SemiBold"/>
-            <Setter Property="Cursor"      Value="Hand"/>
+            <Setter Property="FontFamily"      Value="Segoe UI"/>
+            <Setter Property="Cursor"          Value="Hand"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}" CornerRadius="6"
+                        <Border Background="{TemplateBinding Background}" CornerRadius="4"
                                 Padding="{TemplateBinding Padding}">
                             <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#2563EB"/>
+                                <Setter Property="Background" Value="#106EBE"/>
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter Property="Background" Value="#BDBDBD"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -69,25 +52,26 @@
         </Style>
 
         <Style x:Key="SmallButton" TargetType="Button">
-            <Setter Property="Background"    Value="Transparent"/>
+            <Setter Property="Background"      Value="{StaticResource ButtonBrush}"/>
-            <Setter Property="BorderBrush"   Value="#33FFFFFF"/>
+            <Setter Property="BorderBrush"     Value="{StaticResource BorderBrush}"/>
-            <Setter Property="BorderThickness" Value="0.5"/>
+            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Foreground"    Value="{StaticResource SecondaryBrush}"/>
+            <Setter Property="Foreground"      Value="{StaticResource TextBrush}"/>
-            <Setter Property="Padding"       Value="8,4"/>
+            <Setter Property="Padding"         Value="10,4"/>
-            <Setter Property="FontSize"      Value="11"/>
+            <Setter Property="FontSize"        Value="12"/>
-            <Setter Property="Cursor"        Value="Hand"/>
+            <Setter Property="FontFamily"      Value="Segoe UI"/>
+            <Setter Property="Cursor"          Value="Hand"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
                         <Border Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="5" Padding="{TemplateBinding Padding}">
+                                CornerRadius="4" Padding="{TemplateBinding Padding}">
                             <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#1AFFFFFF"/>
+                                <Setter Property="Background" Value="#F0F0F0"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -95,8 +79,13 @@
             </Setter>
         </Style>
 
+        <Style TargetType="ComboBox">
+            <Setter Property="FontFamily" Value="Segoe UI"/>
+            <Setter Property="FontSize"   Value="12"/>
+        </Style>
+
         <Style TargetType="ScrollViewer">
-            <Setter Property="VerticalScrollBarVisibility" Value="Hidden"/>
+            <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
         </Style>
     </Application.Resources>
 </Application>

windows/App.xaml.cs

@@ -1,10 +1,8 @@
 using System;
-using System.Drawing;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Forms;
 using System.Windows.Threading;
-using Application = System.Windows.Application;
+using Forms = System.Windows.Forms;
 
 namespace ClaudeCheckerWindows;
 
@@ -13,13 +11,14 @@ public partial class App : Application
     public static UsageViewModel ViewModel { get; } = new();
     public static UpdateManager  Updater   { get; } = new();
 
-    private NotifyIcon?   _tray;
+    private Forms.NotifyIcon? _tray;
-    private PopupWindow?  _popup;
+    private PopupWindow?      _popup;
-    private DispatcherTimer? _timer;
+    private DispatcherTimer?  _timer;
 
     protected override void OnStartup(StartupEventArgs e)
     {
         base.OnStartup(e);
+        ThemeManager.Initialize();
         SetupTray();
         ScheduleTimer(ViewModel.RefreshInterval);
 
@@ -33,40 +32,37 @@ public partial class App : Application
 
     private void SetupTray()
     {
-        _tray = new NotifyIcon
+        _tray = new Forms.NotifyIcon
         {
             Text    = "ClaudeChecker",
             Visible = true,
             Icon    = LoadIcon(),
         };
+
         _tray.MouseClick += (_, e) =>
         {
-            if (e.Button == MouseButtons.Left)
+            if (e.Button == Forms.MouseButtons.Left)
-                TogglePopup();
+                Dispatcher.InvokeAsync(TogglePopup);
         };
+
         _tray.ContextMenuStrip = BuildContextMenu();
 
-        ViewModel.PropertyChanged += (_, e) =>
+        ViewModel.PropertyChanged += (_, _) => UpdateTrayText();
-        {
+        Updater.PropertyChanged   += (_, _) => UpdateTrayText();
-            if (e.PropertyName is nameof(UsageViewModel.Limits) or nameof(UsageViewModel.ShowInTaskbar))
-                UpdateTrayText();
-        };
     }
 
-    private static Icon LoadIcon()
+    private static System.Drawing.Icon LoadIcon()
     {
-        try { return new Icon("Assets/icon.ico"); }
+        try { return new System.Drawing.Icon("Assets/icon.ico"); }
-        catch { return SystemIcons.Application; }
+        catch { return System.Drawing.SystemIcons.Application; }
     }
 
-    private ContextMenuStrip BuildContextMenu()
+    private Forms.ContextMenuStrip BuildContextMenu()
     {
-        var menu = new ContextMenuStrip();
+        var menu = new Forms.ContextMenuStrip();
-        menu.Items.Add("Show ClaudeChecker", null, (_, _) => ShowPopup());
+        menu.Items.Add("Show ClaudeChecker", null, (_, _) => Dispatcher.InvokeAsync(ShowPopup));
-        menu.Items.Add(new ToolStripSeparator());
+        menu.Items.Add(new Forms.ToolStripSeparator());
-        menu.Items.Add("Quit", null, (_, _) => Quit());
+        menu.Items.Add("Quit", null, (_, _) => Dispatcher.InvokeAsync(Quit));
-        menu.BackColor = System.Drawing.Color.FromArgb(40, 40, 40);
-        menu.ForeColor = System.Drawing.Color.White;
         return menu;
     }
 
@@ -83,22 +79,11 @@ public partial class App : Application
         if (_popup == null)
         {
             _popup = new PopupWindow();
-            _popup.Closed += (_, _) => _popup = null;
         }
-
-        PositionPopup();
         _popup.Show();
         _popup.Activate();
     }
 
-    private void PositionPopup()
-    {
-        if (_popup == null) return;
-        var workArea = SystemParameters.WorkArea;
-        _popup.Left  = workArea.Right  - _popup.Width  - 8;
-        _popup.Top   = workArea.Bottom - _popup.Height - 8;
-    }
-
     public void ScheduleTimer(int seconds)
     {
         _timer?.Stop();

windows/AppSettings.cs

@@ -0,0 +1,43 @@
+using System;
+using System.IO;
+using System.Text.Json;
+
+namespace ClaudeCheckerWindows;
+
+public class AppSettings
+{
+    public string CookieStore     { get; set; } = "";
+    public string BurnHistory     { get; set; } = "";
+    public int    RefreshInterval { get; set; } = 120;
+    public bool   ShowInTaskbar   { get; set; } = true;
+    public bool   BetaChannel     { get; set; } = false;
+
+    private static readonly string FilePath = Path.Combine(
+        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+        "ClaudeChecker", "settings.json");
+
+    private static AppSettings? _instance;
+    public static AppSettings Default => _instance ??= Load();
+
+    private static AppSettings Load()
+    {
+        try
+        {
+            if (File.Exists(FilePath))
+                return JsonSerializer.Deserialize<AppSettings>(File.ReadAllText(FilePath)) ?? new();
+        }
+        catch { }
+        return new();
+    }
+
+    public void Save()
+    {
+        try
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(FilePath)!);
+            File.WriteAllText(FilePath, JsonSerializer.Serialize(this,
+                new JsonSerializerOptions { WriteIndented = true }));
+        }
+        catch { }
+    }
+}

windows/ClaudeCheckerWindows.csproj

@@ -4,19 +4,22 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
-    <UseWindowsForms>true</UseWindowsForms>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AssemblyName>ClaudeChecker</AssemblyName>
     <RootNamespace>ClaudeCheckerWindows</RootNamespace>
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-    <Version>1.1.3</Version>
+    <Version>1.0.0</Version>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <Platforms>x64</Platforms>
   </PropertyGroup>
 
+  <!-- WinForms referenced explicitly so NotifyIcon is available without polluting global namespace -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2651.64" />
+    <FrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2651.64"/>
   </ItemGroup>
 
   <ItemGroup>
@@ -28,12 +31,4 @@
     </None>
   </ItemGroup>
 
-  <!-- App settings for user preferences -->
-  <ItemGroup>
-    <None Update="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
 </Project>

windows/Controls/GaugeControl.cs

@@ -1,3 +1,6 @@
+using Brush = System.Windows.Media.Brush;
+using Pen   = System.Windows.Media.Pen;
+using Point = System.Windows.Point;
 using System;
 using System.Globalization;
 using System.Windows;
@@ -18,7 +21,11 @@ public class GaugeControl : FrameworkElement
     public double Percent { get => (double)GetValue(PercentProperty); set => SetValue(PercentProperty, value); }
     public Brush  Accent  { get => (Brush)GetValue(AccentProperty);   set => SetValue(AccentProperty, value); }
 
-    // Arc sweeps 270° starting at 135° (bottom-left to bottom-right, like macOS version)
+    public GaugeControl()
+    {
+        ThemeManager.ThemeChanged += InvalidateVisual;
+    }
+
     private const double StartAngleDeg = 135;
     private const double SweepDeg      = 270;
     private const double StrokeWidth   = 6;
@@ -29,38 +36,36 @@ public class GaugeControl : FrameworkElement
         var cy     = RenderSize.Height / 2;
         var radius = Math.Min(cx, cy) - StrokeWidth / 2 - 1;
 
-        // Track
+        var trackColor = ThemeManager.IsDark
+            ? Color.FromArgb(40, 255, 255, 255)
+            : Color.FromArgb(30, 0, 0, 0);
         DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg,
-            new Pen(new SolidColorBrush(Color.FromArgb(28, 255, 255, 255)), StrokeWidth));
+            new Pen(new SolidColorBrush(trackColor), StrokeWidth));
 
-        // Fill
         if (Percent > 0)
-        {
+            DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg * (Percent / 100.0),
-            var sweep = SweepDeg * (Percent / 100.0);
+                new Pen(Accent, StrokeWidth));
-            DrawArc(dc, cx, cy, radius, StartAngleDeg, sweep, new Pen(Accent, StrokeWidth));
-        }
 
-        var dpi  = VisualTreeHelper.GetDpi(this).PixelsPerDip;
+        var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip;
+
+        var textColor = ThemeManager.IsDark ? Color.FromRgb(0xF5, 0xF5, 0xF5) : Color.FromRgb(0x1C, 0x1C, 0x1C);
+        var subColor  = Color.FromRgb(0x9E, 0x9E, 0x9E);
 
-        // Percent label
         var pctText = new FormattedText(
             $"{(int)Math.Round(Percent)}%",
-            CultureInfo.CurrentCulture,
+            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-            FlowDirection.LeftToRight,
             new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
-            14, Brushes.White, dpi);
+            14, new SolidColorBrush(textColor), dpi);
-
         dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
 
-        // Sub-label
         var sub = new FormattedText(
             "Updated\nnow",
-            CultureInfo.CurrentCulture,
+            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-            FlowDirection.LeftToRight,
+            new Typeface("Segoe UI"), 7,
-            new Typeface("Segoe UI"),
+            new SolidColorBrush(subColor), dpi)
-            7, new SolidColorBrush(Color.FromRgb(0x88, 0x88, 0x88)), dpi);
+        {
-        sub.TextAlignment = TextAlignment.Center;
+            TextAlignment = TextAlignment.Center
-
+        };
         dc.DrawText(sub, new Point(cx - sub.Width / 2, cy + 2));
     }
 
@@ -68,10 +73,9 @@ public class GaugeControl : FrameworkElement
         double startDeg, double sweepDeg, Pen pen)
     {
         if (sweepDeg <= 0) return;
-
+        var start   = PointOnCircle(cx, cy, r, startDeg);
-        var start    = PointOnCircle(cx, cy, r, startDeg);
+        var end     = PointOnCircle(cx, cy, r, startDeg + sweepDeg);
-        var end      = PointOnCircle(cx, cy, r, startDeg + sweepDeg);
+        var isLarge = sweepDeg > 180;
-        var isLarge  = sweepDeg > 180;
 
         var geo = new StreamGeometry();
         using (var ctx = geo.Open())

windows/Controls/SparklineControl.cs

@@ -1,4 +1,4 @@
-using System;
+using Point = System.Windows.Point;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Media;
@@ -29,33 +29,32 @@ public class SparklineControl : FrameworkElement
         var h    = RenderSize.Height;
         var minV = double.MaxValue;
         var maxV = double.MinValue;
-
+        foreach (var v in plot) { if (v < minV) minV = v; if (v > maxV) maxV = v; }
-        foreach (var v in plot) { minV = Math.Min(minV, v); maxV = Math.Max(maxV, v); }
+        var range = System.Math.Max(maxV - minV, 1);
-        var range = Math.Max(maxV - minV, 1);
 
         Point Pt(int i) => new(
-            i / (double)(plot.Count - 1) * w,
+            i / (double)(plot.Length - 1) * w,
             h - (plot[i] - minV) / range * (h - 6) - 3);
 
-        // Fill
         var fill = new StreamGeometry();
         using (var ctx = fill.Open())
         {
             ctx.BeginFigure(new Point(0, h), true, true);
-            for (var i = 0; i < plot.Count; i++) ctx.LineTo(Pt(i), true, false);
+            for (var i = 0; i < plot.Length; i++) ctx.LineTo(Pt(i), true, false);
             ctx.LineTo(new Point(w, h), true, false);
         }
         fill.Freeze();
         dc.DrawGeometry(new SolidColorBrush(Color.FromArgb(26, LineColor.R, LineColor.G, LineColor.B)), null, fill);
 
-        // Line
         var line = new StreamGeometry();
         using (var ctx = line.Open())
         {
             ctx.BeginFigure(Pt(0), false, false);
-            for (var i = 1; i < plot.Count; i++) ctx.LineTo(Pt(i), true, false);
+            for (var i = 1; i < plot.Length; i++) ctx.LineTo(Pt(i), true, false);
         }
         line.Freeze();
-        dc.DrawGeometry(null, new Pen(new SolidColorBrush(LineColor), 1.5) { LineJoin = PenLineJoin.Round }, line);
+        dc.DrawGeometry(null,
+            new System.Windows.Media.Pen(new SolidColorBrush(LineColor), 1.5) { LineJoin = PenLineJoin.Round },
+            line);
     }
 }

windows/GlobalUsings.cs

@@ -0,0 +1,9 @@
+// Global aliases to resolve ambiguities between System.Windows.* and System.Drawing.*
+global using Application  = System.Windows.Application;
+global using Brushes      = System.Windows.Media.Brushes;
+global using Color        = System.Windows.Media.Color;
+global using FlowDirection = System.Windows.FlowDirection;
+global using FontFamily   = System.Windows.Media.FontFamily;
+global using Orientation  = System.Windows.Controls.Orientation;
+global using ProgressBar  = System.Windows.Controls.ProgressBar;
+global using Size         = System.Windows.Size;

windows/LoginWindow.xaml.cs

@@ -1,5 +1,6 @@
 using Microsoft.Web.WebView2.Core;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -28,18 +29,25 @@ public partial class LoginWindow : Window
         {
             if (!e.IsSuccess) return;
             var uri = Browser.CoreWebView2.Source;
-            if (uri.Contains("claude.ai") && !uri.Contains("/login"))
+            if (!uri.Contains("claude.ai")) return;
+
+            var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+            var signedIn = cookies.Any(c =>
+                c.Name.Equals("sessionKey", StringComparison.OrdinalIgnoreCase) ||
+                c.Name.StartsWith("sk-ant", StringComparison.OrdinalIgnoreCase));
+
+            await Dispatcher.InvokeAsync(() =>
             {
-                // Likely signed in — enable done button
+                DoneButton.IsEnabled = !uri.Contains("/login") && !uri.Contains("/signin");
-                var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+                StatusText.Text = signedIn
-                var hasSess = cookies.Any(c => c.Name.Contains("session") || c.Name.Contains("sk-"));
+                    ? "Signed in — click Done to continue."
-                await Dispatcher.InvokeAsync(() =>
+                    : "Complete sign-in, then click Done.";
-                {
+            });
-                    DoneButton.IsEnabled = hasSess || uri.Contains("/chats") || uri.Contains("/new");
+
-                    StatusText.Text      = DoneButton.IsEnabled
+            // Auto-close only on explicit post-login redirects, not on initial load
-                        ? "Signed in! Click Done to continue."
+            if (signedIn && (uri.Contains("/chats") || uri.Contains("/new")))
-                        : "Waiting for sign-in…";
+            {
-                });
+                await SaveAndClose(cookies);
             }
         };
     }
@@ -47,7 +55,12 @@ public partial class LoginWindow : Window
     private async void Done_Click(object sender, RoutedEventArgs e)
     {
         var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+        await SaveAndClose(cookies);
+    }
+
+    private async Task SaveAndClose(IReadOnlyList<CoreWebView2Cookie> cookies)
+    {
         UsageViewModel.SaveCookies(cookies);
-        DialogResult = true;
+        await Dispatcher.InvokeAsync(() => DialogResult = true);
     }
 }

windows/PopupWindow.xaml

@@ -3,249 +3,246 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:ctrl="clr-namespace:ClaudeCheckerWindows.Controls"
         Title="ClaudeChecker"
-        Width="480"
+        Width="480" Height="660"
-        SizeToContent="Height"
+        WindowStartupLocation="CenterScreen"
-        WindowStyle="None"
+        Background="{StaticResource BackgroundBrush}"
-        AllowsTransparency="True"
+        FontFamily="Segoe UI"
-        Background="Transparent"
+        ShowInTaskbar="True"
-        ShowInTaskbar="False"
-        Topmost="True"
         ResizeMode="NoResize">
 
-    <Border Background="{StaticResource BackgroundBrush}"
+    <Grid>
-            CornerRadius="12"
+        <!-- Main panel -->
-            BorderBrush="{StaticResource BorderBrush}"
+        <DockPanel x:Name="MainPanel">
-            BorderThickness="0.5">
-        <Border.Effect>
-            <DropShadowEffect BlurRadius="24" ShadowDepth="4" Opacity="0.5" Color="Black"/>
-        </Border.Effect>
 
-        <Grid>
+            <!-- Update banner -->
-            <!-- Main panel -->
+            <Border x:Name="UpdateBanner" DockPanel.Dock="Top" Visibility="Collapsed"
-            <StackPanel x:Name="MainPanel">
+                    Background="{StaticResource BannerBgBrush}"
-
+                    BorderBrush="{StaticResource BannerBorderBrush}" BorderThickness="0,0,0,1"
-                <!-- Header -->
+                    Cursor="Hand" MouseLeftButtonUp="UpdateBanner_Click">
-                <Grid Margin="16,11">
+                <Grid Margin="16,10">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="6"/>
-                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-
+                    <TextBlock Grid.Column="0" Text="⬇" FontSize="14"
-                    <Image Grid.Column="0" Width="24" Height="24"
+                               Foreground="{StaticResource BlueBrush}" VerticalAlignment="Center"/>
-                           Source="Assets/icon.png" RenderOptions.BitmapScalingMode="HighQuality"/>
+                    <StackPanel Grid.Column="1" Margin="10,0">
-
+                        <TextBlock x:Name="UpdateBannerTitle" FontSize="12" FontWeight="SemiBold"
-                    <TextBlock Grid.Column="1" Text="ClaudeChecker"
+                                   Foreground="{StaticResource TextBrush}"/>
-                               FontSize="14" FontWeight="SemiBold" Foreground="White"
+                        <TextBlock Text="Click to view release notes and install."
-                               VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                   FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
-
+                    </StackPanel>
-                    <Button Grid.Column="2" Style="{StaticResource IconButton}"
+                    <Button Grid.Column="2" Content="Update" Style="{StaticResource SmallButton}"
-                            Click="Settings_Click" x:Name="SettingsButton">
+                            Foreground="{StaticResource BlueBrush}" Click="UpdateBanner_Click"/>
-                        <TextBlock Text="⚙" FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
-                    </Button>
-                    <Button Grid.Column="4" Style="{StaticResource IconButton}"
-                            Click="Close_Click">
-                        <TextBlock Text="✕" FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
-                    </Button>
                 </Grid>
+            </Border>
 
-                <Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Opacity="0.4"/>
+            <!-- Footer -->
-
+            <Border DockPanel.Dock="Bottom" BorderBrush="{StaticResource BorderBrush}"
-                <!-- Update banner -->
+                    BorderThickness="0,1,0,0" Background="{StaticResource SurfaceBrush}">
-                <Border x:Name="UpdateBanner" Visibility="Collapsed"
+                <Grid Margin="12,8">
-                        Background="#0A3B82F6" Cursor="Hand" MouseLeftButtonUp="UpdateBanner_Click">
-                    <Grid Margin="16,10">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Grid.Column="0" Text="⬇" FontSize="14"
-                                   Foreground="{StaticResource BlueBrush}" VerticalAlignment="Center"/>
-                        <StackPanel Grid.Column="1" Margin="10,0">
-                            <TextBlock x:Name="UpdateBannerTitle" FontSize="12" FontWeight="SemiBold" Foreground="White"/>
-                            <TextBlock Text="Tap to view what's new &amp; install."
-                                       FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
-                        </StackPanel>
-                        <Button Grid.Column="2" Content="Update"
-                                Style="{StaticResource SmallButton}"
-                                Background="{StaticResource BlueBrush}"
-                                Foreground="White" Click="UpdateBanner_Click"/>
-                    </Grid>
-                    <Border.Effect>
-                        <DropShadowEffect ShadowDepth="0" BlurRadius="0" Opacity="0"/>
-                    </Border.Effect>
-                </Border>
-                <Rectangle x:Name="UpdateBannerDiv" Height="0.5" Fill="{StaticResource BorderBrush}"
-                           Opacity="0.3" Visibility="Collapsed"/>
-
-                <!-- Limit cards -->
-                <ScrollViewer VerticalScrollBarVisibility="Hidden" MaxHeight="600">
-                    <StackPanel x:Name="CardsPanel" Margin="0,0,0,4"/>
-                </ScrollViewer>
-
-                <Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Opacity="0.3"/>
-
-                <!-- Footer -->
-                <Grid Margin="16,9">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="8"/>
                         <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="8"/>
+                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <TextBlock x:Name="LastUpdatedText" Grid.Column="0"
+                    <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
-                               FontSize="10" Foreground="#60888888" VerticalAlignment="Center"/>
+                        <ProgressBar x:Name="LoadingBar" IsIndeterminate="True"
-                    <ProgressBar x:Name="LoadingBar" Grid.Column="1"
+                                     Width="12" Height="12" Visibility="Collapsed"
-                                 IsIndeterminate="True" Width="14" Height="14"
+                                     Style="{x:Null}" Margin="0,0,6,0"/>
-                                 Visibility="Collapsed" Style="{x:Null}"/>
+                        <TextBlock x:Name="LastUpdatedText" FontSize="11"
-                    <Button Grid.Column="3" Content="↻  Refresh"
+                                   Foreground="{StaticResource SecondaryBrush}" VerticalAlignment="Center"/>
+                    </StackPanel>
+                    <Button Grid.Column="1" Content="↻  Refresh"
                             Style="{StaticResource SmallButton}" Click="Refresh_Click"/>
+                    <Button Grid.Column="3" x:Name="SettingsButton" Content="⚙  Settings"
+                            Style="{StaticResource SmallButton}" Click="Settings_Click"/>
                 </Grid>
-            </StackPanel>
+            </Border>
 
-            <!-- Settings panel -->
+            <!-- Cards scroll area -->
-            <Border x:Name="SettingsPanel" Visibility="Collapsed"
+            <ScrollViewer VerticalScrollBarVisibility="Auto">
-                    Background="{StaticResource BackgroundBrush}" CornerRadius="12">
+                <StackPanel x:Name="CardsPanel" Margin="0,4,0,4"/>
-                <ScrollViewer VerticalScrollBarVisibility="Auto" MaxHeight="700">
+            </ScrollViewer>
-                    <StackPanel Margin="16">
+        </DockPanel>
 
+        <!-- Settings panel -->
+        <Border x:Name="SettingsPanel" Visibility="Collapsed"
+                Background="{StaticResource BackgroundBrush}">
+            <DockPanel>
+                <Border DockPanel.Dock="Top" BorderBrush="{StaticResource BorderBrush}"
+                        BorderThickness="0,0,0,1" Background="{StaticResource SurfaceBrush}" Padding="12,10">
+                    <Grid>
                         <Button Content="← Back" HorizontalAlignment="Left"
-                                Style="{StaticResource SmallButton}"
+                                Style="{StaticResource SmallButton}" BorderThickness="0"
-                                BorderThickness="0" Foreground="{StaticResource BlueBrush}"
+                                Foreground="{StaticResource BlueBrush}" Background="Transparent"
-                                Click="BackFromSettings_Click" Margin="0,0,0,12"/>
+                                Click="BackFromSettings_Click"/>
+                        <TextBlock Text="Settings" FontSize="14" FontWeight="SemiBold"
+                                   Foreground="{StaticResource TextBrush}"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Grid>
+                </Border>
 
-                        <TextBlock Text="Settings" FontSize="16" FontWeight="SemiBold"
+                <ScrollViewer VerticalScrollBarVisibility="Auto">
-                                   Foreground="White" Margin="0,0,0,16"/>
+                    <StackPanel Margin="20,16,20,20">
 
-                        <!-- Auth -->
+                        <TextBlock Text="AUTHENTICATION" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
-                        <TextBlock Text="🔐  Authentication" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{StaticResource CardBrush}" CornerRadius="6"
-                        <StackPanel x:Name="AuthPanel" Margin="0,0,0,8"/>
+                                BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
-                        <TextBlock Text="Your session is stored locally and persists across restarts."
+                                Padding="14,12" Margin="0,0,0,16">
-                                   FontSize="11" Foreground="{StaticResource SecondaryBrush}"
-                                   TextWrapping="Wrap" Margin="0,0,0,8"/>
-                        <StackPanel Orientation="Horizontal" Margin="0,0,0,16">
-                            <Button x:Name="SignInButton" Content="Sign In"
-                                    Style="{StaticResource SmallButton}" Click="SignIn_Click" Margin="0,0,8,0"/>
-                            <Button x:Name="SignOutButton" Content="Sign Out"
-                                    Style="{StaticResource SmallButton}" Click="SignOut_Click"
-                                    Foreground="#EF4444" Visibility="Collapsed"/>
-                        </StackPanel>
-
-                        <Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Margin="0,0,0,16"/>
-
-                        <!-- Beta channel -->
-                        <TextBlock Text="📡  Update channel" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
-                        <Grid Margin="0,0,0,16">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
                             <StackPanel>
-                                <TextBlock Text="Beta updates" FontSize="12" Foreground="White"/>
+                                <StackPanel x:Name="AuthPanel" Margin="0,0,0,10"/>
-                                <TextBlock Text="Receive early access builds — may be less stable"
+                                <TextBlock Text="Your session is stored locally and persists across restarts."
-                                           FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
+                                           FontSize="11" Foreground="{StaticResource SecondaryBrush}"
+                                           TextWrapping="Wrap" Margin="0,0,0,10"/>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button x:Name="SignInButton" Content="Sign In"
+                                            Style="{StaticResource SmallButton}"
+                                            Click="SignIn_Click" Margin="0,0,8,0"/>
+                                    <Button x:Name="SignOutButton" Content="Sign Out"
+                                            Style="{StaticResource SmallButton}"
+                                            Click="SignOut_Click" Foreground="#C42B1C"
+                                            Visibility="Collapsed"/>
+                                </StackPanel>
                             </StackPanel>
-                            <CheckBox Grid.Column="1" x:Name="BetaToggle" VerticalAlignment="Center"
+                        </Border>
-                                      Checked="BetaToggle_Changed" Unchecked="BetaToggle_Changed"/>
-                        </Grid>
 
-                        <Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Margin="0,0,0,16"/>
+                        <TextBlock Text="UPDATE CHANNEL" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{StaticResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
+                                Padding="14,12" Margin="0,0,0,16">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <StackPanel>
+                                    <TextBlock Text="Beta updates" FontSize="12" FontWeight="SemiBold"
+                                               Foreground="{StaticResource TextBrush}"/>
+                                    <TextBlock Text="Receive early access builds — may be less stable"
+                                               FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
+                                </StackPanel>
+                                <CheckBox Grid.Column="1" x:Name="BetaToggle" VerticalAlignment="Center"
+                                          Checked="BetaToggle_Changed" Unchecked="BetaToggle_Changed"/>
+                            </Grid>
+                        </Border>
 
-                        <!-- Refresh interval -->
+                        <TextBlock Text="AUTO-REFRESH" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
-                        <TextBlock Text="⏱  Auto-refresh interval" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{StaticResource CardBrush}" CornerRadius="6"
-                        <ComboBox x:Name="RefreshPicker" SelectionChanged="RefreshPicker_Changed"
+                                BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
-                                  Margin="0,0,0,16" FontSize="12"/>
+                                Padding="14,12" Margin="0,0,0,16">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Text="Refresh interval" FontSize="12" FontWeight="SemiBold"
+                                           Foreground="{StaticResource TextBrush}" VerticalAlignment="Center"/>
+                                <ComboBox Grid.Column="1" x:Name="RefreshPicker" Width="100"
+                                          SelectionChanged="RefreshPicker_Changed"/>
+                            </Grid>
+                        </Border>
 
-                        <Rectangle Height="0.5" Fill="{StaticResource BorderBrush}" Margin="0,0,0,16"/>
+                        <TextBlock Text="ABOUT" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
+                        <Border Background="{StaticResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
+                                Padding="14,12">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <Image Width="36" Height="36" Source="Assets/icon.png"
+                                       RenderOptions.BitmapScalingMode="HighQuality" Margin="0,0,12,0"/>
+                                <StackPanel Grid.Column="1" VerticalAlignment="Center">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="ClaudeChecker" FontSize="12" FontWeight="SemiBold"
+                                                   Foreground="{StaticResource TextBrush}"/>
+                                        <Border Background="#F0F0F0" CornerRadius="3"
+                                                Margin="6,0,0,0" Padding="5,1">
+                                            <TextBlock x:Name="VersionLabel" FontSize="11"
+                                                       Foreground="{StaticResource SecondaryBrush}"
+                                                       FontFamily="Consolas"/>
+                                        </Border>
+                                    </StackPanel>
+                                    <TextBlock Text="Built by superdooper86 &amp; claude"
+                                               FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
+                                </StackPanel>
+                                <Button Grid.Column="2" x:Name="CheckUpdateButton"
+                                        Style="{StaticResource SmallButton}"
+                                        Click="CheckUpdate_Click" VerticalAlignment="Center"/>
+                            </Grid>
+                        </Border>
 
-                        <!-- About -->
+                    </StackPanel>
+                </ScrollViewer>
+            </DockPanel>
+        </Border>
+
+        <!-- Update panel -->
+        <Border x:Name="UpdatePanel" Visibility="Collapsed"
+                Background="{StaticResource BackgroundBrush}">
+            <DockPanel>
+                <Border DockPanel.Dock="Top" BorderBrush="{StaticResource BorderBrush}"
+                        BorderThickness="0,0,0,1" Background="{StaticResource SurfaceBrush}" Padding="12,10">
+                    <Grid>
+                        <Button Content="← Back" HorizontalAlignment="Left"
+                                Style="{StaticResource SmallButton}" BorderThickness="0"
+                                Foreground="{StaticResource BlueBrush}" Background="Transparent"
+                                Click="CloseUpdate_Click"/>
+                        <TextBlock Text="Update Available" FontSize="14" FontWeight="SemiBold"
+                                   Foreground="{StaticResource TextBrush}"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <Button x:Name="NotNowButton" Content="Not Now" HorizontalAlignment="Right"
+                                Style="{StaticResource SmallButton}" Click="CloseUpdate_Click"/>
+                    </Grid>
+                </Border>
+
+                <StackPanel Margin="20,16">
+                    <Border Background="{StaticResource CardBrush}" CornerRadius="6"
+                            BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
+                            Padding="14,12" Margin="0,0,0,12">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
-                            <Image Width="36" Height="36" Source="Assets/icon.png"
+                            <Image Width="44" Height="44" Source="Assets/icon.png"
-                                   RenderOptions.BitmapScalingMode="HighQuality" Margin="0,0,12,0"/>
-                            <StackPanel Grid.Column="1" VerticalAlignment="Center">
-                                <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="ClaudeChecker" FontSize="12" FontWeight="SemiBold" Foreground="White"/>
-                                    <Border Background="#0FFFFFFF" CornerRadius="4" Margin="6,0,0,0" Padding="5,1">
-                                        <TextBlock x:Name="VersionLabel" FontSize="11"
-                                                   Foreground="{StaticResource SecondaryBrush}"
-                                                   FontFamily="Consolas"/>
-                                    </Border>
-                                </StackPanel>
-                                <TextBlock Text="Built by superdooper86 &amp; claude"
-                                           FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
-                            </StackPanel>
-                            <Button Grid.Column="2" x:Name="CheckUpdateButton"
-                                    Style="{StaticResource SmallButton}" Click="CheckUpdate_Click"
-                                    VerticalAlignment="Center"/>
-                        </Grid>
-
-                    </StackPanel>
-                </ScrollViewer>
-            </Border>
-
-            <!-- Update sheet -->
-            <Border x:Name="UpdatePanel" Visibility="Collapsed"
-                    Background="{StaticResource BackgroundBrush}" CornerRadius="12">
-                <StackPanel>
-                    <Grid Margin="16,12">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Text="Update ClaudeChecker" FontSize="14" FontWeight="SemiBold"
-                                   Foreground="White" VerticalAlignment="Center"/>
-                        <Button Grid.Column="1" Content="Not Now" Style="{StaticResource SmallButton}"
-                                Click="CloseUpdate_Click" x:Name="NotNowButton"/>
-                    </Grid>
-                    <Rectangle Height="0.5" Fill="{StaticResource BorderBrush}"/>
-                    <StackPanel Margin="20">
-                        <Grid Margin="0,0,0,16">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <Image Width="48" Height="48" Source="Assets/icon.png"
                                    RenderOptions.BitmapScalingMode="HighQuality" Margin="0,0,14,0"/>
                             <StackPanel Grid.Column="1" VerticalAlignment="Center">
-                                <StackPanel Orientation="Horizontal">
+                                <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
                                     <TextBlock x:Name="CurrentVerLabel" FontSize="12" FontFamily="Consolas"
-                                               Foreground="{StaticResource SecondaryBrush}"/>
-                                    <TextBlock Text=" → " FontSize="10"
                                                Foreground="{StaticResource SecondaryBrush}" VerticalAlignment="Center"/>
+                                    <TextBlock Text=" → " FontSize="11" Foreground="{StaticResource SecondaryBrush}"
+                                               VerticalAlignment="Center"/>
                                     <TextBlock x:Name="NewVerLabel" FontSize="13" FontWeight="SemiBold"
-                                               FontFamily="Consolas" Foreground="{StaticResource BlueBrush}"/>
+                                               FontFamily="Consolas" Foreground="{StaticResource BlueBrush}"
+                                               VerticalAlignment="Center"/>
                                 </StackPanel>
                                 <TextBlock x:Name="ReleaseNotesText" FontSize="11" TextWrapping="Wrap"
-                                           Foreground="{StaticResource SecondaryBrush}" Margin="0,4,0,0"
+                                           Foreground="{StaticResource SecondaryBrush}" MaxHeight="160"/>
-                                           MaxHeight="180"/>
                             </StackPanel>
                         </Grid>
+                    </Border>
 
-                        <TextBlock x:Name="UpdateStatusText" Foreground="{StaticResource SecondaryBrush}"
+                    <TextBlock x:Name="UpdateStatusText" Foreground="{StaticResource SecondaryBrush}"
-                                   FontSize="11" TextWrapping="Wrap" TextAlignment="Center"
+                               FontSize="11" TextWrapping="Wrap" TextAlignment="Center"
-                                   Visibility="Collapsed" Margin="0,0,0,10"/>
+                               Visibility="Collapsed" Margin="0,0,0,8"/>
-
+                    <ProgressBar x:Name="UpdateProgress" Visibility="Collapsed"
-                        <ProgressBar x:Name="UpdateProgress" Visibility="Collapsed"
+                                 Height="4" Margin="0,0,0,12" Foreground="{StaticResource BlueBrush}"/>
-                                     Height="4" Margin="0,0,0,12" Foreground="{StaticResource BlueBrush}"/>
+                    <TextBlock Text="ClaudeChecker will download, replace itself, and relaunch automatically."
-
+                               FontSize="11" Foreground="{StaticResource SecondaryBrush}"
-                        <TextBlock Text="ClaudeChecker will download the update, replace itself, and relaunch automatically."
+                               TextWrapping="Wrap" TextAlignment="Center" Margin="0,0,0,12"/>
-                                   FontSize="11" Foreground="{StaticResource SecondaryBrush}"
+                    <Button x:Name="InstallButton" Content="⬇  Download &amp; Install"
-                                   TextWrapping="Wrap" TextAlignment="Center" Margin="0,0,0,12"/>
+                            Style="{StaticResource PrimaryButton}" HorizontalAlignment="Stretch"
-
+                            Click="Install_Click"/>
-                        <Button x:Name="InstallButton" Content="⬇  Install Update"
-                                Style="{StaticResource PrimaryButton}" HorizontalAlignment="Stretch"
-                                Click="Install_Click"/>
-                    </StackPanel>
                 </StackPanel>
-            </Border>
+            </DockPanel>
-        </Grid>
+        </Border>
-    </Border>
+    </Grid>
 </Window>

windows/PopupWindow.xaml.cs

@@ -1,11 +1,9 @@
 using ClaudeCheckerWindows.Controls;
 using System;
-using System.Collections.Generic;
+using System.Runtime.InteropServices;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Threading;
 
@@ -16,11 +14,22 @@ public partial class PopupWindow : Window
     private static readonly UsageViewModel VM      = App.ViewModel;
     private static readonly UpdateManager  Updater = App.Updater;
     private readonly DispatcherTimer _clockTimer;
+    private bool _dialogOpen;
+
+    [DllImport("dwmapi.dll")]
+    private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int value, int size);
+
+    private void ApplyTitleBarTheme()
+    {
+        var hwnd = new WindowInteropHelper(this).Handle;
+        if (hwnd == IntPtr.Zero) return;
+        int dark = ThemeManager.IsDark ? 1 : 0;
+        DwmSetWindowAttribute(hwnd, 20, ref dark, sizeof(int));
+    }
 
     public PopupWindow()
     {
         InitializeComponent();
-        DataContext = VM;
 
         VM.PropertyChanged      += (_, e) => Dispatcher.InvokeAsync(() => OnVmChanged(e.PropertyName));
         Updater.PropertyChanged += (_, e) => Dispatcher.InvokeAsync(() => OnUpdaterChanged(e.PropertyName));
@@ -34,10 +43,12 @@ public partial class PopupWindow : Window
         UpdateBannerState();
         UpdateFooter();
 
-        Deactivated += (_, _) => Hide();
+        Closing += (_, e) => { e.Cancel = true; Hide(); };
+        SourceInitialized += (_, _) => ApplyTitleBarTheme();
+        ThemeManager.ThemeChanged += () => { ApplyTitleBarTheme(); RebuildCards(); };
     }
 
-    // ── Card rendering ──────────────────────────────────────────────
+    // ── Card rendering ───────────────────────────────────────────────
 
     private void RebuildCards()
     {
@@ -48,160 +59,119 @@ public partial class PopupWindow : Window
 
     private static UIElement BuildCard(AgentLimit limit)
     {
-        var accent = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
+        var accent    = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
+        var text      = (SolidColorBrush)Application.Current.Resources["TextBrush"];
+        var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
 
-        var gauge = new GaugeControl
+        // Gauge
+        var gauge = new GaugeControl { Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent };
+
+        // Live badge
+        var liveBadge = new Border
         {
-            Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent,
+            Background   = new SolidColorBrush(Color.FromArgb(30, 0, 160, 0)),
+            CornerRadius = new CornerRadius(4),
+            Padding      = new Thickness(6, 2, 6, 2),
+            Margin       = new Thickness(0, 0, 6, 0),
+            Visibility   = limit.IsLive ? Visibility.Visible : Visibility.Collapsed,
+            Child        = new TextBlock { Text = "Live", FontSize = 10, FontWeight = FontWeights.Medium,
+                               Foreground = new SolidColorBrush(Color.FromRgb(0, 120, 0)) }
         };
 
-        var livePanel = new StackPanel { Orientation = Orientation.Horizontal };
+        // Usage badge
-        if (limit.IsLive)
-        {
-            livePanel.Children.Add(new Border
-            {
-                Background   = new SolidColorBrush(Color.FromArgb(26, 0, 255, 0)),
-                CornerRadius = new CornerRadius(4),
-                Padding      = new Thickness(6, 2, 6, 2),
-                Margin       = new Thickness(0, 0, 6, 0),
-                Child        = new TextBlock
-                {
-                    Text       = "Live",
-                    FontSize   = 10,
-                    FontWeight = FontWeights.Medium,
-                    Foreground = new SolidColorBrush(Colors.LightGreen),
-                }
-            });
-        }
-
         var usageBadge = new Border
         {
-            Background    = new SolidColorBrush(Color.FromArgb(15, 255, 255, 255)),
+            Background   = new SolidColorBrush(Color.FromArgb(18, 0, 0, 0)),
-            CornerRadius  = new CornerRadius(4),
+            CornerRadius = new CornerRadius(4),
-            Padding       = new Thickness(6, 2, 6, 2),
+            Padding      = new Thickness(6, 2, 6, 2),
-            Child         = new TextBlock
+            Child        = new TextBlock { Text = $"Usg: {limit.UsageLabel}", FontSize = 10,
-            {
+                               FontWeight = FontWeights.Medium, Foreground = secondary }
-                Text       = $"Usg: {limit.UsageLabel}",
-                FontSize   = 10,
-                FontWeight = FontWeights.Medium,
-                Foreground = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"],
-            }
-        };
-        livePanel.Children.Add(usageBadge);
-
-        var progressBar = new ProgressBar
-        {
-            Value      = limit.UsedPercent,
-            Maximum    = 100,
-            Height     = 4,
-            Foreground = accent,
-            Background = new SolidColorBrush(Color.FromArgb(18, 255, 255, 255)),
-            BorderThickness = new Thickness(0),
-            Margin     = new Thickness(0, 4, 0, 4),
         };
 
-        var sparkline = new SparklineControl
+        var badgeStack = new StackPanel { Orientation = Orientation.Horizontal };
-        {
+        badgeStack.Children.Add(liveBadge);
-            Height    = 28,
+        badgeStack.Children.Add(usageBadge);
-            Data      = limit.BurnHistory.Count > 0 ? limit.BurnHistory : null,
-            LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
-            Margin    = new Thickness(0, 8, 0, 0),
-        };
 
-        var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
+        var nameStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
-        infoPanel.Children.Add(new Grid
+        nameStack.Children.Add(new TextBlock { Text = "✦", FontSize = 11, Foreground = accent, VerticalAlignment = VerticalAlignment.Center });
-        {
+        nameStack.Children.Add(new TextBlock { Text = "Claude", FontSize = 13, FontWeight = FontWeights.SemiBold,
-            Children =
+            Foreground = text, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
-            {
+        nameStack.Children.Add(new TextBlock { Text = $"·  {VM.PlanLabel}", FontSize = 11,
-                new StackPanel
+            Foreground = secondary, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
-                {
-                    Orientation = Orientation.Horizontal,
-                    Children    =
-                    {
-                        MakeText("✦", 11, accent),
-                        MakeText("Claude", 13, Brushes.White, FontWeights.SemiBold, new Thickness(6,0,0,0)),
-                        MakeText($"·  {VM.PlanLabel}", 11,
-                            (SolidColorBrush)Application.Current.Resources["SecondaryBrush"],
-                            margin: new Thickness(6,0,0,0)),
-                    }
-                }.Also(s => Grid.SetColumn(s, 0)),
-                new StackPanel
-                {
-                    Orientation         = Orientation.Horizontal,
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    Children            = { /* live + usg */ },
-                }.Also(s => { Grid.SetColumn(s, 1); ((StackPanel)s).Children.Add(livePanel); }),
-            }.Tap(g => {
-                var gc = (Grid)g.Parent ?? (Grid)Application.Current.MainWindow;
-                ((Grid)g.Parent!).ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-                ((Grid)g.Parent!).ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
-            }),
-        });
 
-        // Simpler row approach
         var headerRow = new Grid();
         headerRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
         headerRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        Grid.SetColumn(nameStack,  0);
+        Grid.SetColumn(badgeStack, 1);
+        headerRow.Children.Add(nameStack);
+        headerRow.Children.Add(badgeStack);
 
-        var leftStack = new StackPanel { Orientation = Orientation.Horizontal };
+        var progress = new ProgressBar
-        leftStack.Children.Add(MakeText("✦", 11, accent));
+        {
-        leftStack.Children.Add(MakeText("Claude", 13, Brushes.White, FontWeights.SemiBold, new Thickness(6, 0, 0, 0)));
+            Value = limit.UsedPercent, Maximum = 100, Height = 4,
-        leftStack.Children.Add(MakeText($"·  {VM.PlanLabel}", 11,
+            Margin = new Thickness(0, 4, 0, 4),
-            (SolidColorBrush)Application.Current.Resources["SecondaryBrush"], margin: new Thickness(6, 0, 0, 0)));
+            Foreground = accent,
+            Background = new SolidColorBrush(Color.FromArgb(20, 0, 0, 0)),
+            BorderThickness = new Thickness(0),
+        };
 
-        Grid.SetColumn(leftStack, 0);
+        var timeStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
-        Grid.SetColumn(livePanel, 1);
+        timeStack.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
-        headerRow.Children.Add(leftStack);
+        timeStack.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
-        headerRow.Children.Add(livePanel);
+            FontWeight = FontWeights.Medium, Foreground = text, VerticalAlignment = VerticalAlignment.Center });
 
-        infoPanel.Children.Clear();
+        var resetText = new TextBlock
-        infoPanel.Children.Add(headerRow);
+        {
-        infoPanel.Children.Add(progressBar);
+            Text = $"Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
+            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
+        };
 
         var timeRow = new Grid();
         timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
         timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
-
+        Grid.SetColumn(timeStack, 0);
-        var timeLeft = new StackPanel { Orientation = Orientation.Horizontal };
-        timeLeft.Children.Add(MakeText("⏱ ", 10, (SolidColorBrush)Application.Current.Resources["SecondaryBrush"]));
-        timeLeft.Children.Add(MakeText(limit.TimeRemaining, 12, Brushes.White, FontWeights.Medium));
-
-        var resetText = MakeText(
-            $"Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
-            11, (SolidColorBrush)Application.Current.Resources["SecondaryBrush"]);
-
-        Grid.SetColumn(timeLeft, 0);
         Grid.SetColumn(resetText, 1);
-        timeRow.Children.Add(timeLeft);
+        timeRow.Children.Add(timeStack);
         timeRow.Children.Add(resetText);
+
+        var sparkline = new SparklineControl
+        {
+            Height = 28, Margin = new Thickness(0, 8, 0, 0), LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
+            Data = limit.BurnHistory.Count > 0 ? limit.BurnHistory : null,
+        };
+
+        var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
+        infoPanel.Children.Add(headerRow);
+        infoPanel.Children.Add(progress);
         infoPanel.Children.Add(timeRow);
         infoPanel.Children.Add(sparkline);
 
-        var cardContent = new Grid { Margin = new Thickness(16, 12, 16, 12) };
+        var cardGrid = new Grid { Margin = new Thickness(16, 12, 16, 12) };
-        cardContent.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
-        cardContent.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(16, GridUnitType.Pixel) });
+        cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(16, GridUnitType.Pixel) });
-        cardContent.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-
+        Grid.SetColumn(gauge,     0);
-        Grid.SetColumn(gauge, 0);
         Grid.SetColumn(infoPanel, 2);
-        cardContent.Children.Add(gauge);
+        cardGrid.Children.Add(gauge);
-        cardContent.Children.Add(infoPanel);
+        cardGrid.Children.Add(infoPanel);
 
         var card = new Border
         {
             Background      = (SolidColorBrush)Application.Current.Resources["CardBrush"],
-            CornerRadius    = new CornerRadius(8),
+            CornerRadius    = new CornerRadius(6),
-            BorderBrush     = new SolidColorBrush(Color.FromArgb(20, 255, 255, 255)),
+            BorderBrush     = border,
-            BorderThickness = new Thickness(0.5),
+            BorderThickness = new Thickness(1),
-            Child           = cardContent,
+            Margin          = new Thickness(12, 0, 12, 0),
-            Margin          = new Thickness(8, 0, 8, 0),
+            Child           = cardGrid,
         };
 
         var sectionLabel = new TextBlock
         {
-            Text      = limit.WindowLabel,
+            Text   = limit.WindowLabel,
-            Style     = (Style)Application.Current.Resources["HeaderText"],
+            Style  = (Style)Application.Current.Resources["HeaderText"],
-            Margin    = new Thickness(16, 10, 16, 4),
+            Margin = new Thickness(16, 12, 16, 6),
         };
 
         var section = new StackPanel();
@@ -210,18 +180,6 @@ public partial class PopupWindow : Window
         return section;
     }
 
-    private static TextBlock MakeText(string text, double size, Brush fg,
-        FontWeight? weight = null, Thickness? margin = null)
-        => new()
-        {
-            Text                = text,
-            FontSize            = size,
-            Foreground          = fg,
-            FontWeight          = weight ?? FontWeights.Normal,
-            Margin              = margin ?? new Thickness(0),
-            VerticalAlignment   = VerticalAlignment.Center,
-        };
-
     // ── State updates ────────────────────────────────────────────────
 
     private void OnVmChanged(string? prop)
@@ -232,6 +190,10 @@ public partial class PopupWindow : Window
             RebuildCards();
             UpdateFooter();
         }
+        if (prop is nameof(UsageViewModel.IsSignedIn) or nameof(UsageViewModel.UserEmail))
+        {
+            InitSettings();
+        }
     }
 
     private void OnUpdaterChanged(string? prop)
@@ -249,8 +211,7 @@ public partial class PopupWindow : Window
     private void UpdateBannerState()
     {
         var visible = Updater.UpdateAvailable;
-        UpdateBanner.Visibility    = visible ? Visibility.Visible : Visibility.Collapsed;
+        UpdateBanner.Visibility = visible ? Visibility.Visible : Visibility.Collapsed;
-        UpdateBannerDiv.Visibility = visible ? Visibility.Visible : Visibility.Collapsed;
         if (visible) UpdateBannerTitle.Text = $"Update available — v{Updater.LatestVersion}";
     }
 
@@ -259,9 +220,8 @@ public partial class PopupWindow : Window
         if (VM.LastUpdated.HasValue)
         {
             var diff = DateTime.Now - VM.LastUpdated.Value;
-            LastUpdatedText.Text = diff.TotalSeconds < 10
+            LastUpdatedText.Text = diff.TotalSeconds < 10 ? "Updated just now"
-                ? "Updated just now"
+                                                          : $"Updated {(int)diff.TotalSeconds}s ago";
-                : $"Updated {(int)diff.TotalSeconds}s ago";
         }
         else
         {
@@ -274,45 +234,37 @@ public partial class PopupWindow : Window
 
     private void InitSettings()
     {
-        VersionLabel.Text = $"v{App.Updater.CurrentVersion}";
+        VersionLabel.Text    = $"v{Updater.CurrentVersion}";
         BetaToggle.IsChecked = Updater.BetaChannel;
         CheckUpdateButton.Content = Updater.UpdateAvailable ? "Install" : "Check";
 
-        RefreshPicker.ItemsSource = new[]
+        var intervals = new[] { ("1 min", 60), ("2 min", 120), ("3 min", 180),
-        {
+                                ("4 min", 240), ("5 min", 300), ("10 min", 600) };
-            ("1 min",  60),  ("2 min",  120), ("3 min",  180),
+        RefreshPicker.ItemsSource        = intervals;
-            ("4 min",  240), ("5 min",  300), ("10 min", 600),
+        RefreshPicker.DisplayMemberPath  = "Item1";
-        };
+        var idx = Array.FindIndex(intervals, x => x.Item2 == VM.RefreshInterval);
-        RefreshPicker.DisplayMemberPath = "Item1";
+        RefreshPicker.SelectedIndex      = idx < 0 ? 1 : idx;
-        RefreshPicker.SelectedIndex = Array.FindIndex(
-            new[] { 60, 120, 180, 240, 300, 600 },
-            s => s == VM.RefreshInterval).Let(i => i < 0 ? 1 : i);
 
-        var signedIn = VM.IsSignedIn;
         AuthPanel.Children.Clear();
-        AuthPanel.Children.Add(new StackPanel
+        var dot = new System.Windows.Shapes.Ellipse
         {
-            Orientation = Orientation.Horizontal,
+            Width = 7, Height = 7, Margin = new Thickness(0, 0, 6, 0),
-            Children    =
+            Fill = VM.IsSignedIn ? Brushes.LimeGreen : Brushes.Orange,
-            {
+            VerticalAlignment = VerticalAlignment.Center,
-                new Ellipse
+        };
-                {
+        var label = new TextBlock
-                    Width = 7, Height = 7,
+        {
-                    Fill  = signedIn ? Brushes.LimeGreen : Brushes.Orange,
+            Text = VM.IsSignedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
-                    Margin = new Thickness(0,0,6,0),
+            FontSize = 13, FontWeight = FontWeights.SemiBold, Foreground = Brushes.White,
-                    VerticalAlignment = VerticalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
-                },
+        };
-                new TextBlock
+        var authRow = new StackPanel { Orientation = Orientation.Horizontal };
-                {
+        authRow.Children.Add(dot);
-                    Text       = signedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
+        authRow.Children.Add(label);
-                    FontSize   = 13, FontWeight = FontWeights.SemiBold, Foreground = Brushes.White,
+        AuthPanel.Children.Add(authRow);
-                    VerticalAlignment = VerticalAlignment.Center,
-                }
-            }
-        });
 
-        SignOutButton.Visibility = signedIn ? Visibility.Visible : Visibility.Collapsed;
+        SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
-        SignInButton.Content     = signedIn ? "Re-authenticate" : "Sign In";
+        SignInButton.Content     = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
     }
 
     // ── Event handlers ───────────────────────────────────────────────
@@ -320,55 +272,56 @@ public partial class PopupWindow : Window
     private void Settings_Click(object s, RoutedEventArgs e)
     {
         InitSettings();
-        MainPanel.Visibility    = Visibility.Collapsed;
+        MainPanel.Visibility     = Visibility.Collapsed;
         SettingsPanel.Visibility = Visibility.Visible;
-        UpdatePanel.Visibility  = Visibility.Collapsed;
+        UpdatePanel.Visibility   = Visibility.Collapsed;
     }
 
     private void BackFromSettings_Click(object s, RoutedEventArgs e) => ShowMain();
 
     private void ShowMain()
     {
-        MainPanel.Visibility    = Visibility.Visible;
+        MainPanel.Visibility     = Visibility.Visible;
         SettingsPanel.Visibility = Visibility.Collapsed;
-        UpdatePanel.Visibility  = Visibility.Collapsed;
+        UpdatePanel.Visibility   = Visibility.Collapsed;
     }
 
-    private void Close_Click(object s, RoutedEventArgs e) => Hide();
-
     private async void Refresh_Click(object s, RoutedEventArgs e) => await VM.RefreshAsync();
 
     private void UpdateBanner_Click(object s, RoutedEventArgs e) => ShowUpdatePanel();
 
     private void ShowUpdatePanel()
     {
-        CurrentVerLabel.Text    = $"v{Updater.CurrentVersion}";
+        CurrentVerLabel.Text  = $"v{Updater.CurrentVersion}";
-        NewVerLabel.Text        = $"v{Updater.LatestVersion}";
+        NewVerLabel.Text      = $"v{Updater.LatestVersion}";
-        ReleaseNotesText.Text   = Updater.ReleaseNotes;
+        ReleaseNotesText.Text = Updater.ReleaseNotes;
-        MainPanel.Visibility    = Visibility.Collapsed;
+        MainPanel.Visibility     = Visibility.Collapsed;
         SettingsPanel.Visibility = Visibility.Collapsed;
-        UpdatePanel.Visibility  = Visibility.Visible;
+        UpdatePanel.Visibility   = Visibility.Visible;
     }
 
     private void CloseUpdate_Click(object s, RoutedEventArgs e) => ShowMain();
 
     private async void Install_Click(object s, RoutedEventArgs e)
     {
-        NotNowButton.Visibility  = Visibility.Collapsed;
+        NotNowButton.Visibility     = Visibility.Collapsed;
         UpdateStatusText.Visibility = Visibility.Visible;
         UpdateProgress.Visibility   = Visibility.Visible;
         await Updater.DownloadAndInstallAsync();
     }
 
-    private void SignIn_Click(object s, RoutedEventArgs e)
+    private async void SignIn_Click(object s, RoutedEventArgs e)
     {
-        var login = new LoginWindow();
+        _dialogOpen = true;
-        login.Owner = this;
+        var login = new LoginWindow { Owner = this };
         if (login.ShowDialog() == true)
         {
-            _ = VM.RefreshAsync();
+            await VM.RefreshAsync();
             InitSettings();
         }
+        _dialogOpen = false;
+        Show();
+        Activate();
     }
 
     private async void SignOut_Click(object s, RoutedEventArgs e)
@@ -385,10 +338,10 @@ public partial class PopupWindow : Window
 
     private void RefreshPicker_Changed(object s, SelectionChangedEventArgs e)
     {
-        if (RefreshPicker.SelectedItem is (string _, int seconds))
+        if (RefreshPicker.SelectedItem is ValueTuple<string, int> selected)
         {
-            VM.RefreshInterval = seconds;
+            VM.RefreshInterval = selected.Item2;
-            ((App)Application.Current).ScheduleTimer(seconds);
+            ((App)Application.Current).ScheduleTimer(selected.Item2);
         }
     }
 
@@ -400,12 +353,3 @@ public partial class PopupWindow : Window
         CheckUpdateButton.Content = Updater.UpdateAvailable ? "Install" : "Check";
     }
 }
-
-// Minimal extension helpers to avoid repeating boilerplate
-file static class Extensions
-{
-    public static T Also<T>(this T t, Action<T> f) { f(t); return t; }
-    public static TResult Let<T, TResult>(this T t, Func<T, TResult> f) => f(t);
-}
-
-file class Ellipse : System.Windows.Shapes.Ellipse { }

windows/ThemeManager.cs

@@ -0,0 +1,77 @@
+using Microsoft.Win32;
+using System;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Threading;
+
+namespace ClaudeCheckerWindows;
+
+public static class ThemeManager
+{
+    public static bool IsDark { get; private set; }
+    public static event Action? ThemeChanged;
+
+    public static void Initialize()
+    {
+        IsDark = ReadIsDark();
+        Apply();
+
+        var timer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(5) };
+        timer.Tick += (_, _) =>
+        {
+            var nowDark = ReadIsDark();
+            if (nowDark == IsDark) return;
+            IsDark = nowDark;
+            Apply();
+            ThemeChanged?.Invoke();
+        };
+        timer.Start();
+    }
+
+    private static bool ReadIsDark()
+    {
+        try
+        {
+            using var key = Registry.CurrentUser.OpenSubKey(
+                @"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
+            return (int)(key?.GetValue("AppsUseLightTheme") ?? 1) == 0;
+        }
+        catch { return false; }
+    }
+
+    private static void Apply()
+    {
+        var res = Application.Current.Resources;
+        if (IsDark)
+        {
+            Set(res, "BackgroundBrush",   Color.FromRgb(0x1C, 0x1C, 0x1E));
+            Set(res, "CardBrush",         Color.FromRgb(0x2C, 0x2C, 0x2E));
+            Set(res, "TextBrush",         Color.FromRgb(0xF5, 0xF5, 0xF5));
+            Set(res, "SecondaryBrush",    Color.FromRgb(0x8A, 0x8A, 0x8E));
+            Set(res, "BorderBrush",       Color.FromRgb(0x3A, 0x3A, 0x3C));
+            Set(res, "BlueBrush",         Color.FromRgb(0x3B, 0x82, 0xF6));
+            Set(res, "ButtonBrush",       Color.FromRgb(0x3A, 0x3A, 0x3C));
+            Set(res, "SurfaceBrush",      Color.FromRgb(0x25, 0x25, 0x27));
+            Set(res, "BannerBgBrush",     Color.FromRgb(0x1A, 0x31, 0x52));
+            Set(res, "BannerBorderBrush", Color.FromRgb(0x2A, 0x4A, 0x72));
+        }
+        else
+        {
+            Set(res, "BackgroundBrush",   Color.FromRgb(0xF3, 0xF3, 0xF3));
+            Set(res, "CardBrush",         Colors.White);
+            Set(res, "TextBrush",         Color.FromRgb(0x1C, 0x1C, 0x1C));
+            Set(res, "SecondaryBrush",    Color.FromRgb(0x6E, 0x6E, 0x6E));
+            Set(res, "BorderBrush",       Color.FromRgb(0xE0, 0xE0, 0xE0));
+            Set(res, "BlueBrush",         Color.FromRgb(0x00, 0x78, 0xD4));
+            Set(res, "ButtonBrush",       Colors.White);
+            Set(res, "SurfaceBrush",      Color.FromRgb(0xFA, 0xFA, 0xFA));
+            Set(res, "BannerBgBrush",     Color.FromRgb(0xE8, 0xF2, 0xFB));
+            Set(res, "BannerBorderBrush", Color.FromRgb(0xB3, 0xD6, 0xF5));
+        }
+    }
+
+    private static void Set(ResourceDictionary res, string key, Color color)
+    {
+        if (res[key] is SolidColorBrush b) b.Color = color;
+    }
+}

windows/UpdateManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Reflection;
 using System.IO;
 using System.IO.Compression;
 using System.Net.Http;
@@ -48,18 +49,22 @@ public class UpdateManager : INotifyPropertyChanged
         set
         {
             Set(ref _betaChannel, value);
-            Properties.Settings.Default.BetaChannel = value;
+            AppSettings.Default.BetaChannel = value;
-            Properties.Settings.Default.Save();
+            AppSettings.Default.Save();
         }
     }
 
     public string CurrentVersion =>
         System.Reflection.Assembly.GetExecutingAssembly()
-              .GetName().Version?.ToString(3) ?? "1.0.0";
+              .GetCustomAttribute<System.Reflection.AssemblyInformationalVersionAttribute>()
+              ?.InformationalVersion.Split('+')[0]
+              ?? "1.0.0";
+
+    private bool IsPreReleaseBuild => CurrentVersion.Contains('-');
 
     public UpdateManager()
     {
-        _betaChannel = Properties.Settings.Default.BetaChannel;
+        _betaChannel = AppSettings.Default.BetaChannel;
     }
 
     public async Task CheckForUpdatesAsync()
@@ -91,7 +96,8 @@ public class UpdateManager : INotifyPropertyChanged
                 LatestBetaVersion = beta.Version;
                 BetaAvailable     = true;
 
-                if (BetaChannel && IsNewer(beta.Version, LatestVersion))
+                // Show beta update if user opted in, or if they're already running a beta
+                if ((BetaChannel || IsPreReleaseBuild) && IsNewer(beta.Version, LatestVersion))
                 {
                     LatestVersion   = beta.Version;
                     ReleaseNotes    = beta.Notes ?? "";

windows/UsageViewModel.cs

@@ -46,8 +46,8 @@ public class UsageViewModel : INotifyPropertyChanged
         set
         {
             Set(ref _refreshInterval, value);
-            Properties.Settings.Default.RefreshInterval = value;
+            AppSettings.Default.RefreshInterval = value;
-            Properties.Settings.Default.Save();
+            AppSettings.Default.Save();
         }
     }
 
@@ -58,16 +58,16 @@ public class UsageViewModel : INotifyPropertyChanged
         set
         {
             Set(ref _showInTaskbar, value);
-            Properties.Settings.Default.ShowInTaskbar = value;
+            AppSettings.Default.ShowInTaskbar = value;
-            Properties.Settings.Default.Save();
+            AppSettings.Default.Save();
         }
     }
 
     public UsageViewModel()
     {
-        _refreshInterval = Properties.Settings.Default.RefreshInterval > 0
+        _refreshInterval = AppSettings.Default.RefreshInterval > 0
-            ? Properties.Settings.Default.RefreshInterval : 120;
+            ? AppSettings.Default.RefreshInterval : 120;
-        _showInTaskbar = Properties.Settings.Default.ShowInTaskbar;
+        _showInTaskbar = AppSettings.Default.ShowInTaskbar;
         LoadBurnHistory();
         LoadPlaceholders();
     }
@@ -137,11 +137,8 @@ public class UsageViewModel : INotifyPropertyChanged
 
     public async Task SignOutAsync()
     {
-        var env = await CoreWebView2Environment.CreateAsync();
+        AppSettings.Default.CookieStore = "";
-        var dataManager = env.CreateCoreWebView2CookieManager();
+        AppSettings.Default.Save();
-        // Clear via settings — simplest approach is to delete the stored cookies
-        Properties.Settings.Default.CookieStore = "";
-        Properties.Settings.Default.Save();
 
         await Application.Current.Dispatcher.InvokeAsync(() =>
         {
@@ -155,7 +152,7 @@ public class UsageViewModel : INotifyPropertyChanged
     // Cookie store: we persist cookies as JSON in settings after login
     public static async Task<List<(string Name, string Value, string Domain, string Path)>> GetCookiesAsync()
     {
-        var raw = Properties.Settings.Default.CookieStore;
+        var raw = AppSettings.Default.CookieStore;
         if (string.IsNullOrEmpty(raw)) return [];
         try
         {
@@ -172,8 +169,8 @@ public class UsageViewModel : INotifyPropertyChanged
             .Where(c => c.Domain.Contains("claude.ai"))
             .Select(c => new CookieEntry { Name = c.Name, Value = c.Value, Domain = c.Domain, Path = c.Path })
             .ToList();
-        Properties.Settings.Default.CookieStore = JsonSerializer.Serialize(entries);
+        AppSettings.Default.CookieStore = JsonSerializer.Serialize(entries);
-        Properties.Settings.Default.Save();
+        AppSettings.Default.Save();
     }
 
     private static HttpClient BuildClient(List<(string Name, string Value, string Domain, string Path)> cookies)
@@ -280,7 +277,7 @@ public class UsageViewModel : INotifyPropertyChanged
     {
         try
         {
-            var raw = Properties.Settings.Default.BurnHistory;
+            var raw = AppSettings.Default.BurnHistory;
             if (string.IsNullOrEmpty(raw)) return;
             var saved = JsonSerializer.Deserialize<Dictionary<string, List<double>>>(raw);
             if (saved != null)
@@ -291,8 +288,8 @@ public class UsageViewModel : INotifyPropertyChanged
 
     private void SaveBurnHistory()
     {
-        Properties.Settings.Default.BurnHistory = JsonSerializer.Serialize(_burnHistory);
+        AppSettings.Default.BurnHistory = JsonSerializer.Serialize(_burnHistory);
-        Properties.Settings.Default.Save();
+        AppSettings.Default.Save();
     }
 
     public event PropertyChangedEventHandler? PropertyChanged;