chore: release notes for beta.24

windows/App.xaml

@@ -1,66 +1,52 @@
 <Application x:Class="ClaudeCheckerWindows.App"
              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"
              ShutdownMode="OnExplicitShutdown">
     <Application.Resources>
-        <SolidColorBrush x:Key="BackgroundBrush"    Color="#1C1C1E"/>
+        <SolidColorBrush x:Key="BackgroundBrush"   Color="#F3F3F3" po:Freeze="False"/>
-        <SolidColorBrush x:Key="CardBrush"          Color="#2C2C2E"/>
+        <SolidColorBrush x:Key="CardBrush"         Color="#FFFFFF" po:Freeze="False"/>
-        <SolidColorBrush x:Key="AccentBrush"        Color="#F97316"/>
+        <SolidColorBrush x:Key="AccentBrush"       Color="#F97316" po:Freeze="False"/>
-        <SolidColorBrush x:Key="SecondaryBrush"     Color="#888888"/>
+        <SolidColorBrush x:Key="TextBrush"         Color="#1C1C1C" po:Freeze="False"/>
-        <SolidColorBrush x:Key="BorderBrush"        Color="#38383A"/>
+        <SolidColorBrush x:Key="SecondaryBrush"    Color="#6E6E6E" po:Freeze="False"/>
-        <SolidColorBrush x:Key="BlueBrush"          Color="#3B82F6"/>
+        <SolidColorBrush x:Key="BorderBrush"       Color="#E0E0E0" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BlueBrush"         Color="#0078D4" po:Freeze="False"/>
+        <SolidColorBrush x:Key="ButtonBrush"       Color="#FFFFFF" po:Freeze="False"/>
+        <SolidColorBrush x:Key="SurfaceBrush"      Color="#FAFAFA" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BannerBgBrush"     Color="#E8F2FB" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BannerBorderBrush" Color="#B3D6F5" po:Freeze="False"/>
+        <SolidColorBrush x:Key="HoverBrush"       Color="#EBEBEB" po:Freeze="False"/>
+        <SolidColorBrush x:Key="BadgeBrush"        Color="#F0F0F0" po:Freeze="False"/>
 
         <Style x:Key="HeaderText" TargetType="TextBlock">
             <Setter Property="FontSize"   Value="10"/>
             <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Foreground" Value="{StaticResource SecondaryBrush}"/>
+            <Setter Property="Foreground" Value="{DynamicResource 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="{DynamicResource 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 +55,26 @@
         </Style>
 
         <Style x:Key="SmallButton" TargetType="Button">
-            <Setter Property="Background"    Value="Transparent"/>
+            <Setter Property="Background"      Value="{DynamicResource ButtonBrush}"/>
-            <Setter Property="BorderBrush"   Value="#33FFFFFF"/>
+            <Setter Property="BorderBrush"     Value="{DynamicResource BorderBrush}"/>
-            <Setter Property="BorderThickness" Value="0.5"/>
+            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Foreground"    Value="{StaticResource SecondaryBrush}"/>
+            <Setter Property="Foreground"      Value="{DynamicResource 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="{DynamicResource HoverBrush}"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -95,8 +82,89 @@
             </Setter>
         </Style>
 
+        <Style TargetType="ComboBox">
+            <Setter Property="FontFamily"      Value="Segoe UI"/>
+            <Setter Property="FontSize"        Value="12"/>
+            <Setter Property="Background"      Value="{DynamicResource CardBrush}"/>
+            <Setter Property="Foreground"      Value="{DynamicResource TextBrush}"/>
+            <Setter Property="BorderBrush"     Value="{DynamicResource BorderBrush}"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Padding"         Value="8,4"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ComboBox">
+                        <Grid>
+                            <Border x:Name="Border"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="4">
+                                <Grid>
+                                    <ContentPresenter x:Name="ContentSite"
+                                        IsHitTestVisible="False"
+                                        Content="{TemplateBinding SelectionBoxItem}"
+                                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                        Margin="{TemplateBinding Padding}"
+                                        VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                                    <TextBlock Text="▾" FontSize="10"
+                                               Foreground="{DynamicResource SecondaryBrush}"
+                                               HorizontalAlignment="Right" VerticalAlignment="Center"
+                                               Margin="0,0,8,0" IsHitTestVisible="False"/>
+                                    <ToggleButton Focusable="False" ClickMode="Press"
+                                                  IsChecked="{Binding IsDropDownOpen, Mode=TwoWay,
+                                                      RelativeSource={RelativeSource TemplatedParent}}"
+                                                  Background="Transparent" BorderThickness="0"/>
+                                </Grid>
+                            </Border>
+                            <Popup x:Name="Popup" Placement="Bottom"
+                                   IsOpen="{TemplateBinding IsDropDownOpen}"
+                                   AllowsTransparency="True" Focusable="False"
+                                   PopupAnimation="Slide">
+                                <Border SnapsToDevicePixels="True"
+                                        MinWidth="{TemplateBinding ActualWidth}"
+                                        MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                        Background="{DynamicResource CardBrush}"
+                                        BorderBrush="{DynamicResource BorderBrush}"
+                                        BorderThickness="1" CornerRadius="4">
+                                    <ScrollViewer Margin="0,2">
+                                        <ItemsPresenter/>
+                                    </ScrollViewer>
+                                </Border>
+                            </Popup>
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="ItemContainerStyle">
+                <Setter.Value>
+                    <Style TargetType="ComboBoxItem">
+                        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
+                        <Setter Property="Background" Value="{DynamicResource CardBrush}"/>
+                        <Setter Property="Padding"    Value="10,5"/>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="ComboBoxItem">
+                                    <Border x:Name="Bd"
+                                            Background="{TemplateBinding Background}"
+                                            Padding="{TemplateBinding Padding}">
+                                        <ContentPresenter/>
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsHighlighted" Value="True">
+                                            <Setter TargetName="Bd" Property="Background"
+                                                    Value="{DynamicResource HoverBrush}"/>
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
         <Style TargetType="ScrollViewer">
-            <Setter Property="VerticalScrollBarVisibility" Value="Hidden"/>
+            <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
         </Style>
     </Application.Resources>
 </Application>

windows/App.xaml.cs

@@ -17,7 +17,21 @@ public partial class App : Application
 
     protected override void OnStartup(StartupEventArgs e)
     {
+        var logPath = System.IO.Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "ClaudeChecker", "startup_crash.txt");
+
+        AppDomain.CurrentDomain.UnhandledException += (_, ex) =>
+            System.IO.File.WriteAllText(logPath, ex.ExceptionObject?.ToString() ?? "unknown");
+
+        DispatcherUnhandledException += (_, ex) =>
+        {
+            System.IO.File.WriteAllText(logPath, ex.Exception?.ToString() ?? "unknown");
+            ex.Handled = false;
+        };
+
         base.OnStartup(e);
+        ThemeManager.Initialize();
         SetupTray();
         ScheduleTimer(ViewModel.RefreshInterval);
 
@@ -78,21 +92,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

@@ -8,6 +8,9 @@ public class AppSettings
 {
     public string CookieStore     { get; set; } = "";
     public string BurnHistory     { get; set; } = "";
+    public string OrgId           { get; set; } = "";
+    public string Email           { get; set; } = "";
+    public string UsageJson       { get; set; } = "";
     public int    RefreshInterval { get; set; } = 120;
     public bool   ShowInTaskbar   { get; set; } = true;
     public bool   BetaChannel     { get; set; } = false;

windows/ClaudeCheckerWindows.csproj

@@ -26,9 +26,7 @@
     <None Update="Assets\icon.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\icon.png">
+    <Resource Include="Assets\icon.png"/>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 
 </Project>

windows/Controls/GaugeControl.cs

@@ -21,6 +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); }
 
+    public GaugeControl()
+    {
+        ThemeManager.ThemeChanged += InvalidateVisual;
+    }
+
     private const double StartAngleDeg = 135;
     private const double SweepDeg      = 270;
     private const double StrokeWidth   = 6;
@@ -31,8 +36,11 @@ public class GaugeControl : FrameworkElement
         var cy     = RenderSize.Height / 2;
         var radius = Math.Min(cx, cy) - StrokeWidth / 2 - 1;
 
+        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));
 
         if (Percent > 0)
             DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg * (Percent / 100.0),
@@ -40,18 +48,21 @@ public class GaugeControl : FrameworkElement
 
         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);
+
         var pctText = new FormattedText(
             $"{(int)Math.Round(Percent)}%",
             CultureInfo.CurrentCulture, 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));
 
         var sub = new FormattedText(
             "Updated\nnow",
             CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
             new Typeface("Segoe UI"), 7,
-            new SolidColorBrush(Color.FromRgb(0x88, 0x88, 0x88)), dpi)
+            new SolidColorBrush(subColor), dpi)
         {
             TextAlignment = TextAlignment.Center
         };

windows/LoginWindow.xaml.cs

@@ -1,6 +1,8 @@
 using Microsoft.Web.WebView2.Core;
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using System.Windows;
 
@@ -8,6 +10,8 @@ namespace ClaudeCheckerWindows;
 
 public partial class LoginWindow : Window
 {
+    private bool _closing;
+
     public LoginWindow()
     {
         InitializeComponent();
@@ -26,28 +30,85 @@ public partial class LoginWindow : Window
 
         Browser.CoreWebView2.NavigationCompleted += async (_, e) =>
         {
-            if (!e.IsSuccess) return;
+            if (!e.IsSuccess || _closing) 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 once we land on any claude.ai page that isn't the login flow
-                        ? "Signed in! Click Done to continue."
+            if (!uri.Contains("/login") && !uri.Contains("/signin") && signedIn)
-                        : "Waiting for sign-in…";
+                await SaveAndClose(cookies);
-                });
-            }
         };
     }
 
     private async void Done_Click(object sender, RoutedEventArgs e)
     {
+        if (_closing) return;
         var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
+        await SaveAndClose(cookies);
+    }
+
+    private async Task SaveAndClose(IReadOnlyList<CoreWebView2Cookie> cookies)
+    {
+        if (_closing) return;
+        _closing = true;
+
         UsageViewModel.SaveCookies(cookies);
-        DialogResult = true;
+
+        // Fetch bootstrap + usage from within WebView2 (already authenticated, no header issues)
+        try
+        {
+            const string script = @"(async()=>{try{
+                const h={headers:{accept:'application/json'}};
+                const b=await(await fetch('/api/bootstrap',h)).json();
+                let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
+                        ||b?.default_organization?.uuid||null;
+                const e=b?.account?.email_address||b?.account?.email||b?.email||null;
+                if(!id){
+                    try{const ol=await(await fetch('/api/organizations',h)).json();
+                        if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
+                }
+                if(!id){
+                    try{const pu=await(await fetch('/api/usage',h)).json();
+                        if(pu&&!pu.error)return{email:e,orgId:null,usage:pu};}catch(e3){}
+                    return{email:e,orgId:null,usage:null};
+                }
+                const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
+                return{email:e,orgId:id,usage:u};
+            }catch(ex){return{error:String(ex)};}})()";
+
+            var json = await Browser.CoreWebView2.ExecuteScriptAsync(script);
+            if (json != "null" && !string.IsNullOrEmpty(json))
+            {
+                using var doc = JsonDocument.Parse(json);
+                var root = doc.RootElement;
+
+                if (root.TryGetProperty("email", out var em) && em.ValueKind == JsonValueKind.String)
+                    AppSettings.Default.Email = em.GetString() ?? "";
+
+                if (root.TryGetProperty("orgId", out var oi) && oi.ValueKind == JsonValueKind.String)
+                    AppSettings.Default.OrgId = oi.GetString() ?? "";
+
+                if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
+                    AppSettings.Default.UsageJson = us.GetRawText();
+
+                AppSettings.Default.Save();
+            }
+        }
+        catch { }
+
+        await Dispatcher.InvokeAsync(() => DialogResult = true);
     }
 }

windows/PopupWindow.xaml

@@ -3,249 +3,252 @@
         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="{DynamicResource 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="{DynamicResource BannerBgBrush}"
-
+                    BorderBrush="{DynamicResource 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="{DynamicResource 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="{DynamicResource 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="{DynamicResource 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="{DynamicResource 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="{DynamicResource BorderBrush}"
-                <!-- Update banner -->
+                    BorderThickness="0,1,0,0" Background="{DynamicResource 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="{DynamicResource 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="{DynamicResource BackgroundBrush}">
+            <DockPanel>
+                <Border DockPanel.Dock="Top" BorderBrush="{DynamicResource BorderBrush}"
+                        BorderThickness="0,0,0,1" Background="{DynamicResource SurfaceBrush}" Padding="12,10">
+                    <Grid>
                         <Button Content="← Back" HorizontalAlignment="Left"
-                                Style="{StaticResource SmallButton}"
+                                Style="{StaticResource SmallButton}" BorderThickness="0"
-                                BorderThickness="0" Foreground="{StaticResource BlueBrush}"
+                                Foreground="{DynamicResource BlueBrush}" Background="Transparent"
-                                Click="BackFromSettings_Click" Margin="0,0,0,12"/>
+                                Click="BackFromSettings_Click"/>
+                        <TextBlock Text="Settings" FontSize="14" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource 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="{DynamicResource CardBrush}" CornerRadius="6"
-                        <StackPanel x:Name="AuthPanel" Margin="0,0,0,8"/>
+                                BorderBrush="{DynamicResource 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="{DynamicResource 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="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource 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="{DynamicResource TextBrush}"/>
+                                    <TextBlock Text="Receive early access builds — may be less stable"
+                                               FontSize="11" Foreground="{DynamicResource 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="{DynamicResource CardBrush}" CornerRadius="6"
-                        <ComboBox x:Name="RefreshPicker" SelectionChanged="RefreshPicker_Changed"
+                                BorderBrush="{DynamicResource 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="{DynamicResource 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="{DynamicResource CardBrush}" CornerRadius="6"
+                                BorderBrush="{DynamicResource 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="{DynamicResource TextBrush}"/>
+                                        <Border Background="{DynamicResource BadgeBrush}" CornerRadius="3"
+                                                Margin="6,0,0,0" Padding="5,1">
+                                            <TextBlock x:Name="VersionLabel" FontSize="11"
+                                                       Foreground="{DynamicResource SecondaryBrush}"
+                                                       FontFamily="Consolas"/>
+                                        </Border>
+                                    </StackPanel>
+                                    <TextBlock Text="Built by superdooper86 &amp; claude"
+                                               FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
+                                </StackPanel>
+                                <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
+                                    <Button x:Name="CheckUpdateButton"
+                                            Style="{StaticResource SmallButton}"
+                                            Click="CheckUpdate_Click"/>
+                                    <TextBlock x:Name="UpdateAvailableText" FontSize="10"
+                                               Foreground="{DynamicResource BlueBrush}"
+                                               HorizontalAlignment="Center"
+                                               Visibility="Collapsed" Margin="0,4,0,0"/>
+                                </StackPanel>
+                            </Grid>
+                        </Border>
 
-                        <!-- About -->
+                    </StackPanel>
+                </ScrollViewer>
+            </DockPanel>
+        </Border>
+
+        <!-- Update panel -->
+        <Border x:Name="UpdatePanel" Visibility="Collapsed"
+                Background="{DynamicResource BackgroundBrush}">
+            <DockPanel>
+                <Border DockPanel.Dock="Top" BorderBrush="{DynamicResource BorderBrush}"
+                        BorderThickness="0,0,0,1" Background="{DynamicResource SurfaceBrush}" Padding="12,10">
+                    <Grid>
+                        <Button Content="← Back" HorizontalAlignment="Left"
+                                Style="{StaticResource SmallButton}" BorderThickness="0"
+                                Foreground="{DynamicResource BlueBrush}" Background="Transparent"
+                                Click="CloseUpdate_Click"/>
+                        <TextBlock Text="Update Available" FontSize="14" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource 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="{DynamicResource CardBrush}" CornerRadius="6"
+                            BorderBrush="{DynamicResource 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}"/>
+                                               Foreground="{DynamicResource SecondaryBrush}" VerticalAlignment="Center"/>
-                                    <TextBlock Text=" → " FontSize="10"
+                                    <TextBlock Text=" → " FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
-                                               Foreground="{StaticResource SecondaryBrush}" VerticalAlignment="Center"/>
+                                               VerticalAlignment="Center"/>
                                     <TextBlock x:Name="NewVerLabel" FontSize="13" FontWeight="SemiBold"
-                                               FontFamily="Consolas" Foreground="{StaticResource BlueBrush}"/>
+                                               FontFamily="Consolas" Foreground="{DynamicResource BlueBrush}"
+                                               VerticalAlignment="Center"/>
                                 </StackPanel>
                                 <TextBlock x:Name="ReleaseNotesText" FontSize="11" TextWrapping="Wrap"
-                                           Foreground="{StaticResource SecondaryBrush}" Margin="0,4,0,0"
+                                           Foreground="{DynamicResource SecondaryBrush}" MaxHeight="160"/>
-                                           MaxHeight="180"/>
                             </StackPanel>
                         </Grid>
+                    </Border>
 
-                        <TextBlock x:Name="UpdateStatusText" Foreground="{StaticResource SecondaryBrush}"
+                    <TextBlock x:Name="UpdateStatusText" Foreground="{DynamicResource 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="{DynamicResource BlueBrush}"/>
-                                     Height="4" Margin="0,0,0,12" Foreground="{StaticResource BlueBrush}"/>
+                    <TextBlock Text="ClaudeChecker will download, replace itself, and relaunch automatically."
-
+                               FontSize="11" Foreground="{DynamicResource 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,7 +1,9 @@
 using ClaudeCheckerWindows.Controls;
 using System;
+using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Threading;
 
@@ -13,6 +15,18 @@ public partial class PopupWindow : Window
     private static readonly UpdateManager  Updater = App.Updater;
     private readonly DispatcherTimer _clockTimer;
 
+
+    [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();
@@ -29,7 +43,9 @@ public partial class PopupWindow : Window
         UpdateBannerState();
         UpdateFooter();
 
-        Deactivated += (_, _) => Hide();
+        Closing += (_, e) => { e.Cancel = true; Hide(); };
+        SourceInitialized += (_, _) => ApplyTitleBarTheme();
+        ThemeManager.ThemeChanged += () => { ApplyTitleBarTheme(); RebuildCards(); };
     }
 
     // ── Card rendering ───────────────────────────────────────────────
@@ -43,8 +59,10 @@ 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 secondary  = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var text      = (SolidColorBrush)Application.Current.Resources["TextBrush"];
+        var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
+        var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
 
         // Gauge
         var gauge = new GaugeControl { Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent };
@@ -52,26 +70,25 @@ public partial class PopupWindow : Window
         // Live badge
         var liveBadge = new Border
         {
-            Background   = new SolidColorBrush(Color.FromArgb(26, 0, 200, 0)),
+            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(Colors.LightGreen) }
+                               Foreground = new SolidColorBrush(Color.FromRgb(0, 120, 0)) }
         };
 
         // Usage badge
         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),
             Padding      = new Thickness(6, 2, 6, 2),
             Child        = new TextBlock { Text = $"Usg: {limit.UsageLabel}", FontSize = 10,
                                FontWeight = FontWeights.Medium, Foreground = secondary }
         };
 
-        // Header row: Claude · Pro | [Live] [Usg]
         var badgeStack = new StackPanel { Orientation = Orientation.Horizontal };
         badgeStack.Children.Add(liveBadge);
         badgeStack.Children.Add(usageBadge);
@@ -79,7 +96,7 @@ public partial class PopupWindow : Window
         var nameStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
         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,
-            Foreground = Brushes.White, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
+            Foreground = text, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
         nameStack.Children.Add(new TextBlock { Text = $"·  {VM.PlanLabel}", FontSize = 11,
             Foreground = secondary, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
 
@@ -91,21 +108,19 @@ public partial class PopupWindow : Window
         headerRow.Children.Add(nameStack);
         headerRow.Children.Add(badgeStack);
 
-        // Progress bar
         var progress = new ProgressBar
         {
             Value = limit.UsedPercent, Maximum = 100, Height = 4,
             Margin = new Thickness(0, 4, 0, 4),
             Foreground = accent,
-            Background = new SolidColorBrush(Color.FromArgb(18, 255, 255, 255)),
+            Background = new SolidColorBrush(Color.FromArgb(20, 0, 0, 0)),
             BorderThickness = new Thickness(0),
         };
 
-        // Time row
         var timeStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
         timeStack.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
         timeStack.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
-            FontWeight = FontWeights.Medium, Foreground = Brushes.White, VerticalAlignment = VerticalAlignment.Center });
+            FontWeight = FontWeights.Medium, Foreground = text, VerticalAlignment = VerticalAlignment.Center });
 
         var resetText = new TextBlock
         {
@@ -116,26 +131,23 @@ public partial class PopupWindow : Window
         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);
+        Grid.SetColumn(timeStack, 0);
-        Grid.SetColumn(resetText,  1);
+        Grid.SetColumn(resetText, 1);
         timeRow.Children.Add(timeStack);
         timeRow.Children.Add(resetText);
 
-        // Sparkline
         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,
         };
 
-        // Info panel
         var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
         infoPanel.Children.Add(headerRow);
         infoPanel.Children.Add(progress);
         infoPanel.Children.Add(timeRow);
         infoPanel.Children.Add(sparkline);
 
-        // Card content grid
         var cardGrid = new Grid { Margin = new Thickness(16, 12, 16, 12) };
         cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
         cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(16, GridUnitType.Pixel) });
@@ -148,10 +160,10 @@ public partial class PopupWindow : Window
         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),
-            Margin          = new Thickness(8, 0, 8, 0),
+            Margin          = new Thickness(12, 0, 12, 0),
             Child           = cardGrid,
         };
 
@@ -159,7 +171,7 @@ public partial class PopupWindow : Window
         {
             Text   = limit.WindowLabel,
             Style  = (Style)Application.Current.Resources["HeaderText"],
-            Margin = new Thickness(16, 10, 16, 4),
+            Margin = new Thickness(16, 12, 16, 6),
         };
 
         var section = new StackPanel();
@@ -178,12 +190,19 @@ public partial class PopupWindow : Window
             RebuildCards();
             UpdateFooter();
         }
+        if (prop is nameof(UsageViewModel.IsSignedIn) or nameof(UsageViewModel.UserEmail))
+        {
+            InitSettings();
+        }
     }
 
     private void OnUpdaterChanged(string? prop)
     {
         if (prop is nameof(UpdateManager.UpdateAvailable) or nameof(UpdateManager.LatestVersion))
+        {
             UpdateBannerState();
+            UpdateAboutSection();
+        }
         if (prop is nameof(UpdateManager.DownloadProgress))
             UpdateProgress.Value = Updater.DownloadProgress * 100;
         if (prop is nameof(UpdateManager.StatusMessage))
@@ -192,11 +211,25 @@ public partial class PopupWindow : Window
             InstallButton.Visibility = Visibility.Collapsed;
     }
 
+    private void UpdateAboutSection()
+    {
+        if (Updater.UpdateAvailable)
+        {
+            UpdateAvailableText.Text       = $"v{Updater.LatestVersion} available";
+            UpdateAvailableText.Visibility = Visibility.Visible;
+            CheckUpdateButton.Content      = "Install";
+        }
+        else
+        {
+            UpdateAvailableText.Visibility = Visibility.Collapsed;
+            CheckUpdateButton.Content      = "Check";
+        }
+    }
+
     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}";
     }
 
@@ -221,7 +254,7 @@ public partial class PopupWindow : Window
     {
         VersionLabel.Text    = $"v{Updater.CurrentVersion}";
         BetaToggle.IsChecked = Updater.BetaChannel;
-        CheckUpdateButton.Content = Updater.UpdateAvailable ? "Install" : "Check";
+        UpdateAboutSection();
 
         var intervals = new[] { ("1 min", 60), ("2 min", 120), ("3 min", 180),
                                 ("4 min", 240), ("5 min", 300), ("10 min", 600) };
@@ -240,7 +273,7 @@ public partial class PopupWindow : Window
         var label = new TextBlock
         {
             Text = VM.IsSignedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
-            FontSize = 13, FontWeight = FontWeights.SemiBold, Foreground = Brushes.White,
+            FontSize = 13, FontWeight = FontWeights.SemiBold, Foreground = (SolidColorBrush)Application.Current.Resources["TextBrush"],
             VerticalAlignment = VerticalAlignment.Center,
         };
         var authRow = new StackPanel { Orientation = Orientation.Horizontal };
@@ -271,8 +304,6 @@ public partial class PopupWindow : Window
         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();
@@ -297,14 +328,26 @@ public partial class PopupWindow : Window
         await Updater.DownloadAndInstallAsync();
     }
 
-    private void SignIn_Click(object s, RoutedEventArgs e)
+    private async void SignIn_Click(object s, RoutedEventArgs e)
     {
         var login = new LoginWindow { Owner = this };
         if (login.ShowDialog() == true)
         {
-            _ = VM.RefreshAsync();
+            // Show cached data from SaveAndClose immediately (no WebView2 needed)
+            await VM.LoadFromCacheAsync();
             InitSettings();
+            ShowMain();
+
+            // Full refresh in background after WebView2 folder is definitely released
+            _ = Task.Run(async () =>
+            {
+                await Task.Delay(3000);
+                await VM.RefreshAsync();
+                await Application.Current.Dispatcher.InvokeAsync(InitSettings);
+            });
         }
+        Show();
+        Activate();
     }
 
     private async void SignOut_Click(object s, RoutedEventArgs e)

windows/RELEASE_NOTES.md

@@ -1,3 +1,6 @@
-## What's new
+## What's new in beta.24
 
-Initial Windows release.
+- Sign-in now shows email and data immediately after login (loads from cache set during login flow)
+- Background refresh runs 3 seconds after login — avoids WebView2 user data folder lock race
+- Added /api/organizations and personal /api/usage fallbacks when bootstrap has no org ID
+- Broader JS paths for email and org ID

windows/ThemeManager.cs

@@ -0,0 +1,81 @@
+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));
+            Set(res, "HoverBrush",        Color.FromRgb(0x4A, 0x4A, 0x4C));
+            Set(res, "BadgeBrush",        Color.FromRgb(0x3A, 0x3A, 0x3C));
+        }
+        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));
+            Set(res, "HoverBrush",        Color.FromRgb(0xEB, 0xEB, 0xEB));
+            Set(res, "BadgeBrush",        Color.FromRgb(0xF0, 0xF0, 0xF0));
+        }
+    }
+
+    private static void Set(ResourceDictionary res, string key, Color color)
+    {
+        res[key] = new SolidColorBrush(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;
@@ -55,7 +56,11 @@ public class UpdateManager : INotifyPropertyChanged
 
     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()
     {
@@ -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

@@ -13,7 +13,6 @@ namespace ClaudeCheckerWindows;
 
 public class UsageViewModel : INotifyPropertyChanged
 {
-    private static readonly string OrgId = "daf626a9-4924-4ff3-ba98-23b523062f8e";
     private static readonly JsonSerializerOptions JsonOpts = new() { PropertyNameCaseInsensitive = true };
 
     private List<AgentLimit> _limits = [];
@@ -79,28 +78,45 @@ public class UsageViewModel : INotifyPropertyChanged
         try
         {
             var cookies = await GetCookiesAsync();
-            if (cookies.Count == 0)
+
+            // Check if we have any persistent proof that the user authenticated
+            bool hasCookies    = cookies.Count > 0;
+            bool hasCachedAuth = !string.IsNullOrEmpty(AppSettings.Default.Email) ||
+                                 !string.IsNullOrEmpty(AppSettings.Default.OrgId);
+
+            if (!hasCookies && !hasCachedAuth)
             {
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
-                    IsSignedIn = false;
+                    IsSignedIn   = false;
                     ErrorMessage = "Not signed in — click Sign In to authenticate.";
-                    IsLoading = false;
+                    IsLoading    = false;
                 });
                 return;
             }
 
-            using var http = BuildClient(cookies);
+            // Try HttpClient first (fast path) — may be rejected by server CORS/header checks
+            var (limits, overage, prepaid, email, orgId, ok) = hasCookies
+                ? await TryHttpRefreshAsync(cookies)
+                : ([], null, null, null, null, false);
 
-            var usageTask   = FetchAsync<UsageResponse>(http, $"https://claude.ai/api/organizations/{OrgId}/usage");
+            // Fall back to WebView2 (uses the shared browser session, not HttpClient)
-            var overageTask = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{OrgId}/overage_spend_limit");
+            if (!ok)
-            var prepaidTask = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{OrgId}/prepaid/credits");
+                (limits, email, orgId) = await TryWebView2RefreshAsync();
-            var emailTask   = FetchEmailAsync(http);
 
-            await Task.WhenAll(usageTask, overageTask, prepaidTask, emailTask);
+            // Fill in any blanks from cached values saved at login time
-
+            if (string.IsNullOrEmpty(email))  email  = AppSettings.Default.Email;
-            var usage  = usageTask.Result;
+            if (string.IsNullOrEmpty(orgId))  orgId  = AppSettings.Default.OrgId;
-            var limits = BuildLimits(usage);
+            if (limits.Count == 0 && !string.IsNullOrEmpty(AppSettings.Default.UsageJson))
+            {
+                try
+                {
+                    var cached = System.Text.Json.JsonSerializer.Deserialize<UsageResponse>(
+                        AppSettings.Default.UsageJson, JsonOpts);
+                    limits = BuildLimits(cached);
+                }
+                catch { }
+            }
 
             foreach (var limit in limits)
             {
@@ -115,14 +131,16 @@ public class UsageViewModel : INotifyPropertyChanged
 
             await Application.Current.Dispatcher.InvokeAsync(() =>
             {
-                Limits        = limits;
+                Limits       = limits;
-                Overage       = overageTask.Result;
+                Overage      = overage;
-                Prepaid       = prepaidTask.Result;
+                Prepaid      = prepaid;
-                UserEmail     = emailTask.Result ?? UserEmail;
+                if (!string.IsNullOrEmpty(email)) UserEmail = email;
-                IsSignedIn    = true;
+                // Trust that cookies / cached auth mean the user IS signed in,
-                ErrorMessage  = null;
+                // even if the live fetch failed this cycle.
-                LastUpdated   = DateTime.Now;
+                IsSignedIn   = true;
-                IsLoading     = false;
+                ErrorMessage = null;
+                LastUpdated  = DateTime.Now;
+                IsLoading    = false;
             });
         }
         catch (Exception ex)
@@ -135,9 +153,137 @@ public class UsageViewModel : INotifyPropertyChanged
         }
     }
 
+    private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, string?, string?, bool)>
+        TryHttpRefreshAsync(List<(string Name, string Value, string Domain, string Path)> cookies)
+    {
+        try
+        {
+            using var http = BuildClient(cookies);
+            var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
+            if (!bootstrapResp.IsSuccessStatusCode)
+                return ([], null, null, null, null, false);
+
+            var (email, orgId) = ParseBootstrap(await bootstrapResp.Content.ReadAsStringAsync());
+
+            if (string.IsNullOrEmpty(orgId))
+                orgId = await FetchOrgIdFromListAsync(http);
+            if (string.IsNullOrEmpty(orgId) && !string.IsNullOrEmpty(AppSettings.Default.OrgId))
+                orgId = AppSettings.Default.OrgId;
+
+            if (string.IsNullOrEmpty(orgId))
+                return ([], null, null, email, orgId, true);
+
+            AppSettings.Default.OrgId = orgId;
+            AppSettings.Default.Save();
+
+            var ut = FetchAsync<UsageResponse>(http, $"https://claude.ai/api/organizations/{orgId}/usage");
+            var ot = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
+            var pt = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
+            await Task.WhenAll(ut, ot, pt);
+
+            return (BuildLimits(ut.Result), ot.Result, pt.Result, email, orgId, true);
+        }
+        catch { return ([], null, null, null, null, false); }
+    }
+
+    private static async Task<(List<AgentLimit>, string?, string?)> TryWebView2RefreshAsync()
+    {
+        try
+        {
+            const string script = @"(async()=>{try{
+                const h={headers:{accept:'application/json'}};
+                const b=await(await fetch('/api/bootstrap',h)).json();
+                let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
+                        ||b?.default_organization?.uuid||null;
+                const em=b?.account?.email_address||b?.account?.email||b?.email||null;
+                if(!id){
+                    try{const ol=await(await fetch('/api/organizations',h)).json();
+                        if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
+                }
+                if(!id){
+                    try{const pu=await(await fetch('/api/usage',h)).json();
+                        if(pu&&!pu.error)return{email:em,orgId:null,usage:pu};}catch(e3){}
+                    return{email:em,orgId:null,usage:null};
+                }
+                const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
+                return{email:em,orgId:id,usage:u};
+            }catch(ex){return null;}})()";
+
+            var resultJson = await Application.Current.Dispatcher.InvokeAsync(async () =>
+            {
+                var host = new WebViewFetchWindow();
+                host.Show();
+                try   { return await host.FetchAsync("https://claude.ai", script); }
+                finally { host.Close(); }
+            }).Task.Unwrap();
+
+            if (resultJson == null || resultJson == "null") return ([], null, null);
+
+            using var doc = System.Text.Json.JsonDocument.Parse(resultJson);
+            var root = doc.RootElement;
+
+            string? email = root.TryGetProperty("email", out var em) && em.ValueKind == System.Text.Json.JsonValueKind.String
+                ? em.GetString() : null;
+            string? orgId = root.TryGetProperty("orgId", out var oi) && oi.ValueKind == System.Text.Json.JsonValueKind.String
+                ? oi.GetString() : null;
+
+            List<AgentLimit> limits = [];
+            if (root.TryGetProperty("usage", out var us) && us.ValueKind == System.Text.Json.JsonValueKind.Object)
+            {
+                var usage = System.Text.Json.JsonSerializer.Deserialize<UsageResponse>(
+                    us.GetRawText(), new System.Text.Json.JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+                limits = BuildLimits(usage);
+
+                // Cache for next time
+                AppSettings.Default.UsageJson = us.GetRawText();
+                if (!string.IsNullOrEmpty(orgId)) AppSettings.Default.OrgId = orgId;
+                if (!string.IsNullOrEmpty(email)) AppSettings.Default.Email = email;
+                AppSettings.Default.Save();
+            }
+
+            return (limits, email, orgId);
+        }
+        catch { return ([], null, null); }
+    }
+
+    public async Task LoadFromCacheAsync()
+    {
+        var email  = AppSettings.Default.Email;
+        var orgId  = AppSettings.Default.OrgId;
+        var cookie = AppSettings.Default.CookieStore;
+
+        bool isAuth = !string.IsNullOrEmpty(email) || !string.IsNullOrEmpty(orgId)
+                   || !string.IsNullOrEmpty(cookie);
+        if (!isAuth) return;
+
+        List<AgentLimit> limits = [];
+        if (!string.IsNullOrEmpty(AppSettings.Default.UsageJson))
+        {
+            try
+            {
+                var cached = JsonSerializer.Deserialize<UsageResponse>(
+                    AppSettings.Default.UsageJson, JsonOpts);
+                limits = BuildLimits(cached);
+            }
+            catch { }
+        }
+
+        await Application.Current.Dispatcher.InvokeAsync(() =>
+        {
+            if (!string.IsNullOrEmpty(email)) UserEmail = email;
+            if (limits.Count > 0)             Limits    = limits;
+            IsSignedIn   = true;
+            ErrorMessage = limits.Count == 0 ? "Signed in — refreshing data…" : null;
+            LastUpdated  = limits.Count > 0 ? DateTime.Now : LastUpdated;
+        });
+    }
+
     public async Task SignOutAsync()
     {
         AppSettings.Default.CookieStore = "";
+        AppSettings.Default.OrgId       = "";
+        AppSettings.Default.Email       = "";
+        AppSettings.Default.UsageJson   = "";
         AppSettings.Default.Save();
 
         await Application.Current.Dispatcher.InvokeAsync(() =>
@@ -149,7 +295,6 @@ 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 = AppSettings.Default.CookieStore;
@@ -166,7 +311,7 @@ public class UsageViewModel : INotifyPropertyChanged
     public static void SaveCookies(IEnumerable<CoreWebView2Cookie> cookies)
     {
         var entries = cookies
-            .Where(c => c.Domain.Contains("claude.ai"))
+            .Where(c => c.Domain.Contains("claude.ai") || c.Domain.Contains("anthropic.com"))
             .Select(c => new CookieEntry { Name = c.Name, Value = c.Value, Domain = c.Domain, Path = c.Path })
             .ToList();
         AppSettings.Default.CookieStore = JsonSerializer.Serialize(entries);
@@ -178,6 +323,9 @@ public class UsageViewModel : INotifyPropertyChanged
         var handler = new HttpClientHandler { UseCookies = false };
         var http    = new HttpClient(handler);
         http.DefaultRequestHeaders.Add("accept", "application/json");
+        http.DefaultRequestHeaders.Add("User-Agent",
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
+            "(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36");
         var cookieHeader = string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}"));
         http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
         return http;
@@ -195,20 +343,64 @@ public class UsageViewModel : INotifyPropertyChanged
         catch { return null; }
     }
 
-    private static async Task<string?> FetchEmailAsync(HttpClient http)
+    // Parse email and org ID out of bootstrap JSON (multiple fallback paths for org ID)
+    private static (string? Email, string? OrgId) ParseBootstrap(string json)
     {
         try
         {
-            var resp = await http.GetAsync("https://claude.ai/api/bootstrap");
+            using var doc = JsonDocument.Parse(json);
+            var root = doc.RootElement;
+
+            string? email = null;
+            string? orgId = null;
+
+            if (root.TryGetProperty("account", out var acct) &&
+                acct.TryGetProperty("email_address", out var em))
+                email = em.GetString();
+
+            // Path 1: memberships[0].organization.uuid
+            if (root.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
+            {
+                var first = mems[0];
+                if (first.TryGetProperty("organization", out var org) &&
+                    org.TryGetProperty("uuid", out var uuid))
+                    orgId = uuid.GetString();
+            }
+
+            // Path 2: organizations[0].uuid (flat list on root)
+            if (string.IsNullOrEmpty(orgId) &&
+                root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
+            {
+                if (orgs[0].TryGetProperty("uuid", out var uuid))
+                    orgId = uuid.GetString();
+            }
+
+            return (email, orgId);
+        }
+        catch { return (null, null); }
+    }
+
+    private static async Task<string?> FetchOrgIdFromListAsync(HttpClient http)
+    {
+        try
+        {
+            var resp = await http.GetAsync("https://claude.ai/api/organizations");
             if (!resp.IsSuccessStatusCode) return null;
             var json = await resp.Content.ReadAsStringAsync();
-            var boot = JsonSerializer.Deserialize<BootstrapResponse>(json, JsonOpts);
+            using var doc = JsonDocument.Parse(json);
-            return boot?.Account?.EmailAddress;
+            var root = doc.RootElement;
+            if (root.ValueKind == JsonValueKind.Array && root.GetArrayLength() > 0)
+            {
+                var first = root[0];
+                if (first.TryGetProperty("uuid", out var uuid))
+                    return uuid.GetString();
+            }
+            return null;
         }
         catch { return null; }
     }
 
-    private List<AgentLimit> BuildLimits(UsageResponse? usage)
+    private static List<AgentLimit> BuildLimits(UsageResponse? usage)
     {
         if (usage == null) return [];
         var now    = DateTime.Now;

windows/WebViewFetchWindow.cs

@@ -0,0 +1,59 @@
+using Microsoft.Web.WebView2.Core;
+using Microsoft.Web.WebView2.Wpf;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace ClaudeCheckerWindows;
+
+// Invisible 1×1 window that hosts a WebView2 for authenticated API calls.
+// Uses the same user data folder as LoginWindow so the session is shared.
+internal sealed class WebViewFetchWindow : Window
+{
+    private readonly WebView2 _wv = new();
+
+    public WebViewFetchWindow()
+    {
+        Width          = 1;
+        Height         = 1;
+        Left           = -9999;
+        Top            = -9999;
+        ShowInTaskbar  = false;
+        WindowStyle    = WindowStyle.None;
+        AllowsTransparency = true;
+        Opacity        = 0;
+        Content        = _wv;
+    }
+
+    public async Task<string?> FetchAsync(string navigateUrl, string script, int timeoutMs = 20000)
+    {
+        var env = await CoreWebView2Environment.CreateAsync(userDataFolder:
+            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                "ClaudeChecker", "WebView2"));
+
+        await _wv.EnsureCoreWebView2Async(env);
+
+        var tcs = new TaskCompletionSource<string?>();
+
+        EventHandler<CoreWebView2NavigationCompletedEventArgs>? handler = null;
+        handler = async (_, e) =>
+        {
+            _wv.CoreWebView2.NavigationCompleted -= handler;
+            if (!e.IsSuccess) { tcs.TrySetResult(null); return; }
+            try
+            {
+                var result = await _wv.CoreWebView2.ExecuteScriptAsync(script);
+                tcs.TrySetResult(result);
+            }
+            catch { tcs.TrySetResult(null); }
+        };
+
+        _wv.CoreWebView2.NavigationCompleted += handler;
+        _wv.CoreWebView2.Navigate(navigateUrl);
+
+        _ = Task.Delay(timeoutMs).ContinueWith(_ => tcs.TrySetResult(null));
+
+        return await tcs.Task;
+    }
+}