diff --git a/CHANGELOG.md b/CHANGELOG.md
index f10f250..a6d5cc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,60 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.0] - 2026-03-04
+
+### Important
+
+- **Schema upgrade**: The `config.collection_schedule` table gains two new columns (`collect_query`, `collect_plan`) for optional query text and execution plan collection. Both default to enabled to preserve existing behavior. Upgrade scripts run automatically via the CLI/GUI installer and use idempotent checks.
+
+### Added
+
+- **Light theme and "Cool Breeze" theme** — full light mode support for both Dashboard and Lite with live preview in settings ([#347])
+- **Standalone Plan Viewer** — open, paste (Ctrl+V), or drag & drop `.sqlplan` files independent of any server connection, with tabbed multi-plan support ([#359])
+- **Time display mode toggle** — show timestamps in Server Time, Local Time, or UTC with timezone labels across all grids and tooltips ([#17])
+- **30 PlanAnalyzer rules** — expanded from 12 to 30 rules covering implicit conversions, GetRangeThroughConvert, lazy spools, OR expansion, exchange spills, RID lookups, and more ([#327], [#349], [#356], [#379])
+- **Wait stats banner** in plan viewer showing top waits for the query ([#373])
+- **UDF runtime details** — CPU and elapsed time shown in Runtime Summary pane when UDFs are present ([#382])
+- **Sortable statement grid** and canvas panning in plan viewer ([#331])
+- **Comma-separated column filters** — enter multiple values separated by commas in text filters ([#348])
+- **Optional query text and plan collection** — per-collector flags in `config.collection_schedule` to disable query text or plan capture ([#337])
+- **`--preserve-jobs` installer flag** — keep existing SQL Agent job schedules during upgrade ([#326])
+- **Copy Query Text** context menu on Dashboard statements grid ([#367])
+- **Server list sorting** by display name in both Dashboard and Lite ([#30])
+- **Warning status icon** in server health indicators ([#355])
+- Reserved threads and 10 missing ShowPlan XML attributes in plan viewer ([#378])
+- Nightly build workflow for CI ([#332])
+
+### Changed
+
+- PlanAnalyzer warning messages rewritten to be actionable with expert-guided per-rule advice ([#370], [#371])
+- PlanAnalyzer rule tuning: time-based spill analysis (Rule 7), lowered parallel skew thresholds (Rule 8), memory grant floor raised to 1GB/4GB (Rule 9), skip PROBE-only bitmap predicates (Rule 11) ([#341], [#342], [#343], [#358])
+- First-run collector lookback reduced from 3-7 days to 1 hour for faster initial data ([#335])
+- Plan canvas aligns top-left and resets scroll on statement switch ([#366])
+- Plan viewer polish: index suggestions, property panel improvements, muted brush audit ([#365])
+- Add Server dialog visual parity between Dashboard and Lite with theme-driven PasswordBox styling ([#289])
+
+### Fixed
+
+- **OverflowException** on wait stats page with large decimal values — SQL Server `decimal(38,24)` exceeding .NET precision ([#395])
+- **SQL dumps** on mirroring passive servers with RESTORING databases ([#384])
+- **UI hang** when adding first server to Dashboard ([#387])
+- **UTC/local timezone mismatch** in blocked process XML processor ([#383])
+- **AG secondary filter** skipping all inaccessible databases in cross-database collectors ([#325])
+- DuckDB column aliases in long-running queries ([#391])
+- sp_server_diagnostics and WAITFOR excluded from long-running query alerts ([#362])
+- UDF timing units corrected: microseconds to milliseconds ([#338])
+- DuckDB migration ordering after archive-and-reset ([#314])
+- Int16 cast error in long-running query alerts ([#313])
+- Missing dark mode on 19 SystemEventsContent charts ([#321])
+- Missing tooltips on charts after theme changes ([#319])
+- Operator time per-thread calculation synced across all plan viewers ([#392])
+- Theme StaticResource/DynamicResource binding fix for runtime theme switching
+- Memory grant MB display, missing index quality scoring, wildcard LIKE detection ([#393])
+- **Installer validation** reporting historical collection errors as current failures — now filters to current run only ([#400])
+- **query_snapshots schema mismatch** after sp_WhoIsActive upgrade — collector auto-recreates daily table when column order changes ([#401])
+- **Missing upgrade script** for `default_trace_events` columns (`duration_us`, `end_time`) on 2.0.0→2.1.0 upgrade path ([#400])
+
 ## [2.0.0] - 2026-02-25
 
 ### Important
@@ -180,6 +234,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Delta normalization for per-second rate calculations
 - Dark theme UI
 
+[2.1.0]: https://github.com/erikdarlingdata/PerformanceMonitor/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/erikdarlingdata/PerformanceMonitor/compare/v1.3.0...v2.0.0
 [1.3.0]: https://github.com/erikdarlingdata/PerformanceMonitor/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/erikdarlingdata/PerformanceMonitor/compare/v1.1.0...v1.2.0
@@ -274,3 +329,45 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#281]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/281
 [#284]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/284
 [#287]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/287
+[#313]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/313
+[#314]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/314
+[#17]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/17
+[#30]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/30
+[#319]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/319
+[#321]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/321
+[#325]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/325
+[#326]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/326
+[#327]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/327
+[#331]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/331
+[#332]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/332
+[#335]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/335
+[#337]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/337
+[#338]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/338
+[#341]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/341
+[#342]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/342
+[#343]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/343
+[#347]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/347
+[#348]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/348
+[#349]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/349
+[#355]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/355
+[#356]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/356
+[#358]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/358
+[#359]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/359
+[#362]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/362
+[#365]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/365
+[#366]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/366
+[#367]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/367
+[#370]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/370
+[#371]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/371
+[#373]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/373
+[#378]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/378
+[#379]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/379
+[#382]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/382
+[#383]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/383
+[#384]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/384
+[#387]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/387
+[#391]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/391
+[#392]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/392
+[#393]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/393
+[#289]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/289
+[#395]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/395
diff --git a/Dashboard/AddServerDialog.xaml b/Dashboard/AddServerDialog.xaml
index 5d39a23..84d3e5f 100644
--- a/Dashboard/AddServerDialog.xaml
+++ b/Dashboard/AddServerDialog.xaml
@@ -2,29 +2,15 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Add SQL Server"
-        Height="550" Width="500"
+        SizeToContent="Height" Width="450" MaxHeight="700"
         WindowStartupLocation="CenterOwner"
         ResizeMode="NoResize"
         Background="{DynamicResource BackgroundBrush}"
         Foreground="{DynamicResource ForegroundBrush}">
-    <Window.Resources>
-        <Style TargetType="TextBox">
-            <Setter Property="Background" Value="{DynamicResource BackgroundLightBrush}"/>
-            <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
-            <Setter Property="CaretBrush" Value="{DynamicResource ForegroundBrush}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        </Style>
-        <Style TargetType="PasswordBox">
-            <Setter Property="Background" Value="{DynamicResource BackgroundLightBrush}"/>
-            <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
-            <Setter Property="CaretBrush" Value="{DynamicResource ForegroundBrush}"/>
-            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        </Style>
-    </Window.Resources>
     <Grid Margin="20">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
@@ -34,97 +20,93 @@
                    Foreground="{DynamicResource ForegroundBrush}"/>
 
         <!-- Form Fields -->
-        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
-            <StackPanel>
-                <!-- Display Name -->
-                <TextBlock Text="Display Name:" FontWeight="Bold" Margin="0,0,0,5"
-                           Foreground="{DynamicResource ForegroundBrush}"/>
-                <TextBox x:Name="DisplayNameTextBox" Height="25" Margin="0,0,0,15"
-                         ToolTip="Friendly name to display in the server list"/>
+        <StackPanel Grid.Row="1">
+            <!-- Server Name/Address -->
+            <TextBlock Text="Server Name/Address:" FontWeight="Bold" Margin="0,0,0,4"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <TextBox x:Name="ServerNameTextBox" Margin="0,0,0,12"
+                     ToolTip="e.g., localhost, server.domain.com, 192.168.1.100, server\instance"/>
 
-                <!-- Server Name/Address -->
-                <TextBlock Text="Server Name/Address:" FontWeight="Bold" Margin="0,0,0,5"
-                           Foreground="{DynamicResource ForegroundBrush}"/>
-                <TextBox x:Name="ServerNameTextBox" Height="25" Margin="0,0,0,15"
-                         ToolTip="e.g., localhost, server.domain.com, 192.168.1.100, server\instance"/>
+            <!-- Display Name -->
+            <TextBlock Text="Display Name (optional):" FontWeight="Bold" Margin="0,0,0,4"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <TextBox x:Name="DisplayNameTextBox" Margin="0,0,0,12"
+                     ToolTip="Friendly name to display in the server list"/>
+
+            <!-- Authentication Type -->
+            <TextBlock Text="Authentication:" FontWeight="Bold" Margin="0,0,0,4"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <StackPanel Margin="0,0,0,12">
+                <RadioButton x:Name="WindowsAuthRadio" Content="Windows Authentication"
+                             GroupName="Auth" IsChecked="True"
+                             Foreground="{DynamicResource ForegroundBrush}"
+                             Checked="AuthType_Changed" Margin="0,0,0,4"/>
+                <RadioButton x:Name="SqlAuthRadio" Content="SQL Server Authentication"
+                             GroupName="Auth"
+                             Foreground="{DynamicResource ForegroundBrush}"
+                             Checked="AuthType_Changed" Margin="0,0,0,4"/>
+                <RadioButton x:Name="EntraMfaAuthRadio" Content="Microsoft Entra MFA"
+                             GroupName="Auth"
+                             Foreground="{DynamicResource ForegroundBrush}"
+                             Checked="AuthType_Changed"
+                             ToolTip="Interactive authentication with MFA for Azure SQL Database."/>
+            </StackPanel>
 
-                <!-- Authentication Type -->
-                <TextBlock Text="Authentication:" FontWeight="Bold" Margin="0,0,0,5"
+            <!-- SQL Authentication Fields -->
+            <StackPanel x:Name="SqlAuthPanel" Visibility="Collapsed" Margin="0,0,0,12">
+                <TextBlock Text="Username:" Margin="0,0,0,4"
                            Foreground="{DynamicResource ForegroundBrush}"/>
-                <StackPanel Margin="0,0,0,15">
-                    <RadioButton x:Name="WindowsAuthRadio" Content="Windows Authentication"
-                                 GroupName="Auth" IsChecked="True"
-                                 Foreground="{DynamicResource ForegroundBrush}"
-                                 Checked="AuthType_Changed" Margin="0,0,0,4"/>
-                    <RadioButton x:Name="SqlAuthRadio" Content="SQL Server Authentication"
-                                 GroupName="Auth"
-                                 Foreground="{DynamicResource ForegroundBrush}"
-                                 Checked="AuthType_Changed" Margin="0,0,0,4"/>
-                    <RadioButton x:Name="EntraMfaAuthRadio" Content="Microsoft Entra MFA"
-                                 GroupName="Auth"
-                                 Foreground="{DynamicResource ForegroundBrush}"
-                                 Checked="AuthType_Changed"
-                                 ToolTip="Interactive authentication with MFA for Azure SQL Database."/>
-                </StackPanel>
+                <TextBox x:Name="UsernameTextBox" Margin="0,0,0,8"/>
 
-                <!-- SQL Authentication Fields -->
-                <StackPanel x:Name="SqlAuthPanel" Visibility="Collapsed" Margin="0,0,0,15">
-                    <TextBlock Text="Username:" FontWeight="Bold" Margin="0,0,0,5"
-                               Foreground="{DynamicResource ForegroundBrush}"/>
-                    <TextBox x:Name="UsernameTextBox" Height="25" Margin="0,0,0,15"/>
+                <TextBlock Text="Password:" Margin="0,0,0,4"
+                           Foreground="{DynamicResource ForegroundBrush}"/>
+                <PasswordBox x:Name="PasswordBox"/>
+            </StackPanel>
 
-                    <TextBlock Text="Password:" FontWeight="Bold" Margin="0,0,0,5"
-                               Foreground="{DynamicResource ForegroundBrush}"/>
-                    <PasswordBox x:Name="PasswordBox" Height="25" Margin="0,0,0,0"/>
-                </StackPanel>
+            <!-- Microsoft Entra MFA Fields -->
+            <StackPanel x:Name="EntraMfaPanel" Visibility="Collapsed" Margin="0,0,0,12">
+                <TextBlock Text="Username (optional):" Margin="0,0,0,4"
+                           Foreground="{DynamicResource ForegroundBrush}"/>
+                <TextBox x:Name="EntraMfaUsernameBox"
+                         ToolTip="Optional: Pre-populate the authentication dialog with this email address"/>
+            </StackPanel>
 
-                <!-- Microsoft Entra MFA Fields -->
-                <StackPanel x:Name="EntraMfaPanel" Visibility="Collapsed" Margin="0,0,0,15">
-                    <TextBlock Text="Username (optional):" FontWeight="Bold" Margin="0,0,0,5"
+            <!-- Connection Options -->
+            <TextBlock Text="Connection Options:" FontWeight="Bold" Margin="0,0,0,4"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <StackPanel Margin="0,0,0,12">
+                <!-- Encryption Mode -->
+                <StackPanel Orientation="Horizontal" Margin="0,0,0,6">
+                    <TextBlock Text="Encryption:" Width="80" VerticalAlignment="Center"
                                Foreground="{DynamicResource ForegroundBrush}"/>
-                    <TextBox x:Name="EntraMfaUsernameBox" Height="25" Margin="0,0,0,0"
-                             ToolTip="Optional: Pre-populate the authentication dialog with this email address"/>
+                    <ComboBox x:Name="EncryptModeComboBox" Width="150"
+                              SelectedIndex="1"
+                              ToolTip="Optional: Encrypt if server supports it&#x0a;Mandatory: Always encrypt (fails if not supported)&#x0a;Strict: Full validation required">
+                        <ComboBoxItem Content="Optional"/>
+                        <ComboBoxItem Content="Mandatory"/>
+                        <ComboBoxItem Content="Strict"/>
+                    </ComboBox>
                 </StackPanel>
 
-                <!-- Description -->
-                <TextBlock Text="Description (optional):" FontWeight="Bold" Margin="0,0,0,5"
-                           Foreground="{DynamicResource ForegroundBrush}"/>
-                <TextBox x:Name="DescriptionTextBox" Height="60" TextWrapping="Wrap"
-                         AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Margin="0,0,0,15"/>
+                <!-- Trust Server Certificate -->
+                <CheckBox x:Name="TrustServerCertificateCheckBox"
+                          Content="Trust server certificate (skip certificate validation)"
+                          IsChecked="False"
+                          Foreground="{DynamicResource ForegroundBrush}"
+                          ToolTip="When checked, accepts any server certificate without validation.&#x0a;Uncheck for stricter security (requires valid certificate)."
+                          Margin="0,0,0,6"/>
 
                 <!-- Is Favorite -->
-                <CheckBox x:Name="IsFavoriteCheckBox" Content="Mark as favorite (appears at top of list)" Margin="0,0,0,15"
-                          Foreground="{DynamicResource ForegroundBrush}"/>
+                <CheckBox x:Name="IsFavoriteCheckBox" Content="Mark as favorite (appears at top of list)"
+                          Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,6"/>
 
-                <!-- Connection Security Settings -->
-                <TextBlock Text="Connection Security:" FontWeight="Bold" Margin="0,0,0,5"
+                <!-- Description -->
+                <TextBlock Text="Description (optional):" Margin="0,4,0,4"
                            Foreground="{DynamicResource ForegroundBrush}"/>
-                <Border BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="10" Margin="0,0,0,15"
-                        Background="{DynamicResource BackgroundLightBrush}">
-                    <StackPanel>
-                        <!-- Encryption Mode -->
-                        <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
-                            <TextBlock Text="Encryption:" Width="140" VerticalAlignment="Center"
-                                       Foreground="{DynamicResource ForegroundBrush}"/>
-                            <ComboBox x:Name="EncryptModeComboBox" Width="150"
-                                      SelectedIndex="1"
-                                      ToolTip="Optional: Encrypt if server supports it&#x0a;Mandatory: Always encrypt (fails if not supported)&#x0a;Strict: Full validation required">
-                                <ComboBoxItem Content="Optional"/>
-                                <ComboBoxItem Content="Mandatory"/>
-                                <ComboBoxItem Content="Strict"/>
-                            </ComboBox>
-                        </StackPanel>
-
-                        <!-- Trust Server Certificate -->
-                        <CheckBox x:Name="TrustServerCertificateCheckBox"
-                                  Content="Trust Server Certificate (skip certificate validation)"
-                                  IsChecked="False"
-                                  Foreground="{DynamicResource ForegroundBrush}"
-                                  ToolTip="When checked, accepts any server certificate without validation.&#x0a;Uncheck for stricter security (requires valid certificate)."/>
-                    </StackPanel>
-                </Border>
+                <TextBox x:Name="DescriptionTextBox" Height="60" TextWrapping="Wrap"
+                         AcceptsReturn="True" VerticalScrollBarVisibility="Auto"/>
             </StackPanel>
-        </ScrollViewer>
+        </StackPanel>
 
         <!-- Status -->
         <TextBlock x:Name="StatusText" Grid.Row="2"
@@ -133,8 +115,8 @@
 
         <!-- Buttons -->
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,15,0,0">
-            <Button x:Name="TestConnectionButton" Content="Test Connection" Width="120" Height="30" Margin="0,0,10,0" Click="TestConnection_Click"/>
-            <Button x:Name="SaveButton" Content="Save" Width="80" Height="30" Margin="0,0,10,0" Click="Save_Click" IsDefault="True"/>
+            <Button x:Name="TestConnectionButton" Content="Test Connection" Margin="0,0,8,0" Click="TestConnection_Click"/>
+            <Button x:Name="SaveButton" Content="Save" Width="80" Height="30" Margin="0,0,10,0" Click="Save_Click" IsDefault="True" Style="{StaticResource AccentButton}"/>
             <Button Content="Cancel" Width="80" Height="30" Click="Cancel_Click" IsCancel="True"/>
         </StackPanel>
     </Grid>
diff --git a/Dashboard/App.xaml b/Dashboard/App.xaml
index 7765ede..c8b1ea4 100644
--- a/Dashboard/App.xaml
+++ b/Dashboard/App.xaml
@@ -1,12 +1,14 @@
 <Application x:Class="PerformanceMonitorDashboard.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:helpers="clr-namespace:PerformanceMonitorDashboard.Helpers"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Themes/DarkTheme.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+            <helpers:ServerTimeConverter x:Key="ServerTimeConverter"/>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/Dashboard/App.xaml.cs b/Dashboard/App.xaml.cs
index 54af804..f920d82 100644
--- a/Dashboard/App.xaml.cs
+++ b/Dashboard/App.xaml.cs
@@ -24,6 +24,8 @@ public partial class App : Application
 
         protected override void OnStartup(StartupEventArgs e)
         {
+            NativeMethods.SetAppUserModelId("DarlingData.PerformanceMonitor.Dashboard");
+
             // Check for existing instance
             _singleInstanceMutex = new Mutex(true, MutexName, out _ownsMutex);
 
@@ -37,6 +39,10 @@ protected override void OnStartup(StartupEventArgs e)
 
             base.OnStartup(e);
 
+            // Apply saved color theme before the main window is shown
+            var prefs = new Services.UserPreferencesService().GetPreferences();
+            ThemeManager.Apply(prefs.ColorTheme ?? "Dark");
+
             // Register global exception handlers
             AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
             DispatcherUnhandledException += OnDispatcherUnhandledException;
diff --git a/Dashboard/CollectionLogWindow.xaml b/Dashboard/CollectionLogWindow.xaml
index 71c77f4..e9f1a1b 100644
--- a/Dashboard/CollectionLogWindow.xaml
+++ b/Dashboard/CollectionLogWindow.xaml
@@ -48,7 +48,7 @@
                   Margin="10"
                   ContextMenu="{StaticResource DataGridContextMenu}">
             <DataGrid.Columns>
-                <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                <DataGridTextColumn Binding="{Binding CollectionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button x:Name="CollectionTimeFilterButton" Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="LogFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/Controls/AlertsHistoryContent.xaml b/Dashboard/Controls/AlertsHistoryContent.xaml
index d0c258e..b97fbc3 100644
--- a/Dashboard/Controls/AlertsHistoryContent.xaml
+++ b/Dashboard/Controls/AlertsHistoryContent.xaml
@@ -7,10 +7,6 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-
             <!-- Context Menu for DataGrid Copy/Export -->
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click">
@@ -74,7 +70,7 @@
                 <ComboBoxItem Content="All Servers" IsSelected="True"/>
             </ComboBox>
             <Button Content="Refresh" Click="RefreshButton_Click" Margin="12,0,0,0" Padding="10,4" MinWidth="70"
-                    Style="{StaticResource SuccessButton}"/>
+                    Style="{DynamicResource SuccessButton}"/>
             <Button x:Name="DismissSelectedButton" Content="Dismiss Selected" Click="DismissSelected_Click"
                     Margin="8,0,0,0" Padding="10,4" MinWidth="90" IsEnabled="False"/>
             <Button Content="Dismiss All" Click="DismissAll_Click"
diff --git a/Dashboard/Controls/ConfigChangesContent.xaml b/Dashboard/Controls/ConfigChangesContent.xaml
index a0aea1a..a8e1f2d 100644
--- a/Dashboard/Controls/ConfigChangesContent.xaml
+++ b/Dashboard/Controls/ConfigChangesContent.xaml
@@ -24,7 +24,7 @@
                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
                       ContextMenu="{StaticResource DataGridContextMenu}">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding ChangeTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
@@ -141,7 +141,7 @@
                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
                       ContextMenu="{StaticResource DataGridContextMenu}">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding ChangeTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
@@ -211,7 +211,7 @@
                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
                       ContextMenu="{StaticResource DataGridContextMenu}">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding ChangeTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/Controls/CriticalIssuesContent.xaml b/Dashboard/Controls/CriticalIssuesContent.xaml
index 4fee847..78a35b6 100644
--- a/Dashboard/Controls/CriticalIssuesContent.xaml
+++ b/Dashboard/Controls/CriticalIssuesContent.xaml
@@ -8,10 +8,6 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-
             <!-- Context Menu for DataGrid Copy/Export -->
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click">
@@ -50,7 +46,7 @@
                     </StackPanel>
                 </DataGridTextColumn.Header>
             </DataGridTextColumn>
-            <DataGridTextColumn Binding="{Binding LogDate, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="160">
+            <DataGridTextColumn Binding="{Binding LogDate, Converter={StaticResource ServerTimeConverter}}" Width="160">
                 <DataGridTextColumn.Header>
                     <StackPanel Orientation="Horizontal">
                         <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LogDate" Click="CriticalIssuesFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/Controls/CurrentConfigContent.xaml b/Dashboard/Controls/CurrentConfigContent.xaml
index d3a5bfa..ab36dbd 100644
--- a/Dashboard/Controls/CurrentConfigContent.xaml
+++ b/Dashboard/Controls/CurrentConfigContent.xaml
@@ -80,7 +80,7 @@
                             </StackPanel>
                         </DataGridCheckBoxColumn.Header>
                     </DataGridCheckBoxColumn>
-                    <DataGridTextColumn Binding="{Binding LastChanged, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding LastChanged, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastChanged" Click="ServerConfigFilter_Click" Margin="0,0,4,0"/>
@@ -142,7 +142,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding LastChanged, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding LastChanged, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastChanged" Click="DatabaseConfigFilter_Click" Margin="0,0,4,0"/>
@@ -196,7 +196,7 @@
                             </StackPanel>
                         </DataGridCheckBoxColumn.Header>
                     </DataGridCheckBoxColumn>
-                    <DataGridTextColumn Binding="{Binding LastChanged, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding LastChanged, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastChanged" Click="TraceFlagsFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/Controls/DailySummaryContent.xaml b/Dashboard/Controls/DailySummaryContent.xaml
index 9219f4f..996ac31 100644
--- a/Dashboard/Controls/DailySummaryContent.xaml
+++ b/Dashboard/Controls/DailySummaryContent.xaml
@@ -8,10 +8,6 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-
             <!-- Context Menu for DataGrid Copy/Export -->
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click">
@@ -43,9 +39,9 @@
         <!-- Date Selection Controls -->
         <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10,5" Background="{DynamicResource BackgroundLightBrush}" Height="40">
             <TextBlock Text="Summary Date:" VerticalAlignment="Center" Margin="5,0" FontWeight="Bold"/>
-            <Button x:Name="DailySummaryTodayButton" Content="Today" Click="DailySummaryToday_Click" Margin="5,0" Padding="8,4" MinWidth="60" Style="{StaticResource AccentButton}"/>
+            <Button x:Name="DailySummaryTodayButton" Content="Today" Click="DailySummaryToday_Click" Margin="5,0" Padding="8,4" MinWidth="60" Style="{DynamicResource AccentButton}"/>
             <DatePicker x:Name="DailySummaryDatePicker" Width="120" Margin="5,0" SelectedDateChanged="DailySummaryDate_Changed" CalendarOpened="DatePicker_CalendarOpened"/>
-            <Button Content="Refresh" Click="DailySummary_Refresh_Click" Margin="10,0,2,0" Padding="10,4" MinWidth="70" Style="{StaticResource SuccessButton}"/>
+            <Button Content="Refresh" Click="DailySummary_Refresh_Click" Margin="10,0,2,0" Padding="10,4" MinWidth="70" Style="{DynamicResource SuccessButton}"/>
             <TextBlock x:Name="DailySummaryIndicator"
                        Text="Showing: Today"
                        Margin="10,0"
diff --git a/Dashboard/Controls/DailySummaryContent.xaml.cs b/Dashboard/Controls/DailySummaryContent.xaml.cs
index 96d1f88..ea8948d 100644
--- a/Dashboard/Controls/DailySummaryContent.xaml.cs
+++ b/Dashboard/Controls/DailySummaryContent.xaml.cs
@@ -145,7 +145,7 @@ private void DatePicker_CalendarOpened(object sender, RoutedEventArgs e)
                     var popup = datePicker.Template.FindName("PART_Popup", datePicker) as System.Windows.Controls.Primitives.Popup;
                     if (popup?.Child is System.Windows.Controls.Calendar calendar)
                     {
-                        TabHelpers.ApplyDarkThemeToCalendar(calendar);
+                        TabHelpers.ApplyThemeToCalendar(calendar);
                     }
                     else
                     {
@@ -153,7 +153,7 @@ private void DatePicker_CalendarOpened(object sender, RoutedEventArgs e)
                         var calendar2 = FindVisualChild<System.Windows.Controls.Calendar>(datePicker);
                         if (calendar2 != null)
                         {
-                            TabHelpers.ApplyDarkThemeToCalendar(calendar2);
+                            TabHelpers.ApplyThemeToCalendar(calendar2);
                         }
                     }
                 }), System.Windows.Threading.DispatcherPriority.Loaded);
diff --git a/Dashboard/Controls/DefaultTraceContent.xaml b/Dashboard/Controls/DefaultTraceContent.xaml
index eb68731..a0debc7 100644
--- a/Dashboard/Controls/DefaultTraceContent.xaml
+++ b/Dashboard/Controls/DefaultTraceContent.xaml
@@ -34,7 +34,7 @@
                       GridLinesVisibility="Horizontal" CanUserResizeColumns="True" ContextMenu="{DynamicResource DataGridContextMenu}"
                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding EventTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding EventTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="EventTime" Click="DefaultTraceFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/Controls/LandingPage.xaml b/Dashboard/Controls/LandingPage.xaml
index 7e99b04..1352450 100644
--- a/Dashboard/Controls/LandingPage.xaml
+++ b/Dashboard/Controls/LandingPage.xaml
@@ -6,14 +6,6 @@
              xmlns:local="clr-namespace:PerformanceMonitorDashboard.Controls"
              mc:Ignorable="d"
              d:DesignHeight="600" d:DesignWidth="1000">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
     <Grid Background="{DynamicResource BackgroundBrush}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
diff --git a/Dashboard/Controls/LandingPage.xaml.cs b/Dashboard/Controls/LandingPage.xaml.cs
index 3e35e23..b0816de 100644
--- a/Dashboard/Controls/LandingPage.xaml.cs
+++ b/Dashboard/Controls/LandingPage.xaml.cs
@@ -82,6 +82,9 @@ private void LoadServers()
                 _serverHealthStatuses.Add(new ServerHealthStatus(server));
             }
 
+            // Sort servers alphabetically by display name
+            _serverHealthStatuses.OrderBy(s => s.Server.DisplayName).ToList().ForEach(s => _serverHealthStatuses.Move(_serverHealthStatuses.IndexOf(s), _serverHealthStatuses.Count - 1));
+
             UpdateSubtitle();
             UpdateEmptyState();
         }
diff --git a/Dashboard/Controls/MemoryContent.xaml b/Dashboard/Controls/MemoryContent.xaml
index 4180826..2505583 100644
--- a/Dashboard/Controls/MemoryContent.xaml
+++ b/Dashboard/Controls/MemoryContent.xaml
@@ -9,10 +9,6 @@
              d:DesignHeight="600" d:DesignWidth="1200">
     <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-
             <!-- Context Menu for DataGrid Copy/Export -->
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click">
diff --git a/Dashboard/Controls/MemoryContent.xaml.cs b/Dashboard/Controls/MemoryContent.xaml.cs
index f78b0ab..df94f67 100644
--- a/Dashboard/Controls/MemoryContent.xaml.cs
+++ b/Dashboard/Controls/MemoryContent.xaml.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2026 Erik Darling, Darling Data LLC
  *
  * This file is part of the SQL Server Performance Monitor.
@@ -81,6 +81,16 @@ public MemoryContent()
             InitializeComponent();
             SetupChartContextMenus();
             Loaded += OnLoaded;
+            Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
+            Unloaded += (_, _) => Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
+
+            // Apply dark theme immediately so charts don't flash white before data loads
+            TabHelpers.ApplyThemeToChart(MemoryStatsOverviewChart);
+            TabHelpers.ApplyThemeToChart(MemoryGrantSizingChart);
+            TabHelpers.ApplyThemeToChart(MemoryGrantActivityChart);
+            TabHelpers.ApplyThemeToChart(MemoryClerksChart);
+            TabHelpers.ApplyThemeToChart(PlanCacheChart);
+            TabHelpers.ApplyThemeToChart(MemoryPressureEventsChart);
 
             _memoryStatsOverviewHover = new Helpers.ChartHoverHelper(MemoryStatsOverviewChart, "MB");
             _memoryGrantSizingHover = new Helpers.ChartHoverHelper(MemoryGrantSizingChart, "MB");
@@ -95,6 +105,19 @@ private void OnLoaded(object sender, RoutedEventArgs e)
             // No grids to configure - all tabs are chart-only now
         }
 
+        private void OnThemeChanged(string _)
+        {
+            foreach (var field in GetType().GetFields(
+                System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance))
+            {
+                if (field.GetValue(this) is ScottPlot.WPF.WpfPlot chart)
+                {
+                    Helpers.TabHelpers.ApplyThemeToChart(chart);
+                    chart.Refresh();
+                }
+            }
+        }
+
         private void SetupChartContextMenus()
         {
             // Memory Stats Overview chart
@@ -204,7 +227,7 @@ private void LoadMemoryStatsOverviewChart(List<MemoryStatsItem> memoryData, int
             }
             MemoryStatsOverviewChart.Plot.Clear();
             _memoryStatsOverviewHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(MemoryStatsOverviewChart);
+            TabHelpers.ApplyThemeToChart(MemoryStatsOverviewChart);
 
             var dataList = memoryData?.OrderBy(d => d.CollectionTime).ToList() ?? new List<MemoryStatsItem>();
             // Total Memory series with gap filling
@@ -479,7 +502,7 @@ private void LoadMemoryGrantSizingChart(List<PoolGrantPoint> aggregated, int hou
             }
             MemoryGrantSizingChart.Plot.Clear();
             _memoryGrantSizingHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(MemoryGrantSizingChart);
+            TabHelpers.ApplyThemeToChart(MemoryGrantSizingChart);
 
             var poolIds = aggregated.Select(d => d.PoolId).Distinct().OrderBy(id => id).ToList();
             int colorIndex = 0;
@@ -548,7 +571,7 @@ private void LoadMemoryGrantActivityChart(List<PoolGrantPoint> aggregated, int h
             }
             MemoryGrantActivityChart.Plot.Clear();
             _memoryGrantActivityHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(MemoryGrantActivityChart);
+            TabHelpers.ApplyThemeToChart(MemoryGrantActivityChart);
 
             var poolIds = aggregated.Select(d => d.PoolId).Distinct().OrderBy(id => id).ToList();
             int colorIndex = 0;
@@ -719,7 +742,7 @@ private async System.Threading.Tasks.Task UpdateMemoryClerksChartFromPickerAsync
                 }
                 MemoryClerksChart.Plot.Clear();
                 _memoryClerksHover?.Clear();
-                TabHelpers.ApplyDarkModeToChart(MemoryClerksChart);
+                TabHelpers.ApplyThemeToChart(MemoryClerksChart);
 
                 DateTime rangeEnd = _memoryClerksToDate ?? Helpers.ServerTimeHelper.ServerNow;
                 DateTime rangeStart = _memoryClerksFromDate ?? rangeEnd.AddHours(-_memoryClerksHoursBack);
@@ -856,7 +879,7 @@ private void LoadPlanCacheChart(IEnumerable<PlanCacheStatsItem> data, int hoursB
             }
             PlanCacheChart.Plot.Clear();
             _planCacheHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(PlanCacheChart);
+            TabHelpers.ApplyThemeToChart(PlanCacheChart);
 
             var dataList = data?.ToList() ?? new List<PlanCacheStatsItem>();
             if (dataList.Count > 0)
@@ -997,7 +1020,7 @@ private void LoadMemoryPressureEventsChart(IEnumerable<MemoryPressureEventItem>
             }
             MemoryPressureEventsChart.Plot.Clear();
             _memoryPressureEventsHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(MemoryPressureEventsChart);
+            TabHelpers.ApplyThemeToChart(MemoryPressureEventsChart);
 
             // Only chart HIGH severity events
             var dataList = data?.Where(d => d.Severity.Equals("HIGH", StringComparison.OrdinalIgnoreCase))
diff --git a/Dashboard/Controls/PlanViewerControl.xaml b/Dashboard/Controls/PlanViewerControl.xaml
index c5e0608..d41669f 100644
--- a/Dashboard/Controls/PlanViewerControl.xaml
+++ b/Dashboard/Controls/PlanViewerControl.xaml
@@ -1,13 +1,15 @@
 <UserControl x:Class="PerformanceMonitorDashboard.Controls.PlanViewerControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Background="{DynamicResource BackgroundBrush}">
+             Background="{DynamicResource BackgroundBrush}"
+             Focusable="True"
+             PreviewMouseDown="PlanViewerControl_PreviewMouseDown"
+             PreviewKeyDown="PlanViewerControl_PreviewKeyDown">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
@@ -27,13 +29,10 @@
                     <Separator Margin="12,4"/>
                     <Button Content="Save .sqlplan" Click="SavePlan_Click" Height="28" Padding="8,0"
                             ToolTip="Save plan as .sqlplan file"/>
-                    <Separator Margin="12,4"/>
-                    <TextBlock x:Name="StatementLabel" Text="Statement:" VerticalAlignment="Center"
-                               Foreground="{DynamicResource ForegroundMutedBrush}" Margin="0,0,6,0"
-                               Visibility="Collapsed"/>
-                    <ComboBox x:Name="StatementSelector" MinWidth="200" Height="28"
-                              SelectionChanged="StatementSelector_Changed"
-                              Visibility="Collapsed"/>
+                    <Separator x:Name="StatementsButtonSeparator" Margin="12,4" Visibility="Collapsed"/>
+                    <Button x:Name="StatementsButton" Content="Statements" Click="ToggleStatements_Click"
+                            Height="28" Padding="8,0" Visibility="Collapsed"
+                            ToolTip="Show/hide statement list"/>
                 </StackPanel>
                 <TextBlock x:Name="CostText" DockPanel.Dock="Right" VerticalAlignment="Center"
                            HorizontalAlignment="Right"
@@ -41,44 +40,87 @@
             </DockPanel>
         </Border>
 
-        <!-- Missing Index Banner -->
-        <Border x:Name="MissingIndexBanner" Grid.Row="1" Padding="10,8"
-                Background="#3D2A0E" Visibility="Collapsed"
-                BorderBrush="#7A5A1E" BorderThickness="0,0,0,1">
-            <StackPanel>
-                <TextBlock Text="Missing Index Suggestions" FontWeight="SemiBold"
-                           Foreground="#FFB347" Margin="0,0,0,4"/>
-                <ItemsControl x:Name="MissingIndexList">
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel Margin="0,2">
-                                <TextBlock Foreground="#E4E6EB" FontSize="11" TextWrapping="Wrap">
-                                    <Run Text="{Binding Table, Mode=OneWay}" FontWeight="SemiBold"/>
-                                    <Run Text=" — Impact: "/>
-                                    <Run Text="{Binding Impact, StringFormat={}{0:F1}%, Mode=OneWay}" Foreground="#FFB347"/>
-                                </TextBlock>
-                                <TextBlock Text="{Binding CreateStatement, Mode=OneWay}" FontFamily="Consolas" FontSize="10"
-                                           Foreground="{DynamicResource ForegroundMutedBrush}" TextWrapping="Wrap"
-                                           Margin="12,2,0,0"/>
+        <!-- Insights Panel: Runtime Summary + Missing Indexes + Wait Stats (collapsible) -->
+        <Border x:Name="InsightsPanel" Grid.Row="1" Visibility="Collapsed"
+                Background="{DynamicResource BackgroundDarkBrush}"
+                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+            <Expander x:Name="InsightsExpander" IsExpanded="True"
+                      Foreground="{DynamicResource ForegroundBrush}"
+                      Background="Transparent"
+                      BorderThickness="0"
+                      Padding="0">
+                <Expander.Header>
+                    <TextBlock x:Name="InsightsHeader" Text="  Plan Insights"
+                               FontWeight="SemiBold"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                </Expander.Header>
+                <Grid MaxHeight="220">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" MinWidth="180"/>
+                        <ColumnDefinition Width="Auto" MinWidth="200"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <!-- Runtime Summary (left) -->
+                    <Border Grid.Column="0" Padding="10,4,10,8"
+                            Background="{DynamicResource BackgroundDarkBrush}"
+                            BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,1,0">
+                        <StackPanel>
+                            <TextBlock Text="Runtime Summary"
+                                       FontSize="13"
+                                       FontWeight="SemiBold"
+                                       Foreground="{DynamicResource ForegroundBrush}"
+                                       Margin="0,0,0,4"/>
+                            <StackPanel x:Name="RuntimeSummaryContent"/>
+                        </StackPanel>
+                    </Border>
+
+                    <!-- Missing Indexes (center) -->
+                    <Border Grid.Column="1" Padding="10,4,10,8"
+                            Background="#3D2A0E"
+                            BorderBrush="#7A5A1E" BorderThickness="0,0,1,0">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto"
+                                      HorizontalScrollBarVisibility="Disabled">
+                            <StackPanel>
+                                <TextBlock x:Name="MissingIndexHeader"
+                                           Text="Missing Index Suggestions"
+                                           FontSize="13"
+                                           FontWeight="SemiBold" Foreground="#FFB347"
+                                           Margin="0,0,0,6"/>
+                                <StackPanel x:Name="MissingIndexContent"/>
+                                <TextBlock x:Name="MissingIndexEmpty"
+                                           Text="No missing index suggestions"
+                                           FontSize="12" Visibility="Collapsed"
+                                           Foreground="{DynamicResource ForegroundBrush}"/>
                             </StackPanel>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
-            </StackPanel>
-        </Border>
+                        </ScrollViewer>
+                    </Border>
 
-        <!-- Warnings Banner -->
-        <Border x:Name="WarningsBanner" Grid.Row="2" Padding="10,6"
-                Background="#3D1A1A" Visibility="Collapsed"
-                BorderBrush="#7A2A2A" BorderThickness="0,0,0,1">
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="&#x26A0;" Foreground="#E57373" FontSize="14" VerticalAlignment="Center" Margin="0,0,8,0"/>
-                <TextBlock x:Name="WarningsSummaryText" Foreground="#E57373" VerticalAlignment="Center" FontSize="12"/>
-            </StackPanel>
+                    <!-- Wait Stats (right, fills remaining space) -->
+                    <Border Grid.Column="2" Padding="10,4,10,8"
+                            Background="#1A2A3D">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto"
+                                      HorizontalScrollBarVisibility="Disabled">
+                            <StackPanel>
+                                <TextBlock x:Name="WaitStatsHeader"
+                                           Text="Wait Stats"
+                                           FontSize="13"
+                                           FontWeight="SemiBold" Foreground="#4FA3FF"
+                                           Margin="0,0,0,6"/>
+                                <StackPanel x:Name="WaitStatsContent"/>
+                                <TextBlock x:Name="WaitStatsEmpty"
+                                           Text="No wait stats (estimated plan)"
+                                           FontSize="12" Visibility="Collapsed"
+                                           Foreground="{DynamicResource ForegroundBrush}"/>
+                            </StackPanel>
+                        </ScrollViewer>
+                    </Border>
+                </Grid>
+            </Expander>
         </Border>
 
         <!-- Query Text (collapsible) -->
-        <Expander Grid.Row="3" x:Name="QueryTextExpander" Header="  Query Text"
+        <Expander Grid.Row="2" x:Name="QueryTextExpander" Header="  Query Text"
                   IsExpanded="False" Visibility="Collapsed"
                   Foreground="{DynamicResource ForegroundBrush}"
                   Background="{DynamicResource BackgroundDarkBrush}"
@@ -92,21 +134,84 @@
                      Padding="8,4"/>
         </Expander>
 
-        <!-- Plan Canvas + Properties Panel -->
-        <Grid Grid.Row="4">
+        <!-- Statements Panel + Plan Canvas + Properties Panel -->
+        <Grid Grid.Row="3">
             <Grid.ColumnDefinitions>
+                <!-- Col 0: Statements Panel (hidden by default) -->
+                <ColumnDefinition x:Name="StatementsColumn" Width="0"/>
+                <!-- Col 1: Statements Splitter (hidden by default) -->
+                <ColumnDefinition x:Name="StatementsSplitterColumn" Width="0"/>
+                <!-- Col 2: Plan Canvas -->
                 <ColumnDefinition Width="*"/>
+                <!-- Col 3: Properties Splitter (hidden by default) -->
                 <ColumnDefinition Width="Auto"/>
+                <!-- Col 4: Properties Panel (hidden by default) -->
                 <ColumnDefinition x:Name="PropertiesColumn" Width="0"/>
             </Grid.ColumnDefinitions>
 
+            <!-- Statements Panel -->
+            <Border x:Name="StatementsPanel" Grid.Column="0"
+                    Background="{DynamicResource BackgroundDarkBrush}"
+                    BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,1,0"
+                    Visibility="Collapsed">
+                <DockPanel>
+                    <!-- Header -->
+                    <Border DockPanel.Dock="Top" Padding="10,8"
+                            Background="{DynamicResource BackgroundBrush}"
+                            BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+                        <DockPanel>
+                            <Button DockPanel.Dock="Right" Content="&#x2715;" Click="CloseStatements_Click"
+                                    Width="24" Height="24" Padding="0" FontSize="12"
+                                    VerticalAlignment="Center" ToolTip="Close Statements"
+                                    Background="Transparent" BorderThickness="0"
+                                    Foreground="{DynamicResource ForegroundMutedBrush}"/>
+                            <TextBlock x:Name="StatementsHeader" Text="Statements"
+                                       FontWeight="SemiBold" FontSize="13"
+                                       Foreground="{DynamicResource ForegroundBrush}"
+                                       VerticalAlignment="Center"/>
+                        </DockPanel>
+                    </Border>
+
+                    <!-- Statement Grid -->
+                    <DataGrid x:Name="StatementsGrid"
+                              AutoGenerateColumns="False"
+                              CanUserSortColumns="True"
+                              CanUserReorderColumns="False"
+                              CanUserResizeColumns="True"
+                              IsReadOnly="True"
+                              SelectionMode="Single"
+                              GridLinesVisibility="Horizontal"
+                              HeadersVisibility="Column"
+                              SelectionChanged="StatementsGrid_SelectionChanged"
+                              FontSize="11"
+                              Background="{DynamicResource BackgroundDarkBrush}"
+                              BorderThickness="0">
+                        <DataGrid.ContextMenu>
+                            <ContextMenu>
+                                <MenuItem Header="Copy Query Text" Click="CopyStatementText_Click"/>
+                            </ContextMenu>
+                        </DataGrid.ContextMenu>
+                    </DataGrid>
+                </DockPanel>
+            </Border>
+
+            <!-- Statements Splitter -->
+            <GridSplitter x:Name="StatementsSplitter" Grid.Column="1" Width="5"
+                          HorizontalAlignment="Center" VerticalAlignment="Stretch"
+                          Background="{DynamicResource BorderBrush}"
+                          Visibility="Collapsed"/>
+
             <!-- Plan Canvas -->
-            <ScrollViewer Grid.Column="0" x:Name="PlanScrollViewer"
+            <ScrollViewer Grid.Column="2" x:Name="PlanScrollViewer"
                           HorizontalScrollBarVisibility="Auto"
                           VerticalScrollBarVisibility="Auto"
                           Background="{DynamicResource BackgroundBrush}"
-                          PreviewMouseWheel="PlanScrollViewer_PreviewMouseWheel">
-                <Canvas x:Name="PlanCanvas" ClipToBounds="False">
+                          PreviewMouseWheel="PlanScrollViewer_PreviewMouseWheel"
+                          PreviewMouseLeftButtonDown="PlanScrollViewer_PreviewMouseLeftButtonDown"
+                          PreviewMouseMove="PlanScrollViewer_PreviewMouseMove"
+                          PreviewMouseLeftButtonUp="PlanScrollViewer_PreviewMouseLeftButtonUp">
+                <Canvas x:Name="PlanCanvas" ClipToBounds="False"
+                        HorizontalAlignment="Left" VerticalAlignment="Top">
                     <Canvas.LayoutTransform>
                         <ScaleTransform x:Name="ZoomTransform" ScaleX="1" ScaleY="1"/>
                     </Canvas.LayoutTransform>
@@ -114,7 +219,7 @@
             </ScrollViewer>
 
             <!-- Empty State -->
-            <StackPanel x:Name="EmptyState" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center">
+            <StackPanel x:Name="EmptyState" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center">
                 <TextBlock Text="No Plan Loaded" FontSize="20" FontWeight="Light"
                            Foreground="{DynamicResource ForegroundMutedBrush}" HorizontalAlignment="Center"/>
                 <TextBlock Text="Right-click a query row and choose 'View Plan' to display an execution plan here"
@@ -122,14 +227,14 @@
                            HorizontalAlignment="Center" Margin="0,8,0,0"/>
             </StackPanel>
 
-            <!-- GridSplitter -->
-            <GridSplitter x:Name="PropertiesSplitter" Grid.Column="1" Width="5"
+            <!-- Properties Splitter -->
+            <GridSplitter x:Name="PropertiesSplitter" Grid.Column="3" Width="5"
                           HorizontalAlignment="Center" VerticalAlignment="Stretch"
                           Background="{DynamicResource BorderBrush}"
                           Visibility="Collapsed"/>
 
             <!-- Properties Panel -->
-            <Border x:Name="PropertiesPanel" Grid.Column="2"
+            <Border x:Name="PropertiesPanel" Grid.Column="4"
                     Background="{DynamicResource BackgroundDarkBrush}"
                     BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1,0,0,0"
                     Visibility="Collapsed">
diff --git a/Dashboard/Controls/PlanViewerControl.xaml.cs b/Dashboard/Controls/PlanViewerControl.xaml.cs
index 4e1f6e7..6ea34e7 100644
--- a/Dashboard/Controls/PlanViewerControl.xaml.cs
+++ b/Dashboard/Controls/PlanViewerControl.xaml.cs
@@ -37,14 +37,21 @@ public partial class PlanViewerControl : UserControl
     private static readonly SolidColorBrush TooltipBgBrush = new(Color.FromRgb(0x1A, 0x1D, 0x23));
     private static readonly SolidColorBrush TooltipBorderBrush = new(Color.FromRgb(0x3A, 0x3D, 0x45));
     private static readonly SolidColorBrush TooltipFgBrush = new(Color.FromRgb(0xE4, 0xE6, 0xEB));
-    private static readonly SolidColorBrush MutedBrush = new(Color.FromRgb(0x6B, 0x72, 0x80));
+    private static readonly SolidColorBrush MutedBrush = new(Color.FromRgb(0xE4, 0xE6, 0xEB));
     private static readonly SolidColorBrush EdgeBrush = new(Color.FromRgb(0x6B, 0x72, 0x80));
     private static readonly SolidColorBrush SectionHeaderBrush = new(Color.FromRgb(0x4F, 0xA3, 0xFF));
     private static readonly SolidColorBrush PropSeparatorBrush = new(Color.FromRgb(0x2A, 0x2D, 0x35));
+    private static readonly SolidColorBrush OrangeBrush = new(Color.FromRgb(0xFF, 0xB3, 0x47));
 
     // Current property section for collapsible groups
     private StackPanel? _currentPropertySection;
 
+    // Canvas panning
+    private bool _isPanning;
+    private Point _panStart;
+    private double _panStartOffsetX;
+    private double _panStartOffsetY;
+
     public PlanViewerControl()
     {
         InitializeComponent();
@@ -81,33 +88,18 @@ public void LoadPlan(string planXml, string label, string? queryText = null)
         EmptyState.Visibility = Visibility.Collapsed;
         PlanScrollViewer.Visibility = Visibility.Visible;
 
-        // Populate statement selector
+        // Populate statement grid for multi-statement plans
         if (allStatements.Count > 1)
         {
-            StatementSelector.Items.Clear();
-            for (int i = 0; i < allStatements.Count; i++)
-            {
-                var s = allStatements[i];
-                var text = s.StatementText.Length > 80
-                    ? s.StatementText[..80] + "..."
-                    : s.StatementText;
-                if (string.IsNullOrWhiteSpace(text))
-                    text = $"Statement {i + 1}";
-                StatementSelector.Items.Add(new ComboBoxItem
-                {
-                    Content = $"[{s.StatementSubTreeCost:F4}] {text}",
-                    Tag = i
-                });
-            }
-            StatementSelector.SelectedIndex = 0;
-            StatementLabel.Visibility = Visibility.Visible;
-            StatementSelector.Visibility = Visibility.Visible;
+            PopulateStatementsGrid(allStatements);
+            ShowStatementsPanel();
             CostText.Visibility = Visibility.Visible;
+            // Auto-select first statement to render it
+            if (StatementsGrid.Items.Count > 0)
+                StatementsGrid.SelectedIndex = 0;
         }
         else
         {
-            StatementLabel.Visibility = Visibility.Collapsed;
-            StatementSelector.Visibility = Visibility.Collapsed;
             CostText.Visibility = Visibility.Collapsed;
             RenderStatement(allStatements[0]);
         }
@@ -121,10 +113,8 @@ public void Clear()
         _selectedNodeBorder = null;
         EmptyState.Visibility = Visibility.Visible;
         PlanScrollViewer.Visibility = Visibility.Collapsed;
-        MissingIndexBanner.Visibility = Visibility.Collapsed;
-        WarningsBanner.Visibility = Visibility.Collapsed;
-        StatementLabel.Visibility = Visibility.Collapsed;
-        StatementSelector.Visibility = Visibility.Collapsed;
+        InsightsPanel.Visibility = Visibility.Collapsed;
+        CloseStatementsPanel();
         CostText.Text = "";
         CostText.Visibility = Visibility.Collapsed;
         ClosePropertiesPanel();
@@ -135,6 +125,7 @@ private void RenderStatement(PlanStatement statement)
         _currentStatement = statement;
         PlanCanvas.Children.Clear();
         _selectedNodeBorder = null;
+        PlanScrollViewer.ScrollToHome();
 
         if (statement.RootNode == null) return;
 
@@ -148,11 +139,15 @@ private void RenderStatement(PlanStatement statement)
         RenderEdges(statement.RootNode);
 
         // Render nodes
-        RenderNodes(statement.RootNode);
+        var allWarnings = new List<PlanWarning>();
+        CollectWarnings(statement.RootNode, allWarnings);
+        RenderNodes(statement.RootNode, allWarnings.Count);
 
         // Update banners
         ShowMissingIndexes(statement.MissingIndexes);
-        ShowWarnings(statement.RootNode);
+        ShowWaitStats(statement.WaitStats, statement.QueryTimeStats != null);
+        ShowRuntimeSummary(statement);
+        UpdateInsightsHeader();
 
         // Update cost text
         CostText.Text = $"Statement Cost: {statement.StatementSubTreeCost:F4}";
@@ -160,9 +155,9 @@ private void RenderStatement(PlanStatement statement)
 
     #region Node Rendering
 
-    private void RenderNodes(PlanNode node)
+    private void RenderNodes(PlanNode node, int totalWarningCount = -1)
     {
-        var visual = CreateNodeVisual(node);
+        var visual = CreateNodeVisual(node, totalWarningCount);
         Canvas.SetLeft(visual, node.X);
         Canvas.SetTop(visual, node.Y);
         PlanCanvas.Children.Add(visual);
@@ -171,7 +166,7 @@ private void RenderNodes(PlanNode node)
             RenderNodes(child);
     }
 
-    private Border CreateNodeVisual(PlanNode node)
+    private Border CreateNodeVisual(PlanNode node, int totalWarningCount = -1)
     {
         var isExpensive = node.IsExpensive;
 
@@ -365,6 +360,34 @@ private Border CreateNodeVisual(PlanNode node)
             });
         }
 
+        // Total warning count badge on root node
+        if (totalWarningCount > 0)
+        {
+            var badgeRow = new StackPanel
+            {
+                Orientation = Orientation.Horizontal,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Margin = new Thickness(0, 2, 0, 0)
+            };
+            badgeRow.Children.Add(new TextBlock
+            {
+                Text = "\u26A0",
+                FontSize = 13,
+                Foreground = OrangeBrush,
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(0, 0, 4, 0)
+            });
+            badgeRow.Children.Add(new TextBlock
+            {
+                Text = $"{totalWarningCount} warning{(totalWarningCount == 1 ? "" : "s")}",
+                FontSize = 12,
+                FontWeight = FontWeights.SemiBold,
+                Foreground = OrangeBrush,
+                VerticalAlignment = VerticalAlignment.Center
+            });
+            stack.Children.Add(badgeRow);
+        }
+
         border.Child = stack;
         return border;
     }
@@ -551,16 +574,28 @@ private void ShowPropertiesPanel(PlanNode node)
             AddPropertyRow("Storage", node.StorageType);
         if (node.IsAdaptive)
             AddPropertyRow("Adaptive", "True");
+        if (node.SpillOccurredDetail)
+            AddPropertyRow("Spill Occurred", "True");
 
         // === Object Section ===
         if (!string.IsNullOrEmpty(node.FullObjectName))
         {
             AddPropertySection("Object");
             AddPropertyRow("Full Name", node.FullObjectName, isCode: true);
+            if (!string.IsNullOrEmpty(node.ServerName))
+                AddPropertyRow("Server", node.ServerName);
             if (!string.IsNullOrEmpty(node.DatabaseName))
                 AddPropertyRow("Database", node.DatabaseName);
+            if (!string.IsNullOrEmpty(node.ObjectAlias))
+                AddPropertyRow("Alias", node.ObjectAlias);
             if (!string.IsNullOrEmpty(node.IndexName))
                 AddPropertyRow("Index", node.IndexName);
+            if (!string.IsNullOrEmpty(node.IndexKind))
+                AddPropertyRow("Index Kind", node.IndexKind);
+            if (node.FilteredIndex)
+                AddPropertyRow("Filtered Index", "True");
+            if (node.TableReferenceId > 0)
+                AddPropertyRow("Table Ref Id", $"{node.TableReferenceId}");
         }
 
         // === Operator Details Section ===
@@ -580,7 +615,9 @@ private void ShowPropertiesPanel(PlanNode node)
             || node.NLOptimized || node.WithOrderedPrefetch || node.WithUnorderedPrefetch
             || node.WithTies || node.Remoting || node.LocalParallelism
             || node.SpoolStack || node.DMLRequestSort
-            || !string.IsNullOrEmpty(node.OffsetExpression) || node.TopRows > 0;
+            || !string.IsNullOrEmpty(node.OffsetExpression) || node.TopRows > 0
+            || !string.IsNullOrEmpty(node.ConstantScanValues)
+            || !string.IsNullOrEmpty(node.UdxUsedColumns);
 
         if (hasOperatorDetails)
         {
@@ -640,6 +677,117 @@ private void ShowPropertiesPanel(PlanNode node)
                 AddPropertyRow("Outer Join Cols", node.OuterSideJoinColumns, isCode: true);
             if (node.ManyToMany)
                 AddPropertyRow("Many to Many", "True");
+            if (!string.IsNullOrEmpty(node.ConstantScanValues))
+                AddPropertyRow("Values", node.ConstantScanValues, isCode: true);
+            if (!string.IsNullOrEmpty(node.UdxUsedColumns))
+                AddPropertyRow("UDX Columns", node.UdxUsedColumns, isCode: true);
+            if (node.RowCount)
+                AddPropertyRow("Row Count", "True");
+            if (node.ForceSeekColumnCount > 0)
+                AddPropertyRow("ForceSeek Columns", $"{node.ForceSeekColumnCount}");
+            if (!string.IsNullOrEmpty(node.PartitionId))
+                AddPropertyRow("Partition Id", node.PartitionId, isCode: true);
+            if (node.IsStarJoin)
+                AddPropertyRow("Star Join Root", "True");
+            if (!string.IsNullOrEmpty(node.StarJoinOperationType))
+                AddPropertyRow("Star Join Type", node.StarJoinOperationType);
+            if (!string.IsNullOrEmpty(node.ProbeColumn))
+                AddPropertyRow("Probe Column", node.ProbeColumn, isCode: true);
+            if (node.InRow)
+                AddPropertyRow("In-Row", "True");
+            if (node.ComputeSequence)
+                AddPropertyRow("Compute Sequence", "True");
+            if (node.RollupHighestLevel > 0)
+                AddPropertyRow("Rollup Highest Level", $"{node.RollupHighestLevel}");
+            if (node.RollupLevels.Count > 0)
+                AddPropertyRow("Rollup Levels", string.Join(", ", node.RollupLevels));
+            if (!string.IsNullOrEmpty(node.TvfParameters))
+                AddPropertyRow("TVF Parameters", node.TvfParameters, isCode: true);
+            if (!string.IsNullOrEmpty(node.OriginalActionColumn))
+                AddPropertyRow("Original Action Col", node.OriginalActionColumn, isCode: true);
+            if (!string.IsNullOrEmpty(node.TieColumns))
+                AddPropertyRow("WITH TIES Columns", node.TieColumns, isCode: true);
+            if (!string.IsNullOrEmpty(node.UdxName))
+                AddPropertyRow("UDX Name", node.UdxName);
+            if (node.GroupExecuted)
+                AddPropertyRow("Group Executed", "True");
+            if (node.RemoteDataAccess)
+                AddPropertyRow("Remote Data Access", "True");
+            if (node.OptimizedHalloweenProtectionUsed)
+                AddPropertyRow("Halloween Protection", "True");
+            if (node.StatsCollectionId > 0)
+                AddPropertyRow("Stats Collection Id", $"{node.StatsCollectionId}");
+        }
+
+        // === Scalar UDFs ===
+        if (node.ScalarUdfs.Count > 0)
+        {
+            AddPropertySection("Scalar UDFs");
+            foreach (var udf in node.ScalarUdfs)
+            {
+                var udfDetail = udf.FunctionName;
+                if (udf.IsClrFunction)
+                {
+                    udfDetail += " (CLR)";
+                    if (!string.IsNullOrEmpty(udf.ClrAssembly))
+                        udfDetail += $"\n  Assembly: {udf.ClrAssembly}";
+                    if (!string.IsNullOrEmpty(udf.ClrClass))
+                        udfDetail += $"\n  Class: {udf.ClrClass}";
+                    if (!string.IsNullOrEmpty(udf.ClrMethod))
+                        udfDetail += $"\n  Method: {udf.ClrMethod}";
+                }
+                AddPropertyRow("UDF", udfDetail, isCode: true);
+            }
+        }
+
+        // === Named Parameters (IndexScan) ===
+        if (node.NamedParameters.Count > 0)
+        {
+            AddPropertySection("Named Parameters");
+            foreach (var np in node.NamedParameters)
+                AddPropertyRow(np.Name, np.ScalarString ?? "", isCode: true);
+        }
+
+        // === Per-Operator Indexed Views ===
+        if (node.OperatorIndexedViews.Count > 0)
+        {
+            AddPropertySection("Operator Indexed Views");
+            foreach (var iv in node.OperatorIndexedViews)
+                AddPropertyRow("View", iv, isCode: true);
+        }
+
+        // === Suggested Index (Eager Spool) ===
+        if (!string.IsNullOrEmpty(node.SuggestedIndex))
+        {
+            AddPropertySection("Suggested Index");
+            AddPropertyRow("CREATE INDEX", node.SuggestedIndex, isCode: true);
+        }
+
+        // === Remote Operator ===
+        if (!string.IsNullOrEmpty(node.RemoteDestination) || !string.IsNullOrEmpty(node.RemoteSource)
+            || !string.IsNullOrEmpty(node.RemoteObject) || !string.IsNullOrEmpty(node.RemoteQuery))
+        {
+            AddPropertySection("Remote Operator");
+            if (!string.IsNullOrEmpty(node.RemoteDestination))
+                AddPropertyRow("Destination", node.RemoteDestination);
+            if (!string.IsNullOrEmpty(node.RemoteSource))
+                AddPropertyRow("Source", node.RemoteSource);
+            if (!string.IsNullOrEmpty(node.RemoteObject))
+                AddPropertyRow("Object", node.RemoteObject, isCode: true);
+            if (!string.IsNullOrEmpty(node.RemoteQuery))
+                AddPropertyRow("Query", node.RemoteQuery, isCode: true);
+        }
+
+        // === Foreign Key References Section ===
+        if (node.ForeignKeyReferencesCount > 0 || node.NoMatchingIndexCount > 0 || node.PartialMatchingIndexCount > 0)
+        {
+            AddPropertySection("Foreign Key References");
+            if (node.ForeignKeyReferencesCount > 0)
+                AddPropertyRow("FK References", $"{node.ForeignKeyReferencesCount}");
+            if (node.NoMatchingIndexCount > 0)
+                AddPropertyRow("No Matching Index", $"{node.NoMatchingIndexCount}");
+            if (node.PartialMatchingIndexCount > 0)
+                AddPropertyRow("Partial Matching Index", $"{node.PartialMatchingIndexCount}");
         }
 
         // === Adaptive Join Section ===
@@ -669,6 +817,8 @@ private void ShowPropertiesPanel(PlanNode node)
         AddPropertyRow("Est. Rows All Execs", $"{node.EstimateRows * Math.Max(1, estExecs):N1}");
         if (node.EstimatedRowsRead > 0)
             AddPropertyRow("Est. Rows to Read", $"{node.EstimatedRowsRead:N1}");
+        if (node.EstimateRowsWithoutRowGoal > 0)
+            AddPropertyRow("Est. Rows (No Row Goal)", $"{node.EstimateRowsWithoutRowGoal:N1}");
         if (node.TableCardinality > 0)
             AddPropertyRow("Table Cardinality", $"{node.TableCardinality:N0}");
         AddPropertyRow("Avg Row Size", $"{node.EstimatedRowSize} B");
@@ -680,9 +830,20 @@ private void ShowPropertiesPanel(PlanNode node)
         {
             AddPropertySection("Actual Statistics");
             AddPropertyRow("Actual Rows", $"{node.ActualRows:N0}");
+            if (node.PerThreadStats.Count > 1)
+                foreach (var t in node.PerThreadStats)
+                    AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualRows:N0}", indent: true);
             if (node.ActualRowsRead > 0)
+            {
                 AddPropertyRow("Actual Rows Read", $"{node.ActualRowsRead:N0}");
+                if (node.PerThreadStats.Count > 1)
+                    foreach (var t in node.PerThreadStats.Where(t => t.ActualRowsRead > 0))
+                        AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualRowsRead:N0}", indent: true);
+            }
             AddPropertyRow("Actual Executions", $"{node.ActualExecutions:N0}");
+            if (node.PerThreadStats.Count > 1)
+                foreach (var t in node.PerThreadStats)
+                    AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualExecutions:N0}", indent: true);
             if (node.ActualRebinds > 0)
                 AddPropertyRow("Actual Rebinds", $"{node.ActualRebinds:N0}");
             if (node.ActualRewinds > 0)
@@ -698,17 +859,27 @@ private void ShowPropertiesPanel(PlanNode node)
 
             // Timing
             if (node.ActualElapsedMs > 0 || node.ActualCPUMs > 0
-                || node.UdfCpuTimeUs > 0 || node.UdfElapsedTimeUs > 0)
+                || node.UdfCpuTimeMs > 0 || node.UdfElapsedTimeMs > 0)
             {
                 AddPropertySection("Actual Timing");
                 if (node.ActualElapsedMs > 0)
+                {
                     AddPropertyRow("Elapsed Time", $"{node.ActualElapsedMs:N0} ms");
+                    if (node.PerThreadStats.Count > 1)
+                        foreach (var t in node.PerThreadStats.Where(t => t.ActualElapsedMs > 0))
+                            AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualElapsedMs:N0} ms", indent: true);
+                }
                 if (node.ActualCPUMs > 0)
+                {
                     AddPropertyRow("CPU Time", $"{node.ActualCPUMs:N0} ms");
-                if (node.UdfElapsedTimeUs > 0)
-                    AddPropertyRow("UDF Elapsed", $"{node.UdfElapsedTimeUs:N0} us");
-                if (node.UdfCpuTimeUs > 0)
-                    AddPropertyRow("UDF CPU", $"{node.UdfCpuTimeUs:N0} us");
+                    if (node.PerThreadStats.Count > 1)
+                        foreach (var t in node.PerThreadStats.Where(t => t.ActualCPUMs > 0))
+                            AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualCPUMs:N0} ms", indent: true);
+                }
+                if (node.UdfElapsedTimeMs > 0)
+                    AddPropertyRow("UDF Elapsed", $"{node.UdfElapsedTimeMs:N0} ms");
+                if (node.UdfCpuTimeMs > 0)
+                    AddPropertyRow("UDF CPU", $"{node.UdfCpuTimeMs:N0} ms");
             }
 
             // I/O
@@ -719,12 +890,30 @@ private void ShowPropertiesPanel(PlanNode node)
             {
                 AddPropertySection("Actual I/O");
                 AddPropertyRow("Logical Reads", $"{node.ActualLogicalReads:N0}");
+                if (node.PerThreadStats.Count > 1)
+                    foreach (var t in node.PerThreadStats.Where(t => t.ActualLogicalReads > 0))
+                        AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualLogicalReads:N0}", indent: true);
                 if (node.ActualPhysicalReads > 0)
+                {
                     AddPropertyRow("Physical Reads", $"{node.ActualPhysicalReads:N0}");
+                    if (node.PerThreadStats.Count > 1)
+                        foreach (var t in node.PerThreadStats.Where(t => t.ActualPhysicalReads > 0))
+                            AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualPhysicalReads:N0}", indent: true);
+                }
                 if (node.ActualScans > 0)
+                {
                     AddPropertyRow("Scans", $"{node.ActualScans:N0}");
+                    if (node.PerThreadStats.Count > 1)
+                        foreach (var t in node.PerThreadStats.Where(t => t.ActualScans > 0))
+                            AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualScans:N0}", indent: true);
+                }
                 if (node.ActualReadAheads > 0)
+                {
                     AddPropertyRow("Read-Ahead Reads", $"{node.ActualReadAheads:N0}");
+                    if (node.PerThreadStats.Count > 1)
+                        foreach (var t in node.PerThreadStats.Where(t => t.ActualReadAheads > 0))
+                            AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualReadAheads:N0}", indent: true);
+                }
                 if (node.ActualSegmentReads > 0)
                     AddPropertyRow("Segment Reads", $"{node.ActualSegmentReads:N0}");
                 if (node.ActualSegmentSkips > 0)
@@ -751,7 +940,8 @@ private void ShowPropertiesPanel(PlanNode node)
             || !string.IsNullOrEmpty(node.HashKeysProbe) || !string.IsNullOrEmpty(node.HashKeysBuild)
             || !string.IsNullOrEmpty(node.BuildResidual) || !string.IsNullOrEmpty(node.ProbeResidual)
             || !string.IsNullOrEmpty(node.MergeResidual) || !string.IsNullOrEmpty(node.PassThru)
-            || !string.IsNullOrEmpty(node.SetPredicate);
+            || !string.IsNullOrEmpty(node.SetPredicate)
+            || node.GuessedSelectivity;
         if (hasPredicates)
         {
             AddPropertySection("Predicates");
@@ -773,6 +963,8 @@ private void ShowPropertiesPanel(PlanNode node)
                 AddPropertyRow("Pass Through", node.PassThru, isCode: true);
             if (!string.IsNullOrEmpty(node.SetPredicate))
                 AddPropertyRow("Set Predicate", node.SetPredicate, isCode: true);
+            if (node.GuessedSelectivity)
+                AddPropertyRow("Guessed Selectivity", "True (optimizer guessed, no statistics)");
         }
 
         // === Output Columns ===
@@ -784,12 +976,16 @@ private void ShowPropertiesPanel(PlanNode node)
 
         // === Memory ===
         if (node.MemoryGrantKB > 0 || node.DesiredMemoryKB > 0 || node.MaxUsedMemoryKB > 0
-            || node.MemoryFractionInput > 0 || node.MemoryFractionOutput > 0)
+            || node.MemoryFractionInput > 0 || node.MemoryFractionOutput > 0
+            || node.InputMemoryGrantKB > 0 || node.OutputMemoryGrantKB > 0 || node.UsedMemoryGrantKB > 0)
         {
             AddPropertySection("Memory");
             if (node.MemoryGrantKB > 0) AddPropertyRow("Granted", $"{node.MemoryGrantKB:N0} KB");
             if (node.DesiredMemoryKB > 0) AddPropertyRow("Desired", $"{node.DesiredMemoryKB:N0} KB");
             if (node.MaxUsedMemoryKB > 0) AddPropertyRow("Max Used", $"{node.MaxUsedMemoryKB:N0} KB");
+            if (node.InputMemoryGrantKB > 0) AddPropertyRow("Input Grant", $"{node.InputMemoryGrantKB:N0} KB");
+            if (node.OutputMemoryGrantKB > 0) AddPropertyRow("Output Grant", $"{node.OutputMemoryGrantKB:N0} KB");
+            if (node.UsedMemoryGrantKB > 0) AddPropertyRow("Used Grant", $"{node.UsedMemoryGrantKB:N0} KB");
             if (node.MemoryFractionInput > 0) AddPropertyRow("Fraction Input", $"{node.MemoryFractionInput:F4}");
             if (node.MemoryFractionOutput > 0) AddPropertyRow("Fraction Output", $"{node.MemoryFractionOutput:F4}");
         }
@@ -800,12 +996,15 @@ private void ShowPropertiesPanel(PlanNode node)
             var s = _currentStatement;
 
             // === Statement Text ===
-            if (!string.IsNullOrEmpty(s.StatementText))
+            if (!string.IsNullOrEmpty(s.StatementText) || !string.IsNullOrEmpty(s.StmtUseDatabaseName))
             {
                 AddPropertySection("Statement");
-                AddPropertyRow("Text", s.StatementText, isCode: true);
+                if (!string.IsNullOrEmpty(s.StatementText))
+                    AddPropertyRow("Text", s.StatementText, isCode: true);
                 if (!string.IsNullOrEmpty(s.ParameterizedText) && s.ParameterizedText != s.StatementText)
                     AddPropertyRow("Parameterized", s.ParameterizedText, isCode: true);
+                if (!string.IsNullOrEmpty(s.StmtUseDatabaseName))
+                    AddPropertyRow("USE Database", s.StmtUseDatabaseName);
             }
 
             // === Cursor Info ===
@@ -860,6 +1059,8 @@ private void ShowPropertiesPanel(PlanNode node)
                 AddPropertyRow("Non-Parallel Reason", s.NonParallelPlanReason);
             if (s.MaxQueryMemoryKB > 0)
                 AddPropertyRow("Max Query Memory", $"{s.MaxQueryMemoryKB:N0} KB");
+            if (s.QueryPlanMemoryGrantKB > 0)
+                AddPropertyRow("QueryPlan Memory Grant", $"{s.QueryPlanMemoryGrantKB:N0} KB");
             AddPropertyRow("Compile Time", $"{s.CompileTimeMs:N0} ms");
             AddPropertyRow("Compile CPU", $"{s.CompileCPUMs:N0} ms");
             AddPropertyRow("Compile Memory", $"{s.CompileMemoryKB:N0} KB");
@@ -898,6 +1099,85 @@ private void ShowPropertiesPanel(PlanNode node)
                     AddPropertyRow("QS Hint Source", s.QueryStoreStatementHintSource);
             }
 
+            // === Feature Flags ===
+            if (s.ContainsInterleavedExecutionCandidates || s.ContainsInlineScalarTsqlUdfs
+                || s.ContainsLedgerTables || s.ExclusiveProfileTimeActive || s.QueryCompilationReplay > 0
+                || s.QueryVariantID > 0)
+            {
+                AddPropertySection("Feature Flags");
+                if (s.ContainsInterleavedExecutionCandidates)
+                    AddPropertyRow("Interleaved Execution", "True");
+                if (s.ContainsInlineScalarTsqlUdfs)
+                    AddPropertyRow("Inline Scalar UDFs", "True");
+                if (s.ContainsLedgerTables)
+                    AddPropertyRow("Ledger Tables", "True");
+                if (s.ExclusiveProfileTimeActive)
+                    AddPropertyRow("Exclusive Profile Time", "True");
+                if (s.QueryCompilationReplay > 0)
+                    AddPropertyRow("Compilation Replay", $"{s.QueryCompilationReplay}");
+                if (s.QueryVariantID > 0)
+                    AddPropertyRow("Query Variant ID", $"{s.QueryVariantID}");
+            }
+
+            // === PSP Dispatcher ===
+            if (s.Dispatcher != null)
+            {
+                AddPropertySection("PSP Dispatcher");
+                if (!string.IsNullOrEmpty(s.DispatcherPlanHandle))
+                    AddPropertyRow("Plan Handle", s.DispatcherPlanHandle, isCode: true);
+                foreach (var psp in s.Dispatcher.ParameterSensitivePredicates)
+                {
+                    var range = $"[{psp.LowBoundary:N0} — {psp.HighBoundary:N0}]";
+                    var predText = psp.PredicateText ?? "";
+                    AddPropertyRow("Predicate", $"{predText} {range}", isCode: true);
+                    foreach (var stat in psp.Statistics)
+                    {
+                        var statLabel = !string.IsNullOrEmpty(stat.TableName)
+                            ? $"  {stat.TableName}.{stat.StatisticsName}"
+                            : $"  {stat.StatisticsName}";
+                        AddPropertyRow(statLabel, $"Modified: {stat.ModificationCount:N0}, Sampled: {stat.SamplingPercent:F1}%", indent: true);
+                    }
+                }
+                foreach (var opt in s.Dispatcher.OptionalParameterPredicates)
+                {
+                    if (!string.IsNullOrEmpty(opt.PredicateText))
+                        AddPropertyRow("Optional Predicate", opt.PredicateText, isCode: true);
+                }
+            }
+
+            // === Cardinality Feedback ===
+            if (s.CardinalityFeedback.Count > 0)
+            {
+                AddPropertySection("Cardinality Feedback");
+                foreach (var cf in s.CardinalityFeedback)
+                    AddPropertyRow($"Node {cf.Key}", $"{cf.Value:N0}");
+            }
+
+            // === Optimization Replay ===
+            if (!string.IsNullOrEmpty(s.OptimizationReplayScript))
+            {
+                AddPropertySection("Optimization Replay");
+                AddPropertyRow("Script", s.OptimizationReplayScript, isCode: true);
+            }
+
+            // === Template Plan Guide ===
+            if (!string.IsNullOrEmpty(s.TemplatePlanGuideName))
+            {
+                AddPropertyRow("Template Plan Guide", s.TemplatePlanGuideName);
+                if (!string.IsNullOrEmpty(s.TemplatePlanGuideDB))
+                    AddPropertyRow("Template Guide DB", s.TemplatePlanGuideDB);
+            }
+
+            // === Handles ===
+            if (!string.IsNullOrEmpty(s.ParameterizedPlanHandle) || !string.IsNullOrEmpty(s.BatchSqlHandle))
+            {
+                AddPropertySection("Handles");
+                if (!string.IsNullOrEmpty(s.ParameterizedPlanHandle))
+                    AddPropertyRow("Parameterized Plan", s.ParameterizedPlanHandle, isCode: true);
+                if (!string.IsNullOrEmpty(s.BatchSqlHandle))
+                    AddPropertyRow("Batch SQL Handle", s.BatchSqlHandle, isCode: true);
+            }
+
             // === Set Options ===
             if (s.SetOptions != null)
             {
@@ -924,6 +1204,18 @@ private void ShowPropertiesPanel(PlanNode node)
                     AddPropertyRow("Max Compile Memory", $"{hw.MaxCompileMemory:N0} KB");
             }
 
+            // === Plan Version ===
+            if (_currentPlan != null && (!string.IsNullOrEmpty(_currentPlan.BuildVersion) || !string.IsNullOrEmpty(_currentPlan.Build)))
+            {
+                AddPropertySection("Plan Version");
+                if (!string.IsNullOrEmpty(_currentPlan.BuildVersion))
+                    AddPropertyRow("Build Version", _currentPlan.BuildVersion);
+                if (!string.IsNullOrEmpty(_currentPlan.Build))
+                    AddPropertyRow("Build", _currentPlan.Build);
+                if (_currentPlan.ClusteredMode)
+                    AddPropertyRow("Clustered Mode", "True");
+            }
+
             // === Optimizer Stats Usage ===
             if (s.StatsUsage.Count > 0)
             {
@@ -961,6 +1253,10 @@ private void ShowPropertiesPanel(PlanNode node)
                 AddPropertySection("Query Time Stats");
                 AddPropertyRow("CPU Time", $"{s.QueryTimeStats.CpuTimeMs:N0} ms");
                 AddPropertyRow("Elapsed Time", $"{s.QueryTimeStats.ElapsedTimeMs:N0} ms");
+                if (s.QueryUdfCpuTimeMs > 0)
+                    AddPropertyRow("UDF CPU Time", $"{s.QueryUdfCpuTimeMs:N0} ms");
+                if (s.QueryUdfElapsedTimeMs > 0)
+                    AddPropertyRow("UDF Elapsed Time", $"{s.QueryUdfElapsedTimeMs:N0} ms");
             }
 
             // === Thread Stats (actual plans) ===
@@ -969,13 +1265,22 @@ private void ShowPropertiesPanel(PlanNode node)
                 AddPropertySection("Thread Stats");
                 AddPropertyRow("Branches", $"{s.ThreadStats.Branches}");
                 AddPropertyRow("Used Threads", $"{s.ThreadStats.UsedThreads}");
+                var totalReserved = s.ThreadStats.Reservations.Sum(r => r.ReservedThreads);
+                if (totalReserved > 0)
+                {
+                    AddPropertyRow("Reserved Threads", $"{totalReserved}");
+                    if (totalReserved > s.ThreadStats.UsedThreads)
+                        AddPropertyRow("Inactive Threads", $"{totalReserved - s.ThreadStats.UsedThreads}");
+                }
+                foreach (var res in s.ThreadStats.Reservations)
+                    AddPropertyRow($"  Node {res.NodeId}", $"{res.ReservedThreads} reserved");
             }
 
             // === Wait Stats (actual plans) ===
             if (s.WaitStats.Count > 0)
             {
                 AddPropertySection("Wait Stats");
-                foreach (var w in s.WaitStats)
+                foreach (var w in s.WaitStats.OrderByDescending(w => w.WaitTimeMs))
                     AddPropertyRow(w.WaitType, $"{w.WaitTimeMs:N0} ms ({w.WaitCount:N0} waits)");
             }
 
@@ -1099,18 +1404,20 @@ private void AddPropertySection(string title)
         _currentPropertySection = contentPanel;
     }
 
-    private void AddPropertyRow(string label, string value, bool isCode = false)
+    private void AddPropertyRow(string label, string value, bool isCode = false, bool indent = false)
     {
         var grid = new Grid { Margin = new Thickness(10, 3, 10, 3) };
-        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(120) });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(140) });
         grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
 
         var labelBlock = new TextBlock
         {
             Text = label,
-            FontSize = 11,
+            FontSize = indent ? 10 : 11,
             Foreground = MutedBrush,
-            VerticalAlignment = VerticalAlignment.Top
+            VerticalAlignment = VerticalAlignment.Top,
+            TextWrapping = TextWrapping.Wrap,
+            Margin = indent ? new Thickness(16, 0, 0, 0) : new Thickness(0)
         };
         Grid.SetColumn(labelBlock, 0);
         grid.Children.Add(labelBlock);
@@ -1118,7 +1425,7 @@ private void AddPropertyRow(string label, string value, bool isCode = false)
         var valueBox = new TextBox
         {
             Text = value,
-            FontSize = 11,
+            FontSize = indent ? 10 : 11,
             Foreground = TooltipFgBrush,
             TextWrapping = TextWrapping.Wrap,
             IsReadOnly = true,
@@ -1371,43 +1678,299 @@ private static void AddTooltipRow(StackPanel parent, string label, string value,
 
     private void ShowMissingIndexes(List<MissingIndex> indexes)
     {
+        MissingIndexContent.Children.Clear();
+
         if (indexes.Count > 0)
         {
-            MissingIndexList.ItemsSource = indexes;
-            MissingIndexBanner.Visibility = Visibility.Visible;
+            MissingIndexHeader.Text = $"  Missing Index Suggestions ({indexes.Count})";
+
+            foreach (var mi in indexes)
+            {
+                var itemPanel = new StackPanel { Margin = new Thickness(0, 4, 0, 0) };
+
+                var headerRow = new StackPanel { Orientation = Orientation.Horizontal };
+                headerRow.Children.Add(new TextBlock
+                {
+                    Text = mi.Table,
+                    FontWeight = FontWeights.SemiBold,
+                    Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB")),
+                    FontSize = 12
+                });
+                headerRow.Children.Add(new TextBlock
+                {
+                    Text = $" \u2014 Impact: ",
+                    Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB")),
+                    FontSize = 12
+                });
+                headerRow.Children.Add(new TextBlock
+                {
+                    Text = $"{mi.Impact:F1}%",
+                    Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FFB347")),
+                    FontSize = 12
+                });
+                itemPanel.Children.Add(headerRow);
+
+                if (!string.IsNullOrEmpty(mi.CreateStatement))
+                {
+                    itemPanel.Children.Add(new TextBox
+                    {
+                        Text = mi.CreateStatement,
+                        FontFamily = new FontFamily("Consolas"),
+                        FontSize = 11,
+                        Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB")),
+                        Background = Brushes.Transparent,
+                        BorderThickness = new Thickness(0),
+                        IsReadOnly = true,
+                        TextWrapping = TextWrapping.Wrap,
+                        Margin = new Thickness(12, 2, 0, 0)
+                    });
+                }
+
+                MissingIndexContent.Children.Add(itemPanel);
+            }
+
+            MissingIndexEmpty.Visibility = Visibility.Collapsed;
         }
         else
         {
-            MissingIndexBanner.Visibility = Visibility.Collapsed;
+            MissingIndexHeader.Text = "Missing Index Suggestions";
+            MissingIndexEmpty.Visibility = Visibility.Visible;
         }
     }
 
-    private void ShowWarnings(PlanNode root)
+    private static void CollectWarnings(PlanNode node, List<PlanWarning> warnings)
     {
-        var allWarnings = new List<PlanWarning>();
-        CollectWarnings(root, allWarnings);
+        warnings.AddRange(node.Warnings);
+        foreach (var child in node.Children)
+            CollectWarnings(child, warnings);
+    }
 
-        if (allWarnings.Count > 0)
+    private void ShowWaitStats(List<WaitStatInfo> waits, bool isActualPlan)
+    {
+        WaitStatsContent.Children.Clear();
+
+        if (waits.Count == 0)
         {
-            var criticalCount = allWarnings.Count(w => w.Severity == PlanWarningSeverity.Critical);
-            var warningCount = allWarnings.Count(w => w.Severity == PlanWarningSeverity.Warning);
-            var parts = new List<string>();
-            if (criticalCount > 0) parts.Add($"{criticalCount} critical");
-            if (warningCount > 0) parts.Add($"{warningCount} warning(s)");
-            WarningsSummaryText.Text = $"Plan has {string.Join(", ", parts)} — hover over nodes with \u26A0 for details";
-            WarningsBanner.Visibility = Visibility.Visible;
+            WaitStatsHeader.Text = "Wait Stats";
+            WaitStatsEmpty.Text = isActualPlan
+                ? "No wait stats recorded"
+                : "No wait stats (estimated plan)";
+            WaitStatsEmpty.Visibility = Visibility.Visible;
+            return;
         }
-        else
+
+        WaitStatsEmpty.Visibility = Visibility.Collapsed;
+
+        var sorted = waits.OrderByDescending(w => w.WaitTimeMs).ToList();
+        var maxWait = sorted[0].WaitTimeMs;
+        var totalWait = sorted.Sum(w => w.WaitTimeMs);
+
+        WaitStatsHeader.Text = $"  Wait Stats \u2014 {totalWait:N0}ms total";
+
+        var longestName = sorted.Max(w => w.WaitType.Length);
+        var nameColWidth = longestName * 6.5 + 10;
+
+        var maxBarWidth = 300;
+
+        var grid = new Grid();
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(nameColWidth) });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(maxBarWidth + 16) });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+
+        for (int i = 0; i < sorted.Count; i++)
+            grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+
+        for (int i = 0; i < sorted.Count; i++)
         {
-            WarningsBanner.Visibility = Visibility.Collapsed;
+            var w = sorted[i];
+            var barFraction = maxWait > 0 ? (double)w.WaitTimeMs / maxWait : 0;
+            var color = GetWaitCategoryColor(GetWaitCategory(w.WaitType));
+
+            var nameText = new TextBlock
+            {
+                Text = w.WaitType,
+                FontSize = 12,
+                Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB")),
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(0, 2, 10, 2)
+            };
+            Grid.SetRow(nameText, i);
+            Grid.SetColumn(nameText, 0);
+            grid.Children.Add(nameText);
+
+            var colorBar = new Border
+            {
+                Width = Math.Max(4, barFraction * maxBarWidth),
+                Height = 14,
+                Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString(color)),
+                CornerRadius = new CornerRadius(2),
+                HorizontalAlignment = HorizontalAlignment.Left,
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(0, 2, 8, 2)
+            };
+            Grid.SetRow(colorBar, i);
+            Grid.SetColumn(colorBar, 1);
+            grid.Children.Add(colorBar);
+
+            var durationText = new TextBlock
+            {
+                Text = $"{w.WaitTimeMs:N0}ms ({w.WaitCount:N0} waits)",
+                FontSize = 12,
+                Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB")),
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(0, 2, 0, 2)
+            };
+            Grid.SetRow(durationText, i);
+            Grid.SetColumn(durationText, 2);
+            grid.Children.Add(durationText);
         }
+
+        WaitStatsContent.Children.Add(grid);
     }
 
-    private static void CollectWarnings(PlanNode node, List<PlanWarning> warnings)
+    private static string GetWaitCategory(string waitType)
     {
-        warnings.AddRange(node.Warnings);
-        foreach (var child in node.Children)
-            CollectWarnings(child, warnings);
+        if (waitType.StartsWith("SOS_SCHEDULER_YIELD", StringComparison.Ordinal) ||
+            waitType.StartsWith("CXPACKET", StringComparison.Ordinal) ||
+            waitType.StartsWith("CXCONSUMER", StringComparison.Ordinal) ||
+            waitType.StartsWith("CXSYNC_PORT", StringComparison.Ordinal) ||
+            waitType.StartsWith("CXSYNC_CONSUMER", StringComparison.Ordinal))
+            return "CPU";
+
+        if (waitType.StartsWith("PAGEIOLATCH", StringComparison.Ordinal) ||
+            waitType.StartsWith("WRITELOG", StringComparison.Ordinal) ||
+            waitType.StartsWith("IO_COMPLETION", StringComparison.Ordinal) ||
+            waitType.StartsWith("ASYNC_IO_COMPLETION", StringComparison.Ordinal))
+            return "I/O";
+
+        if (waitType.StartsWith("LCK_M_", StringComparison.Ordinal))
+            return "Lock";
+
+        if (waitType == "RESOURCE_SEMAPHORE" || waitType == "CMEMTHREAD")
+            return "Memory";
+
+        if (waitType == "ASYNC_NETWORK_IO")
+            return "Network";
+
+        return "Other";
+    }
+
+    private static string GetWaitCategoryColor(string category)
+    {
+        return category switch
+        {
+            "CPU" => "#4FA3FF",
+            "I/O" => "#FFB347",
+            "Lock" => "#E57373",
+            "Memory" => "#9B59B6",
+            "Network" => "#2ECC71",
+            _ => "#6BB5FF"
+        };
+    }
+
+    private void ShowRuntimeSummary(PlanStatement statement)
+    {
+        RuntimeSummaryContent.Children.Clear();
+
+        var labelColor = "#E4E6EB";
+        var valueColor = "#E4E6EB";
+
+        var grid = new Grid();
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        int rowIndex = 0;
+
+        void AddRow(string label, string value)
+        {
+            grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+
+            var labelText = new TextBlock
+            {
+                Text = label,
+                FontSize = 11,
+                Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(labelColor)),
+                HorizontalAlignment = HorizontalAlignment.Left,
+                Margin = new Thickness(0, 1, 8, 1)
+            };
+            Grid.SetRow(labelText, rowIndex);
+            Grid.SetColumn(labelText, 0);
+            grid.Children.Add(labelText);
+
+            var valueText = new TextBlock
+            {
+                Text = value,
+                FontSize = 11,
+                Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(valueColor)),
+                Margin = new Thickness(0, 1, 0, 1)
+            };
+            Grid.SetRow(valueText, rowIndex);
+            Grid.SetColumn(valueText, 1);
+            grid.Children.Add(valueText);
+
+            rowIndex++;
+        }
+
+        if (statement.QueryTimeStats != null)
+        {
+            AddRow("Elapsed", $"{statement.QueryTimeStats.ElapsedTimeMs:N0}ms");
+            AddRow("CPU", $"{statement.QueryTimeStats.CpuTimeMs:N0}ms");
+            if (statement.QueryUdfCpuTimeMs > 0)
+                AddRow("UDF CPU", $"{statement.QueryUdfCpuTimeMs:N0}ms");
+            if (statement.QueryUdfElapsedTimeMs > 0)
+                AddRow("UDF elapsed", $"{statement.QueryUdfElapsedTimeMs:N0}ms");
+        }
+
+        if (statement.MemoryGrant != null)
+        {
+            var mg = statement.MemoryGrant;
+            AddRow("Memory grant", $"{mg.GrantedMemoryKB:N0} KB granted, {mg.MaxUsedMemoryKB:N0} KB used");
+            if (mg.GrantWaitTimeMs > 0)
+                AddRow("Grant wait", $"{mg.GrantWaitTimeMs:N0}ms");
+        }
+
+        if (statement.DegreeOfParallelism > 0)
+            AddRow("DOP", statement.DegreeOfParallelism.ToString());
+        else if (statement.NonParallelPlanReason != null)
+            AddRow("Serial", statement.NonParallelPlanReason);
+
+        if (statement.ThreadStats != null)
+        {
+            var ts = statement.ThreadStats;
+            AddRow("Branches", ts.Branches.ToString());
+            var totalReserved = ts.Reservations.Sum(r => r.ReservedThreads);
+            if (totalReserved > 0)
+            {
+                var threadText = ts.UsedThreads == totalReserved
+                    ? $"{ts.UsedThreads} used ({totalReserved} reserved)"
+                    : $"{ts.UsedThreads} used of {totalReserved} reserved ({totalReserved - ts.UsedThreads} inactive)";
+                AddRow("Threads", threadText);
+            }
+            else
+            {
+                AddRow("Threads", $"{ts.UsedThreads} used");
+            }
+        }
+
+        if (statement.CardinalityEstimationModelVersion > 0)
+            AddRow("CE model", statement.CardinalityEstimationModelVersion.ToString());
+
+        if (statement.CompileTimeMs > 0)
+            AddRow("Compile time", $"{statement.CompileTimeMs:N0}ms");
+        if (statement.CachedPlanSizeKB > 0)
+            AddRow("Cached plan size", $"{statement.CachedPlanSizeKB:N0} KB");
+
+        if (!string.IsNullOrEmpty(statement.StatementOptmLevel))
+            AddRow("Optimization", statement.StatementOptmLevel);
+        if (!string.IsNullOrEmpty(statement.StatementOptmEarlyAbortReason))
+            AddRow("Early abort", statement.StatementOptmEarlyAbortReason);
+
+        RuntimeSummaryContent.Children.Add(grid);
+    }
+
+    private void UpdateInsightsHeader()
+    {
+        InsightsPanel.Visibility = Visibility.Visible;
+        InsightsHeader.Text = "  Plan Insights";
     }
 
     #endregion
@@ -1446,6 +2009,38 @@ private void PlanScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventAr
         }
     }
 
+    private void PlanViewerControl_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+    {
+        Focus();
+    }
+
+    private void PlanViewerControl_PreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (e.Key == Key.V && Keyboard.Modifiers == ModifierKeys.Control
+            && e.OriginalSource is not TextBox)
+        {
+            var text = Clipboard.GetText();
+            if (!string.IsNullOrWhiteSpace(text))
+            {
+                e.Handled = true;
+                try
+                {
+                    System.Xml.Linq.XDocument.Parse(text);
+                }
+                catch (System.Xml.XmlException ex)
+                {
+                    MessageBox.Show(
+                        $"The plan XML is not valid:\n\n{ex.Message}",
+                        "Invalid Plan XML",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Warning);
+                    return;
+                }
+                LoadPlan(text, "Pasted Plan");
+            }
+        }
+    }
+
     #endregion
 
     #region Save & Statement Selection
@@ -1467,19 +2062,269 @@ private void SavePlan_Click(object sender, RoutedEventArgs e)
         }
     }
 
-    private void StatementSelector_Changed(object sender, SelectionChangedEventArgs e)
+    private void PopulateStatementsGrid(List<PlanStatement> statements)
     {
-        if (StatementSelector.SelectedItem is ComboBoxItem item && item.Tag is int index)
+        StatementsHeader.Text = $"Statements ({statements.Count})";
+
+        var hasActualTimes = statements.Any(s => s.QueryTimeStats != null &&
+            (s.QueryTimeStats.CpuTimeMs > 0 || s.QueryTimeStats.ElapsedTimeMs > 0));
+        var hasUdf = statements.Any(s => s.QueryUdfElapsedTimeMs > 0);
+
+        // Build columns
+        StatementsGrid.Columns.Clear();
+
+        StatementsGrid.Columns.Add(new DataGridTextColumn
         {
-            var allStatements = _currentPlan?.Batches
-                .SelectMany(b => b.Statements)
-                .Where(s => s.RootNode != null)
-                .ToList();
+            Header = "#",
+            Binding = new System.Windows.Data.Binding("Index"),
+            Width = new DataGridLength(40),
+            IsReadOnly = true
+        });
+
+        StatementsGrid.Columns.Add(new DataGridTextColumn
+        {
+            Header = "Query",
+            Binding = new System.Windows.Data.Binding("QueryText"),
+            Width = new DataGridLength(1, DataGridLengthUnitType.Star),
+            IsReadOnly = true
+        });
 
-            if (allStatements != null && index >= 0 && index < allStatements.Count)
-                RenderStatement(allStatements[index]);
+        if (hasActualTimes)
+        {
+            StatementsGrid.Columns.Add(new DataGridTextColumn
+            {
+                Header = "CPU",
+                Binding = new System.Windows.Data.Binding("CpuDisplay"),
+                Width = new DataGridLength(70),
+                IsReadOnly = true,
+                SortMemberPath = "CpuMs"
+            });
+            StatementsGrid.Columns.Add(new DataGridTextColumn
+            {
+                Header = "Elapsed",
+                Binding = new System.Windows.Data.Binding("ElapsedDisplay"),
+                Width = new DataGridLength(70),
+                IsReadOnly = true,
+                SortMemberPath = "ElapsedMs"
+            });
         }
+
+        if (hasUdf)
+        {
+            StatementsGrid.Columns.Add(new DataGridTextColumn
+            {
+                Header = "UDF",
+                Binding = new System.Windows.Data.Binding("UdfDisplay"),
+                Width = new DataGridLength(70),
+                IsReadOnly = true,
+                SortMemberPath = "UdfMs"
+            });
+        }
+
+        if (!hasActualTimes)
+        {
+            StatementsGrid.Columns.Add(new DataGridTextColumn
+            {
+                Header = "Est. Cost",
+                Binding = new System.Windows.Data.Binding("CostDisplay"),
+                Width = new DataGridLength(80),
+                IsReadOnly = true,
+                SortMemberPath = "EstCost"
+            });
+        }
+
+        StatementsGrid.Columns.Add(new DataGridTextColumn
+        {
+            Header = "Critical",
+            Binding = new System.Windows.Data.Binding("Critical"),
+            Width = new DataGridLength(60),
+            IsReadOnly = true
+        });
+
+        StatementsGrid.Columns.Add(new DataGridTextColumn
+        {
+            Header = "Warnings",
+            Binding = new System.Windows.Data.Binding("Warnings"),
+            Width = new DataGridLength(70),
+            IsReadOnly = true
+        });
+
+        // Build rows
+        var rows = new List<StatementRow>();
+        for (int i = 0; i < statements.Count; i++)
+        {
+            var stmt = statements[i];
+            var allWarnings = stmt.PlanWarnings.ToList();
+            if (stmt.RootNode != null)
+                CollectWarnings(stmt.RootNode, allWarnings);
+
+            var text = stmt.StatementText;
+            if (string.IsNullOrWhiteSpace(text))
+                text = $"Statement {i + 1}";
+            if (text.Length > 120)
+                text = text[..120] + "...";
+
+            rows.Add(new StatementRow
+            {
+                Index = i + 1,
+                QueryText = text,
+                CpuMs = stmt.QueryTimeStats?.CpuTimeMs ?? 0,
+                ElapsedMs = stmt.QueryTimeStats?.ElapsedTimeMs ?? 0,
+                UdfMs = stmt.QueryUdfElapsedTimeMs,
+                EstCost = stmt.StatementSubTreeCost,
+                Critical = allWarnings.Count(w => w.Severity == PlanWarningSeverity.Critical),
+                Warnings = allWarnings.Count(w => w.Severity == PlanWarningSeverity.Warning),
+                Statement = stmt
+            });
+        }
+
+        StatementsGrid.ItemsSource = rows;
+    }
+
+    private void StatementsGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (StatementsGrid.SelectedItem is StatementRow row)
+            RenderStatement(row.Statement);
+    }
+
+    private void CopyStatementText_Click(object sender, RoutedEventArgs e)
+    {
+        if (StatementsGrid.SelectedItem is StatementRow row)
+        {
+            var text = row.Statement.StatementText;
+            if (!string.IsNullOrEmpty(text))
+                Clipboard.SetText(text);
+        }
+    }
+
+    private void ToggleStatements_Click(object sender, RoutedEventArgs e)
+    {
+        if (StatementsPanel.Visibility == Visibility.Visible)
+            CloseStatementsPanel();
+        else
+            ShowStatementsPanel();
+    }
+
+    private void CloseStatements_Click(object sender, RoutedEventArgs e)
+    {
+        CloseStatementsPanel();
+    }
+
+    private void ShowStatementsPanel()
+    {
+        StatementsColumn.Width = new GridLength(450);
+        StatementsSplitterColumn.Width = new GridLength(5);
+        StatementsSplitter.Visibility = Visibility.Visible;
+        StatementsPanel.Visibility = Visibility.Visible;
+        StatementsButton.Visibility = Visibility.Visible;
+        StatementsButtonSeparator.Visibility = Visibility.Visible;
+    }
+
+    private void CloseStatementsPanel()
+    {
+        StatementsPanel.Visibility = Visibility.Collapsed;
+        StatementsSplitter.Visibility = Visibility.Collapsed;
+        StatementsColumn.Width = new GridLength(0);
+        StatementsSplitterColumn.Width = new GridLength(0);
+    }
+
+    #endregion
+
+    #region Canvas Panning
+
+    private void PlanScrollViewer_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        // Don't intercept scrollbar interactions
+        if (IsScrollBarAtPoint(e))
+            return;
+
+        // Don't pan if clicking on a node
+        if (IsNodeAtPoint(e))
+            return;
+
+        _isPanning = true;
+        _panStart = e.GetPosition(PlanScrollViewer);
+        _panStartOffsetX = PlanScrollViewer.HorizontalOffset;
+        _panStartOffsetY = PlanScrollViewer.VerticalOffset;
+        PlanScrollViewer.Cursor = Cursors.SizeAll;
+        PlanScrollViewer.CaptureMouse();
+        e.Handled = true;
+    }
+
+    private void PlanScrollViewer_PreviewMouseMove(object sender, MouseEventArgs e)
+    {
+        if (!_isPanning) return;
+
+        var current = e.GetPosition(PlanScrollViewer);
+        var dx = current.X - _panStart.X;
+        var dy = current.Y - _panStart.Y;
+
+        PlanScrollViewer.ScrollToHorizontalOffset(Math.Max(0, _panStartOffsetX - dx));
+        PlanScrollViewer.ScrollToVerticalOffset(Math.Max(0, _panStartOffsetY - dy));
+        e.Handled = true;
+    }
+
+    private void PlanScrollViewer_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+    {
+        if (!_isPanning) return;
+        _isPanning = false;
+        PlanScrollViewer.Cursor = Cursors.Arrow;
+        PlanScrollViewer.ReleaseMouseCapture();
+        e.Handled = true;
+    }
+
+    /// <summary>Check if the mouse event originated from a ScrollBar.</summary>
+    private static bool IsScrollBarAtPoint(MouseButtonEventArgs e)
+    {
+        var source = e.OriginalSource as DependencyObject;
+        while (source != null)
+        {
+            if (source is System.Windows.Controls.Primitives.ScrollBar)
+                return true;
+            source = VisualTreeHelper.GetParent(source);
+        }
+        return false;
+    }
+
+    /// <summary>Check if the mouse event originated from a node Border (has PlanNode in Tag).</summary>
+    private static bool IsNodeAtPoint(MouseButtonEventArgs e)
+    {
+        var source = e.OriginalSource as DependencyObject;
+        while (source != null)
+        {
+            if (source is Border b && b.Tag is PlanNode)
+                return true;
+            source = VisualTreeHelper.GetParent(source);
+        }
+        return false;
     }
 
     #endregion
 }
+
+/// <summary>Data model for the statement DataGrid rows.</summary>
+public class StatementRow
+{
+    public int Index { get; set; }
+    public string QueryText { get; set; } = "";
+    public long CpuMs { get; set; }
+    public long ElapsedMs { get; set; }
+    public long UdfMs { get; set; }
+    public double EstCost { get; set; }
+    public int Critical { get; set; }
+    public int Warnings { get; set; }
+    public PlanStatement Statement { get; set; } = null!;
+
+    // Display helpers — grid binds to these, sorting uses the raw properties via SortMemberPath
+    public string CpuDisplay => FormatDuration(CpuMs);
+    public string ElapsedDisplay => FormatDuration(ElapsedMs);
+    public string UdfDisplay => UdfMs > 0 ? FormatDuration(UdfMs) : "";
+    public string CostDisplay => EstCost > 0 ? $"{EstCost:F2}" : "";
+
+    private static string FormatDuration(long ms)
+    {
+        if (ms < 1000) return $"{ms}ms";
+        if (ms < 60_000) return $"{ms / 1000.0:F1}s";
+        return $"{ms / 60_000}m {(ms % 60_000) / 1000}s";
+    }
+}
diff --git a/Dashboard/Controls/QueryPerformanceContent.xaml b/Dashboard/Controls/QueryPerformanceContent.xaml
index b7c71c9..c7bb6c6 100644
--- a/Dashboard/Controls/QueryPerformanceContent.xaml
+++ b/Dashboard/Controls/QueryPerformanceContent.xaml
@@ -32,8 +32,12 @@
                     <MenuItem.Icon><TextBlock Text="📊"/></MenuItem.Icon>
                 </MenuItem>
                 <Separator/>
-                <MenuItem Header="View Plan" Click="ViewEstimatedPlan_Click"/>
-                <MenuItem Header="Get Actual Plan" Click="GetActualPlan_Click"/>
+                <MenuItem Header="View Plan" Click="ViewEstimatedPlan_Click">
+                    <MenuItem.Icon><TextBlock Text="🔍"/></MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Get Actual Plan" Click="GetActualPlan_Click">
+                    <MenuItem.Icon><TextBlock Text="▶"/></MenuItem.Icon>
+                </MenuItem>
             </ContextMenu>
 
             <Style x:Key="DefaultRowStyle" TargetType="DataGridRow">
@@ -81,7 +85,7 @@
                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
                       RowStyle="{DynamicResource DefaultRowStyle}">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding CollectionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -225,7 +229,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding StartTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding StartTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="StartTime" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -233,7 +237,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TranStartTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding TranStartTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TranStartTime" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -567,7 +571,7 @@
                       RowStyle="{DynamicResource DefaultRowStyle}"
                       MouseDoubleClick="QueryStatsDataGrid_MouseDoubleClick">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding CollectionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -607,7 +611,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding CreationTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding CreationTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CreationTime" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -615,7 +619,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding LastExecutionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding LastExecutionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastExecutionTime" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -861,7 +865,7 @@
                       RowStyle="{DynamicResource DefaultRowStyle}"
                       MouseDoubleClick="ProcStatsDataGrid_MouseDoubleClick">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding CollectionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -909,7 +913,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding CachedTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding CachedTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CachedTime" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -917,7 +921,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding LastExecutionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding LastExecutionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastExecutionTime" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -1124,7 +1128,7 @@
                       RowStyle="{DynamicResource DefaultRowStyle}"
                       MouseDoubleClick="QueryStoreDataGrid_MouseDoubleClick">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding CollectionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1172,7 +1176,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding FirstExecutionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding FirstExecutionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="FirstExecutionTime" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1180,7 +1184,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding LastExecutionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding LastExecutionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastExecutionTime" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1528,7 +1532,7 @@
                       RowStyle="{DynamicResource DefaultRowStyle}"
                       MouseDoubleClick="QueryStoreRegressionsDataGrid_MouseDoubleClick">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding LastExecutionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding LastExecutionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastExecutionTime" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
@@ -1777,7 +1781,7 @@
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
-                    <DataGridTextColumn Binding="{Binding LastExecution, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding LastExecution, Converter={StaticResource ServerTimeConverter}}" Width="150">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastExecution" Click="LrqPatternsFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/Controls/QueryPerformanceContent.xaml.cs b/Dashboard/Controls/QueryPerformanceContent.xaml.cs
index 0a887bc..041a71f 100644
--- a/Dashboard/Controls/QueryPerformanceContent.xaml.cs
+++ b/Dashboard/Controls/QueryPerformanceContent.xaml.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2026 Erik Darling, Darling Data LLC
  *
  * This file is part of the SQL Server Performance Monitor.
@@ -133,6 +133,7 @@ public QueryPerformanceContent()
             SetupChartSaveMenus();
             Loaded += OnLoaded;
             Unloaded += OnUnloaded;
+            Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
 
             _queryDurationHover = new Helpers.ChartHoverHelper(QueryPerfTrendsQueryChart, "ms/sec");
             _procDurationHover = new Helpers.ChartHoverHelper(QueryPerfTrendsProcChart, "ms/sec");
@@ -169,15 +170,30 @@ private void OnUnloaded(object sender, RoutedEventArgs e)
             _queryStoreUnfilteredData = null;
             _qsRegressionsUnfilteredData = null;
             _lrqPatternsUnfilteredData = null;
+
+            Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
+        }
+
+        private void OnThemeChanged(string _)
+        {
+            foreach (var field in GetType().GetFields(
+                System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance))
+            {
+                if (field.GetValue(this) is ScottPlot.WPF.WpfPlot chart)
+                {
+                    Helpers.TabHelpers.ApplyThemeToChart(chart);
+                    chart.Refresh();
+                }
+            }
         }
 
         private void OnLoaded(object sender, RoutedEventArgs e)
         {
             // Initialize charts with dark mode immediately (before data is loaded)
-            TabHelpers.ApplyDarkModeToChart(QueryPerfTrendsQueryChart);
-            TabHelpers.ApplyDarkModeToChart(QueryPerfTrendsProcChart);
-            TabHelpers.ApplyDarkModeToChart(QueryPerfTrendsQsChart);
-            TabHelpers.ApplyDarkModeToChart(QueryPerfTrendsExecChart);
+            TabHelpers.ApplyThemeToChart(QueryPerfTrendsQueryChart);
+            TabHelpers.ApplyThemeToChart(QueryPerfTrendsProcChart);
+            TabHelpers.ApplyThemeToChart(QueryPerfTrendsQsChart);
+            TabHelpers.ApplyThemeToChart(QueryPerfTrendsExecChart);
             QueryPerfTrendsQueryChart.Refresh();
             QueryPerfTrendsProcChart.Refresh();
             QueryPerfTrendsQsChart.Refresh();
@@ -1594,7 +1610,7 @@ private void LoadDurationChart(WpfPlot chart, IEnumerable<DurationTrendItem> tre
                 }
                 chart.Plot.Clear();
                 hover?.Clear();
-                TabHelpers.ApplyDarkModeToChart(chart);
+                TabHelpers.ApplyThemeToChart(chart);
 
                 var dataList = (trendData ?? Enumerable.Empty<DurationTrendItem>())
                     .OrderBy(d => d.CollectionTime)
@@ -1649,7 +1665,7 @@ private void LoadExecChart(IEnumerable<ExecutionTrendItem> execTrends, int hours
             }
             QueryPerfTrendsExecChart.Plot.Clear();
             _execTrendsHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(QueryPerfTrendsExecChart);
+            TabHelpers.ApplyThemeToChart(QueryPerfTrendsExecChart);
 
             var dataList = (execTrends ?? Enumerable.Empty<ExecutionTrendItem>())
                 .OrderBy(d => d.CollectionTime)
diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml b/Dashboard/Controls/ResourceMetricsContent.xaml
index 2801a3e..ad5f8f6 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml
@@ -112,7 +112,7 @@
                         </Grid.RowDefinitions>
                         <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="5,5,5,2">
                             <TextBlock Text="Select Wait Types" FontWeight="Bold" VerticalAlignment="Center" Foreground="{DynamicResource ForegroundBrush}"/>
-                            <Button Content="Refresh" Click="WaitStatsDetail_Refresh_Click" Margin="10,0,0,0" Padding="8,2" Style="{StaticResource SuccessButton}" FontSize="11"/>
+                            <Button Content="Refresh" Click="WaitStatsDetail_Refresh_Click" Margin="10,0,0,0" Padding="8,2" Style="{DynamicResource SuccessButton}" FontSize="11"/>
                         </StackPanel>
                         <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="5,2">
                             <Button Content="Top Waits" Click="WaitTypes_SelectAll_Click" Padding="6,2" FontSize="10" Margin="0,0,5,0"/>
@@ -299,7 +299,7 @@
                         </Grid.RowDefinitions>
                         <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="5,5,5,2">
                             <TextBlock Text="Select Counters" FontWeight="Bold" VerticalAlignment="Center" Foreground="{DynamicResource ForegroundBrush}"/>
-                            <Button Content="Refresh" Click="PerfmonCounters_Refresh_Click" Margin="10,0,0,0" Padding="8,2" Style="{StaticResource SuccessButton}" FontSize="11"/>
+                            <Button Content="Refresh" Click="PerfmonCounters_Refresh_Click" Margin="10,0,0,0" Padding="8,2" Style="{DynamicResource SuccessButton}" FontSize="11"/>
                         </StackPanel>
                         <ComboBox Grid.Row="1" x:Name="PerfmonPackCombo"
                                   SelectionChanged="PerfmonPack_SelectionChanged"
diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml.cs b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
index 9c8c889..e17265a 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml.cs
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2026 Erik Darling, Darling Data LLC
  *
  * This file is part of the SQL Server Performance Monitor.
@@ -108,6 +108,25 @@ public ResourceMetricsContent()
             InitializeComponent();
             SetupChartContextMenus();
             Loaded += OnLoaded;
+            Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
+            Unloaded += (_, _) => Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
+
+            // Apply dark theme immediately so charts don't flash white before data loads
+            TabHelpers.ApplyThemeToChart(LatchStatsChart);
+            TabHelpers.ApplyThemeToChart(SpinlockStatsChart);
+            TabHelpers.ApplyThemeToChart(TempdbStatsChart);
+            TabHelpers.ApplyThemeToChart(TempDbLatencyChart);
+            TabHelpers.ApplyThemeToChart(SessionStatsChart);
+            TabHelpers.ApplyThemeToChart(UserDbReadLatencyChart);
+            TabHelpers.ApplyThemeToChart(UserDbWriteLatencyChart);
+            TabHelpers.ApplyThemeToChart(FileIoReadThroughputChart);
+            TabHelpers.ApplyThemeToChart(FileIoWriteThroughputChart);
+            TabHelpers.ApplyThemeToChart(PerfmonCountersChart);
+            TabHelpers.ApplyThemeToChart(WaitStatsDetailChart);
+            TabHelpers.ApplyThemeToChart(ServerUtilTrendsCpuChart);
+            TabHelpers.ApplyThemeToChart(ServerUtilTrendsTempdbChart);
+            TabHelpers.ApplyThemeToChart(ServerUtilTrendsMemoryChart);
+            TabHelpers.ApplyThemeToChart(ServerUtilTrendsPerfmonChart);
 
             _sessionStatsHover = new Helpers.ChartHoverHelper(SessionStatsChart, "sessions");
             _latchStatsHover = new Helpers.ChartHoverHelper(LatchStatsChart, "ms/sec");
@@ -133,6 +152,19 @@ private void OnLoaded(object sender, RoutedEventArgs e)
             // Freeze identifier columns
         }
 
+        private void OnThemeChanged(string _)
+        {
+            foreach (var field in GetType().GetFields(
+                System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance))
+            {
+                if (field.GetValue(this) is ScottPlot.WPF.WpfPlot chart)
+                {
+                    Helpers.TabHelpers.ApplyThemeToChart(chart);
+                    chart.Refresh();
+                }
+            }
+        }
+
         private void SetupChartContextMenus()
         {
             // Latch Stats chart
@@ -276,7 +308,7 @@ private void LoadLatchStatsChart(IEnumerable<LatchStatsItem> data, int hoursBack
                 _legendPanels[LatchStatsChart] = null;
             }
             LatchStatsChart.Plot.Clear();
-            TabHelpers.ApplyDarkModeToChart(LatchStatsChart);
+            TabHelpers.ApplyThemeToChart(LatchStatsChart);
             _latchStatsHover?.Clear();
 
             var dataList = data?.ToList() ?? new List<LatchStatsItem>();
@@ -367,7 +399,7 @@ private void LoadSpinlockStatsChart(IEnumerable<SpinlockStatsItem> data, int hou
                 _legendPanels[SpinlockStatsChart] = null;
             }
             SpinlockStatsChart.Plot.Clear();
-            TabHelpers.ApplyDarkModeToChart(SpinlockStatsChart);
+            TabHelpers.ApplyThemeToChart(SpinlockStatsChart);
             _spinlockStatsHover?.Clear();
 
             var dataList = data?.ToList() ?? new List<SpinlockStatsItem>();
@@ -475,7 +507,7 @@ private void LoadCombinedTempDbLatencyChart(List<FileIoLatencyTimeSeriesItem> da
             }
             TempDbLatencyChart.Plot.Clear();
             _tempDbLatencyHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(TempDbLatencyChart);
+            TabHelpers.ApplyThemeToChart(TempDbLatencyChart);
 
             if (data != null && data.Count > 0)
             {
@@ -548,7 +580,7 @@ private void LoadTempdbStatsChart(IEnumerable<TempdbStatsItem> data, int hoursBa
             }
             TempdbStatsChart.Plot.Clear();
             _tempdbStatsHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(TempdbStatsChart);
+            TabHelpers.ApplyThemeToChart(TempdbStatsChart);
 
             var dataList = data?.OrderBy(d => d.CollectionTime).ToList() ?? new List<TempdbStatsItem>();
             if (dataList.Count > 0)
@@ -693,7 +725,7 @@ private void LoadSessionStatsChart(IEnumerable<SessionStatsItem> data, int hours
                 _legendPanels[SessionStatsChart] = null;
             }
             SessionStatsChart.Plot.Clear();
-            TabHelpers.ApplyDarkModeToChart(SessionStatsChart);
+            TabHelpers.ApplyThemeToChart(SessionStatsChart);
             _sessionStatsHover?.Clear();
 
             var dataList = data?.OrderBy(d => d.CollectionTime).ToList() ?? new List<SessionStatsItem>();
@@ -863,7 +895,7 @@ private void LoadFileIoChart(ScottPlot.WPF.WpfPlot chart, List<FileIoLatencyTime
                 _legendPanels[chart] = null;
             }
             chart.Plot.Clear();
-            TabHelpers.ApplyDarkModeToChart(chart);
+            TabHelpers.ApplyThemeToChart(chart);
             hover?.Clear();
 
             // Check if any queued data exists (only render overlay if there's real data)
@@ -1049,7 +1081,7 @@ private void LoadServerTrendsCpuChart(IEnumerable<CpuSpikeItem> cpuData, int hou
             }
             ServerUtilTrendsCpuChart.Plot.Clear();
             _serverTrendsCpuHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(ServerUtilTrendsCpuChart);
+            TabHelpers.ApplyThemeToChart(ServerUtilTrendsCpuChart);
 
             var dataList = cpuData?.OrderBy(d => d.EventTime).ToList() ?? new List<CpuSpikeItem>();
             if (dataList.Count > 0)
@@ -1110,7 +1142,7 @@ private void LoadServerTrendsTempdbChart(IEnumerable<TempdbStatsItem> tempdbData
             }
             ServerUtilTrendsTempdbChart.Plot.Clear();
             _serverTrendsTempdbHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(ServerUtilTrendsTempdbChart);
+            TabHelpers.ApplyThemeToChart(ServerUtilTrendsTempdbChart);
 
             var dataList = tempdbData?.OrderBy(d => d.CollectionTime).ToList() ?? new List<TempdbStatsItem>();
             if (dataList.Count >= 1)
@@ -1171,7 +1203,7 @@ private void LoadServerTrendsMemoryChart(IEnumerable<MemoryStatsItem> memoryData
             }
             ServerUtilTrendsMemoryChart.Plot.Clear();
             _serverTrendsMemoryHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(ServerUtilTrendsMemoryChart);
+            TabHelpers.ApplyThemeToChart(ServerUtilTrendsMemoryChart);
 
             var dataList = memoryData?.OrderBy(d => d.CollectionTime).ToList() ?? new List<MemoryStatsItem>();
             if (dataList.Count >= 1)
@@ -1276,7 +1308,7 @@ private void LoadServerTrendsPerfmonChart(IEnumerable<PerfmonStatsItem> perfmonD
             }
             ServerUtilTrendsPerfmonChart.Plot.Clear();
             _serverTrendsPerfmonHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(ServerUtilTrendsPerfmonChart);
+            TabHelpers.ApplyThemeToChart(ServerUtilTrendsPerfmonChart);
 
             var allData = (perfmonData ?? Enumerable.Empty<PerfmonStatsItem>()).ToList();
 
@@ -1692,7 +1724,7 @@ private void LoadPerfmonCountersChart(List<PerfmonStatsItem>? data, int hoursBac
                 _legendPanels[PerfmonCountersChart] = null;
             }
             PerfmonCountersChart.Plot.Clear();
-            TabHelpers.ApplyDarkModeToChart(PerfmonCountersChart);
+            TabHelpers.ApplyThemeToChart(PerfmonCountersChart);
             _perfmonHover?.Clear();
 
             if (data == null || data.Count == 0 || _perfmonCounterItems == null)
@@ -1807,7 +1839,7 @@ private void UpdateWaitTypeCount()
             WaitTypeCountText.Text = $"{count} / 30 selected";
             WaitTypeCountText.Foreground = count >= 30
                 ? new System.Windows.Media.SolidColorBrush((System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#E57373")!)
-                : (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush");
+                : (System.Windows.Media.Brush)FindResource("ForegroundBrush");
         }
 
         private void WaitTypeSearch_TextChanged(object sender, TextChangedEventArgs e)
@@ -1973,7 +2005,7 @@ private void LoadWaitStatsDetailChart(List<WaitStatsDataPoint>? data, int hoursB
             bool useAvgPerWait = WaitStatsMetricCombo?.SelectedIndex == 1;
 
             WaitStatsDetailChart.Plot.Clear();
-            TabHelpers.ApplyDarkModeToChart(WaitStatsDetailChart);
+            TabHelpers.ApplyThemeToChart(WaitStatsDetailChart);
             _waitStatsHover?.Clear();
             if (_waitStatsHover != null) _waitStatsHover.Unit = useAvgPerWait ? "ms/wait" : "ms/sec";
 
diff --git a/Dashboard/Controls/ServerHealthCard.xaml b/Dashboard/Controls/ServerHealthCard.xaml
index b599da5..edca040 100644
--- a/Dashboard/Controls/ServerHealthCard.xaml
+++ b/Dashboard/Controls/ServerHealthCard.xaml
@@ -10,10 +10,6 @@
              Cursor="Hand">
     <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-
             <!-- Severity to color converter -->
             <Style x:Key="SeverityIndicator" TargetType="Ellipse">
                 <Setter Property="Width" Value="10"/>
diff --git a/Dashboard/Controls/SystemEventsContent.xaml b/Dashboard/Controls/SystemEventsContent.xaml
index 0c9c847..edf288f 100644
--- a/Dashboard/Controls/SystemEventsContent.xaml
+++ b/Dashboard/Controls/SystemEventsContent.xaml
@@ -8,10 +8,6 @@
              d:DesignHeight="600" d:DesignWidth="1200">
     <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-
             <!-- Context Menu for DataGrid Copy/Export -->
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click">
@@ -186,7 +182,7 @@
                           CanUserSortColumns="True" CanUserResizeColumns="True"
                           GridLinesVisibility="All" RowStyle="{StaticResource DefaultRowStyle}">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="160">
+                    <DataGridTextColumn Binding="{Binding CollectionTime, Converter={StaticResource ServerTimeConverter}}" Width="160">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="SevereErrorsFilter_Click" Margin="0,0,4,0"/>
@@ -194,7 +190,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding EventTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="160">
+                    <DataGridTextColumn Binding="{Binding EventTime, Converter={StaticResource ServerTimeConverter}}" Width="160">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="EventTime" Click="SevereErrorsFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/Controls/SystemEventsContent.xaml.cs b/Dashboard/Controls/SystemEventsContent.xaml.cs
index 4778838..b46c6d4 100644
--- a/Dashboard/Controls/SystemEventsContent.xaml.cs
+++ b/Dashboard/Controls/SystemEventsContent.xaml.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2026 Erik Darling, Darling Data LLC
  *
  * This file is part of the SQL Server Performance Monitor.
@@ -129,6 +129,28 @@ public SystemEventsContent()
             SetupChartContextMenus();
             Loaded += OnLoaded;
             Unloaded += OnUnloaded;
+            Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
+
+            // Apply dark theme immediately so charts don't flash white before data loads
+            TabHelpers.ApplyThemeToChart(BadPagesChart);
+            TabHelpers.ApplyThemeToChart(DumpRequestsChart);
+            TabHelpers.ApplyThemeToChart(AccessViolationsChart);
+            TabHelpers.ApplyThemeToChart(WriteAccessViolationsChart);
+            TabHelpers.ApplyThemeToChart(NonYieldingTasksChart);
+            TabHelpers.ApplyThemeToChart(LatchWarningsChart);
+            TabHelpers.ApplyThemeToChart(SickSpinlocksChart);
+            TabHelpers.ApplyThemeToChart(CpuComparisonChart);
+            TabHelpers.ApplyThemeToChart(SevereErrorsChart);
+            TabHelpers.ApplyThemeToChart(IOIssuesChart);
+            TabHelpers.ApplyThemeToChart(LongestPendingIOChart);
+            TabHelpers.ApplyThemeToChart(SchedulerIssuesChart);
+            TabHelpers.ApplyThemeToChart(MemoryConditionsChart);
+            TabHelpers.ApplyThemeToChart(CPUTasksChart);
+            TabHelpers.ApplyThemeToChart(MemoryBrokerChart);
+            TabHelpers.ApplyThemeToChart(MemoryBrokerRatioChart);
+            TabHelpers.ApplyThemeToChart(MemoryNodeOOMChart);
+            TabHelpers.ApplyThemeToChart(MemoryNodeOOMUtilChart);
+            TabHelpers.ApplyThemeToChart(MemoryNodeOOMMemoryChart);
 
             _badPagesHover = new Helpers.ChartHoverHelper(BadPagesChart, "events");
             _dumpRequestsHover = new Helpers.ChartHoverHelper(DumpRequestsChart, "events");
@@ -166,6 +188,21 @@ private void OnUnloaded(object sender, RoutedEventArgs e)
             _ioIssuesUnfilteredData = null;
             _memoryBrokerUnfilteredData = null;
             _memoryNodeOOMUnfilteredData = null;
+
+            Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
+        }
+
+        private void OnThemeChanged(string _)
+        {
+            foreach (var field in GetType().GetFields(
+                System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance))
+            {
+                if (field.GetValue(this) is ScottPlot.WPF.WpfPlot chart)
+                {
+                    Helpers.TabHelpers.ApplyThemeToChart(chart);
+                    chart.Refresh();
+                }
+            }
         }
 
         private void OnLoaded(object sender, RoutedEventArgs e)
@@ -451,7 +488,7 @@ private void LoadCorruptionEventsCharts(List<HealthParserSystemHealthItem> data,
             // Bad Pages Detected Chart
             BadPagesChart.Plot.Clear();
             _badPagesHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(BadPagesChart);
+            TabHelpers.ApplyThemeToChart(BadPagesChart);
             if (hasData)
             {
                 var (xs, ys) = TabHelpers.FillTimeSeriesGaps(
@@ -480,7 +517,7 @@ private void LoadCorruptionEventsCharts(List<HealthParserSystemHealthItem> data,
             // Interval Dump Requests Chart
             DumpRequestsChart.Plot.Clear();
             _dumpRequestsHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(DumpRequestsChart);
+            TabHelpers.ApplyThemeToChart(DumpRequestsChart);
             if (hasData)
             {
                 var (xs, ys) = TabHelpers.FillTimeSeriesGaps(
@@ -509,7 +546,7 @@ private void LoadCorruptionEventsCharts(List<HealthParserSystemHealthItem> data,
             // Access Violations Chart
             AccessViolationsChart.Plot.Clear();
             _accessViolationsHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(AccessViolationsChart);
+            TabHelpers.ApplyThemeToChart(AccessViolationsChart);
             if (hasData)
             {
                 var (xs, ys) = TabHelpers.FillTimeSeriesGaps(
@@ -538,7 +575,7 @@ private void LoadCorruptionEventsCharts(List<HealthParserSystemHealthItem> data,
             // Write Access Violations Chart
             WriteAccessViolationsChart.Plot.Clear();
             _writeAccessViolationsHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(WriteAccessViolationsChart);
+            TabHelpers.ApplyThemeToChart(WriteAccessViolationsChart);
             if (hasData)
             {
                 var (xs, ys) = TabHelpers.FillTimeSeriesGaps(
@@ -579,7 +616,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
             // Non-Yielding Tasks Chart
             NonYieldingTasksChart.Plot.Clear();
             _nonYieldingTasksHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(NonYieldingTasksChart);
+            TabHelpers.ApplyThemeToChart(NonYieldingTasksChart);
             if (hasData)
             {
                 var (xs, ys) = TabHelpers.FillTimeSeriesGaps(
@@ -608,7 +645,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
             // Latch Warnings Chart
             LatchWarningsChart.Plot.Clear();
             _latchWarningsHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(LatchWarningsChart);
+            TabHelpers.ApplyThemeToChart(LatchWarningsChart);
             if (hasData)
             {
                 var (xs, ys) = TabHelpers.FillTimeSeriesGaps(
@@ -642,7 +679,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
             }
             SickSpinlocksChart.Plot.Clear();
             _sickSpinlocksHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(SickSpinlocksChart);
+            TabHelpers.ApplyThemeToChart(SickSpinlocksChart);
             if (hasData)
             {
                 // Group by spinlock type and create a series for each
@@ -705,7 +742,7 @@ private void LoadContentionEventsCharts(List<HealthParserSystemHealthItem> data,
             }
             CpuComparisonChart.Plot.Clear();
             _cpuComparisonHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(CpuComparisonChart);
+            TabHelpers.ApplyThemeToChart(CpuComparisonChart);
             if (hasData)
             {
                 // System CPU series
@@ -801,7 +838,7 @@ private void LoadSevereErrorsChart(IEnumerable<HealthParserSevereErrorItem> data
             }
             SevereErrorsChart.Plot.Clear();
             _severeErrorsHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(SevereErrorsChart);
+            TabHelpers.ApplyThemeToChart(SevereErrorsChart);
 
             var dataList = data?.ToList() ?? new List<HealthParserSevereErrorItem>();
             bool hasData = false;
@@ -946,7 +983,7 @@ private void LoadIOIssuesChart(IEnumerable<HealthParserIOIssueItem> data, int ho
             }
             IOIssuesChart.Plot.Clear();
             _ioIssuesHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(IOIssuesChart);
+            TabHelpers.ApplyThemeToChart(IOIssuesChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue).OrderBy(d => d.EventTime).ToList() ?? new List<HealthParserIOIssueItem>();
             bool hasData = false;
@@ -1023,7 +1060,7 @@ private void LoadLongestPendingIOChart(IEnumerable<HealthParserIOIssueItem> data
             }
             LongestPendingIOChart.Plot.Clear();
             _longestPendingIoHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(LongestPendingIOChart);
+            TabHelpers.ApplyThemeToChart(LongestPendingIOChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue && !string.IsNullOrEmpty(d.LongestPendingRequestsFilePath)).ToList() ?? new List<HealthParserIOIssueItem>();
             bool hasData = false;
@@ -1146,7 +1183,7 @@ private void LoadSchedulerIssuesChart(IEnumerable<HealthParserSchedulerIssueItem
             }
             SchedulerIssuesChart.Plot.Clear();
             _schedulerIssuesHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(SchedulerIssuesChart);
+            TabHelpers.ApplyThemeToChart(SchedulerIssuesChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue).ToList() ?? new List<HealthParserSchedulerIssueItem>();
             bool hasData = false;
@@ -1300,7 +1337,7 @@ private void LoadMemoryConditionsChart(IEnumerable<HealthParserMemoryConditionIt
             }
             MemoryConditionsChart.Plot.Clear();
             _memoryConditionsHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(MemoryConditionsChart);
+            TabHelpers.ApplyThemeToChart(MemoryConditionsChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue).ToList() ?? new List<HealthParserMemoryConditionItem>();
             bool hasData = false;
@@ -1400,7 +1437,7 @@ private void LoadCPUTasksChart(IEnumerable<HealthParserCPUTasksItem> data, int h
             }
             CPUTasksChart.Plot.Clear();
             _cpuTasksHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(CPUTasksChart);
+            TabHelpers.ApplyThemeToChart(CPUTasksChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue).ToList() ?? new List<HealthParserCPUTasksItem>();
             bool hasData = false;
@@ -1616,7 +1653,7 @@ private void LoadMemoryBrokerChart(IEnumerable<HealthParserMemoryBrokerItem> dat
                     _legendPanels[chart] = null;
                 }
                 chart.Plot.Clear();
-                TabHelpers.ApplyDarkModeToChart(chart);
+                TabHelpers.ApplyThemeToChart(chart);
             }
 
             var dataList = data?.Where(d => d.EventTime.HasValue).ToList() ?? new List<HealthParserMemoryBrokerItem>();
@@ -1836,7 +1873,7 @@ private void LoadMemoryNodeOOMChart(IEnumerable<HealthParserMemoryNodeOOMItem> d
             }
             MemoryNodeOOMChart.Plot.Clear();
             _memoryNodeOomHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(MemoryNodeOOMChart);
+            TabHelpers.ApplyThemeToChart(MemoryNodeOOMChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue).ToList() ?? new List<HealthParserMemoryNodeOOMItem>();
             bool hasData = false;
@@ -1897,7 +1934,7 @@ private void LoadMemoryNodeOOMUtilChart(IEnumerable<HealthParserMemoryNodeOOMIte
             }
             MemoryNodeOOMUtilChart.Plot.Clear();
             _memoryNodeOomUtilHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(MemoryNodeOOMUtilChart);
+            TabHelpers.ApplyThemeToChart(MemoryNodeOOMUtilChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue && d.MemoryUtilizationPct.HasValue).ToList() ?? new List<HealthParserMemoryNodeOOMItem>();
             bool hasData = false;
@@ -1946,7 +1983,7 @@ private void LoadMemoryNodeOOMMemoryChart(IEnumerable<HealthParserMemoryNodeOOMI
             }
             MemoryNodeOOMMemoryChart.Plot.Clear();
             _memoryNodeOomMemoryHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(MemoryNodeOOMMemoryChart);
+            TabHelpers.ApplyThemeToChart(MemoryNodeOOMMemoryChart);
 
             var dataList = data?.Where(d => d.EventTime.HasValue).ToList() ?? new List<HealthParserMemoryNodeOOMItem>();
             bool hasData = false;
diff --git a/Dashboard/Dashboard.csproj b/Dashboard/Dashboard.csproj
index cbacd1e..0f21541 100644
--- a/Dashboard/Dashboard.csproj
+++ b/Dashboard/Dashboard.csproj
@@ -6,7 +6,10 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>PerformanceMonitorDashboard</AssemblyName>
     <Product>SQL Server Performance Monitor Dashboard</Product>
-    <Version>2.0.0</Version>
+    <Version>2.1.0</Version>
+    <AssemblyVersion>2.1.0.0</AssemblyVersion>
+    <FileVersion>2.1.0.0</FileVersion>
+    <InformationalVersion>2.1.0</InformationalVersion>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <ApplicationIcon>EDD.ico</ApplicationIcon>
diff --git a/Dashboard/Helpers/ChartHoverHelper.cs b/Dashboard/Helpers/ChartHoverHelper.cs
index dd0e712..17f2702 100644
--- a/Dashboard/Helpers/ChartHoverHelper.cs
+++ b/Dashboard/Helpers/ChartHoverHelper.cs
@@ -107,7 +107,7 @@ pick the series closest in Y (nearest line to cursor). */
 
             if (found)
             {
-                var time = DateTime.FromOADate(bestPoint.X);
+                var time = ServerTimeHelper.ConvertForDisplay(DateTime.FromOADate(bestPoint.X), ServerTimeHelper.CurrentDisplayMode);
                 _text.Text = $"{bestLabel}\n{bestPoint.Y:N1} {_unit}\n{time:HH:mm:ss}";
                 _popup.HorizontalOffset = pos.X + 15;
                 _popup.VerticalOffset = pos.Y + 15;
diff --git a/Dashboard/Helpers/NativeMethods.cs b/Dashboard/Helpers/NativeMethods.cs
index 141ad6d..f7c4d47 100644
--- a/Dashboard/Helpers/NativeMethods.cs
+++ b/Dashboard/Helpers/NativeMethods.cs
@@ -24,9 +24,17 @@ internal static class NativeMethods
         [return: MarshalAs(UnmanagedType.Bool)]
         private static extern bool PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
 
+        [DllImport("shell32.dll", SetLastError = true)]
+        private static extern void SetCurrentProcessExplicitAppUserModelID([MarshalAs(UnmanagedType.LPWStr)] string appId);
+
         public static void BroadcastShowMessage()
         {
             PostMessage((IntPtr)HWND_BROADCAST, WM_SHOWMONITOR, IntPtr.Zero, IntPtr.Zero);
         }
+
+        public static void SetAppUserModelId(string appId)
+        {
+            SetCurrentProcessExplicitAppUserModelID(appId);
+        }
     }
 }
diff --git a/Dashboard/Helpers/ServerTimeConverter.cs b/Dashboard/Helpers/ServerTimeConverter.cs
new file mode 100644
index 0000000..53e29a9
--- /dev/null
+++ b/Dashboard/Helpers/ServerTimeConverter.cs
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace PerformanceMonitorDashboard.Helpers
+{
+    /// <summary>
+    /// Converts server-time DateTime values for display based on the current TimeDisplayMode setting.
+    /// Used by DataGrid DateTime columns to show timestamps in Server Time, Local Time, or UTC.
+    /// </summary>
+    public class ServerTimeConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is DateTime dt)
+            {
+                return ServerTimeHelper.ConvertForDisplay(dt, ServerTimeHelper.CurrentDisplayMode)
+                    .ToString("yyyy-MM-dd HH:mm:ss");
+            }
+
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
diff --git a/Dashboard/Helpers/ServerTimeHelper.cs b/Dashboard/Helpers/ServerTimeHelper.cs
index 4300530..bf6c382 100644
--- a/Dashboard/Helpers/ServerTimeHelper.cs
+++ b/Dashboard/Helpers/ServerTimeHelper.cs
@@ -53,5 +53,31 @@ public static DateTime ToLocalTime(DateTime serverTime)
             var utcTime = serverTime.AddMinutes(-_utcOffsetMinutes);
             return utcTime.ToLocalTime();
         }
+
+        /// <summary>
+        /// The current display mode preference. Read from UserPreferences at startup,
+        /// updated when the user changes the setting.
+        /// </summary>
+        public static TimeDisplayMode CurrentDisplayMode { get; set; } = TimeDisplayMode.ServerTime;
+
+        /// <summary>
+        /// Converts a server DateTime for display based on the selected display mode.
+        /// </summary>
+        public static DateTime ConvertForDisplay(DateTime serverTime, TimeDisplayMode mode) => mode switch
+        {
+            TimeDisplayMode.LocalTime => ToLocalTime(serverTime),
+            TimeDisplayMode.UTC => serverTime.AddMinutes(-_utcOffsetMinutes),
+            _ => serverTime
+        };
+
+        /// <summary>
+        /// Returns a short timezone label for the current display mode (e.g., "UTC", "PST", "UTC-8:00").
+        /// </summary>
+        public static string GetTimezoneLabel(TimeDisplayMode mode) => mode switch
+        {
+            TimeDisplayMode.LocalTime => TimeZoneInfo.Local.StandardName,
+            TimeDisplayMode.UTC => "UTC",
+            _ => $"UTC{(_utcOffsetMinutes >= 0 ? "+" : "")}{_utcOffsetMinutes / 60}:{Math.Abs(_utcOffsetMinutes % 60):D2}"
+        };
     }
 }
diff --git a/Dashboard/Helpers/TabHelpers.cs b/Dashboard/Helpers/TabHelpers.cs
index 538312e..ed1260b 100644
--- a/Dashboard/Helpers/TabHelpers.cs
+++ b/Dashboard/Helpers/TabHelpers.cs
@@ -147,23 +147,50 @@ public static HashSet<string> GetDefaultWaitTypes(IList<string> availableWaitTyp
         }
 
         /// <summary>
-        /// Applies the Darling Data dark theme to a ScottPlot chart.
+        /// Applies the current color theme to a ScottPlot chart.
         /// </summary>
-        public static void ApplyDarkModeToChart(WpfPlot chart)
+        public static void ApplyThemeToChart(WpfPlot chart)
         {
-            // Grafana-inspired dark theme colors
-            var darkBackground = ScottPlot.Color.FromHex("#22252b");
-            var darkerBackground = ScottPlot.Color.FromHex("#111217");
-            var textColor = ScottPlot.Color.FromHex("#9DA5B4");
-            var gridColor = ScottPlot.Colors.White.WithAlpha(40);
-
-            chart.Plot.FigureBackground.Color = darkBackground;
-            chart.Plot.DataBackground.Color = darkerBackground;
+            ScottPlot.Color figureBackground, dataBackground, textColor, gridColor, legendBg, legendFg, legendOutline;
+
+            if (ThemeManager.CurrentTheme == "CoolBreeze")
+            {
+                figureBackground = ScottPlot.Color.FromHex("#EEF4FA");
+                dataBackground   = ScottPlot.Color.FromHex("#DAE6F0");
+                textColor        = ScottPlot.Color.FromHex("#364D61");
+                gridColor        = ScottPlot.Color.FromHex("#A8BDD0").WithAlpha(120);
+                legendBg         = ScottPlot.Color.FromHex("#EEF4FA");
+                legendFg         = ScottPlot.Color.FromHex("#1A2A3A");
+                legendOutline    = ScottPlot.Color.FromHex("#A8BDD0");
+            }
+            else if (ThemeManager.HasLightBackground)
+            {
+                figureBackground = ScottPlot.Color.FromHex("#FFFFFF");
+                dataBackground   = ScottPlot.Color.FromHex("#F5F7FA");
+                textColor        = ScottPlot.Color.FromHex("#4A5568");
+                gridColor        = ScottPlot.Colors.Black.WithAlpha(20);
+                legendBg         = ScottPlot.Color.FromHex("#FFFFFF");
+                legendFg         = ScottPlot.Color.FromHex("#1A1D23");
+                legendOutline    = ScottPlot.Color.FromHex("#DEE2E6");
+            }
+            else
+            {
+                figureBackground = ScottPlot.Color.FromHex("#22252b");
+                dataBackground   = ScottPlot.Color.FromHex("#111217");
+                textColor        = ScottPlot.Color.FromHex("#9DA5B4");
+                gridColor        = ScottPlot.Colors.White.WithAlpha(40);
+                legendBg         = ScottPlot.Color.FromHex("#22252b");
+                legendFg         = ScottPlot.Color.FromHex("#E4E6EB");
+                legendOutline    = ScottPlot.Color.FromHex("#2a2d35");
+            }
+
+            chart.Plot.FigureBackground.Color = figureBackground;
+            chart.Plot.DataBackground.Color = dataBackground;
             chart.Plot.Axes.Color(textColor);
             chart.Plot.Grid.MajorLineColor = gridColor;
-            chart.Plot.Legend.BackgroundColor = darkBackground;
-            chart.Plot.Legend.FontColor = ScottPlot.Color.FromHex("#E4E6EB");
-            chart.Plot.Legend.OutlineColor = ScottPlot.Color.FromHex("#2a2d35");
+            chart.Plot.Legend.BackgroundColor = legendBg;
+            chart.Plot.Legend.FontColor = legendFg;
+            chart.Plot.Legend.OutlineColor = legendOutline;
             chart.Plot.Legend.Alignment = ScottPlot.Alignment.LowerCenter;
             chart.Plot.Legend.Orientation = ScottPlot.Orientation.Horizontal;
             chart.Plot.Axes.Margins(bottom: 0); // No bottom margin - SetChartYLimitsWithLegendPadding handles Y-axis
@@ -173,21 +200,58 @@ public static void ApplyDarkModeToChart(WpfPlot chart)
             chart.Plot.Axes.Left.TickLabelStyle.ForeColor = textColor;
             chart.Plot.Axes.Bottom.Label.ForeColor = textColor;
             chart.Plot.Axes.Left.Label.ForeColor = textColor;
+
+            // Set the WPF control Background to match so no white flash appears before ScottPlot's render loop fires
+            chart.Background = new SolidColorBrush(Color.FromRgb(figureBackground.R, figureBackground.G, figureBackground.B));
+
+            // Ensure ScottPlot renders with the correct colors the very first time it gets pixel dimensions.
+            // Without this, ScottPlot's first auto-render (triggered by SizeChanged) would show a white canvas
+            // before our FigureBackground color takes visual effect.
+            chart.Loaded -= HandleChartFirstLoaded;
+            if (!chart.IsLoaded)
+                chart.Loaded += HandleChartFirstLoaded;
+        }
+
+        private static void HandleChartFirstLoaded(object sender, RoutedEventArgs e)
+        {
+            var chart = (WpfPlot)sender;
+            chart.Loaded -= HandleChartFirstLoaded;
+            chart.Refresh();
         }
 
         /// <summary>
-        /// Reapplies dark mode text colors to chart axes.
+        /// Reapplies theme-appropriate text colors to chart axes.
         /// Call this AFTER DateTimeTicksBottom() or other axis modifications.
         /// </summary>
         public static void ReapplyAxisColors(WpfPlot chart)
         {
-            var textColor = ScottPlot.Color.FromHex("#9DA5B4");
+            var textColor = ThemeManager.CurrentTheme == "CoolBreeze"
+                ? ScottPlot.Color.FromHex("#364D61")
+                : ThemeManager.HasLightBackground
+                    ? ScottPlot.Color.FromHex("#4A5568")
+                    : ScottPlot.Color.FromHex("#9DA5B4");
             chart.Plot.Axes.Bottom.TickLabelStyle.ForeColor = textColor;
             chart.Plot.Axes.Left.TickLabelStyle.ForeColor = textColor;
             chart.Plot.Axes.Bottom.Label.ForeColor = textColor;
             chart.Plot.Axes.Left.Label.ForeColor = textColor;
         }
 
+        /// <summary>
+        /// Recursively finds all WpfPlot chart controls in a visual tree.
+        /// Use this to apply theme updates to all charts in a control on theme switch.
+        /// </summary>
+        public static IEnumerable<WpfPlot> GetAllCharts(DependencyObject root)
+        {
+            for (int i = 0; i < VisualTreeHelper.GetChildrenCount(root); i++)
+            {
+                var child = VisualTreeHelper.GetChild(root, i);
+                if (child is WpfPlot plot)
+                    yield return plot;
+                foreach (var nested in GetAllCharts(child))
+                    yield return nested;
+            }
+        }
+
         /// <summary>
         /// Locks the vertical axis of a chart so mouse wheel zooming only affects the time (X) axis.
         /// Also reapplies dark mode axis colors after DateTimeTicksBottom() modifications.
@@ -238,25 +302,42 @@ public static void SetChartYLimitsWithLegendPadding(WpfPlot chart, double dataYM
         }
 
         /// <summary>
-        /// Applies dark theme styling to a WPF Calendar control.
+        /// Applies theme-appropriate styling to a WPF Calendar control (used by DatePicker popup).
         /// </summary>
-        public static void ApplyDarkThemeToCalendar(System.Windows.Controls.Calendar calendar)
+        public static void ApplyThemeToCalendar(System.Windows.Controls.Calendar calendar)
         {
-            var darkBg = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#111217"));
-            var lightBg = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#22252b"));
-            var whiteFg = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB"));
-            var mutedFg = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#6B7280"));
-            var accentBg = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2eaef1"));
-
-            calendar.Background = darkBg;
-            calendar.Foreground = whiteFg;
-            calendar.BorderBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2a2d35"));
-
-            // Apply to all child controls recursively
-            ApplyDarkThemeRecursively(calendar, darkBg, lightBg, whiteFg, mutedFg);
+            SolidColorBrush primaryBg, secondaryBg, fg, borderBrush;
+
+            if (ThemeManager.CurrentTheme == "CoolBreeze")
+            {
+                primaryBg   = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#EEF4FA"));
+                secondaryBg = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#DAE6F0"));
+                fg          = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#1A2A3A"));
+                borderBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#A8BDD0"));
+            }
+            else if (ThemeManager.HasLightBackground)
+            {
+                primaryBg   = new SolidColorBrush(Color.FromRgb(0xFF, 0xFF, 0xFF));
+                secondaryBg = new SolidColorBrush(Color.FromRgb(0xF5, 0xF7, 0xFA));
+                fg          = new SolidColorBrush(Color.FromRgb(0x1A, 0x1D, 0x23));
+                borderBrush = new SolidColorBrush(Color.FromRgb(0xDE, 0xE2, 0xE6));
+            }
+            else
+            {
+                primaryBg   = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#111217"));
+                secondaryBg = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#22252b"));
+                fg          = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB"));
+                borderBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2a2d35"));
+            }
+
+            calendar.Background = primaryBg;
+            calendar.Foreground = fg;
+            calendar.BorderBrush = borderBrush;
+
+            ApplyThemeRecursively(calendar, primaryBg, secondaryBg, fg, ThemeManager.HasLightBackground);
         }
 
-        private static void ApplyDarkThemeRecursively(DependencyObject parent, Brush darkBg, Brush lightBg, Brush whiteFg, Brush mutedFg)
+        private static void ApplyThemeRecursively(DependencyObject parent, Brush primaryBg, Brush secondaryBg, Brush fg, bool HasLightBackground)
         {
             for (int i = 0; i < VisualTreeHelper.GetChildrenCount(parent); i++)
             {
@@ -264,49 +345,44 @@ private static void ApplyDarkThemeRecursively(DependencyObject parent, Brush dar
 
                 if (child is System.Windows.Controls.Primitives.CalendarItem calendarItem)
                 {
-                    calendarItem.Background = darkBg;
-                    calendarItem.Foreground = whiteFg;
+                    calendarItem.Background = primaryBg;
+                    calendarItem.Foreground = fg;
                 }
                 else if (child is System.Windows.Controls.Primitives.CalendarDayButton dayButton)
                 {
                     dayButton.Background = Brushes.Transparent;
-                    dayButton.Foreground = whiteFg;
+                    dayButton.Foreground = fg;
                 }
                 else if (child is System.Windows.Controls.Primitives.CalendarButton calButton)
                 {
                     calButton.Background = Brushes.Transparent;
-                    calButton.Foreground = whiteFg;
+                    calButton.Foreground = fg;
                 }
                 else if (child is Button button)
                 {
                     button.Background = Brushes.Transparent;
-                    button.Foreground = whiteFg;
+                    button.Foreground = fg;
                 }
                 else if (child is TextBlock textBlock)
                 {
-                    textBlock.Foreground = whiteFg;
+                    textBlock.Foreground = fg;
                 }
-                else if (child is Border border)
+                else if (!HasLightBackground)
                 {
-                    // Apply dark background to any border with a light background
-                    if (border.Background is SolidColorBrush bg)
+                    // Dark mode only: replace any light-colored backgrounds with the dark theme color
+                    if (child is Border border && border.Background is SolidColorBrush bg)
                     {
-                        // Check if it's a light color (R, G, B all > 200)
                         if (bg.Color.R > 200 && bg.Color.G > 200 && bg.Color.B > 200)
-                            border.Background = darkBg;
+                            border.Background = primaryBg;
                     }
-                }
-                else if (child is Grid grid)
-                {
-                    // Apply dark background to any grid with a light background
-                    if (grid.Background is SolidColorBrush gridBg)
+                    else if (child is Grid grid && grid.Background is SolidColorBrush gridBg)
                     {
                         if (gridBg.Color.R > 200 && gridBg.Color.G > 200 && gridBg.Color.B > 200)
-                            grid.Background = darkBg;
+                            grid.Background = primaryBg;
                     }
                 }
 
-                ApplyDarkThemeRecursively(child, darkBg, lightBg, whiteFg, mutedFg);
+                ApplyThemeRecursively(child, primaryBg, secondaryBg, fg, HasLightBackground);
             }
         }
 
@@ -736,3 +812,4 @@ public static (double[] xs, double[] ys) FillTimeSeriesGaps(
         }
     }
 }
+
diff --git a/Dashboard/Helpers/ThemeManager.cs b/Dashboard/Helpers/ThemeManager.cs
new file mode 100644
index 0000000..f37a8c3
--- /dev/null
+++ b/Dashboard/Helpers/ThemeManager.cs
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Windows;
+
+namespace PerformanceMonitorDashboard.Helpers
+{
+    /// <summary>
+    /// Manages the application color theme (Dark / Light) by swapping the merged resource dictionary at runtime.
+    /// </summary>
+    public static class ThemeManager
+    {
+        /// <summary>The currently active theme name ("Dark" or "Light").</summary>
+        public static string CurrentTheme { get; private set; } = "Dark";
+
+        /// <summary>Returns true when the active theme uses a light background (Light or CoolBreeze).</summary>
+        public static bool HasLightBackground => CurrentTheme != "Dark";
+
+        /// <summary>Fired after the theme dictionary has been swapped.</summary>
+        public static event Action<string>? ThemeChanged;
+
+        /// <summary>
+        /// Applies the specified theme by replacing the top-level merged resource dictionary.
+        /// All DynamicResource bindings in XAML update automatically.
+        /// </summary>
+        public static void Apply(string theme)
+        {
+            CurrentTheme = theme;
+            var uri = theme switch
+            {
+                "Light"      => new Uri("pack://application:,,,/Themes/LightTheme.xaml"),
+                "CoolBreeze" => new Uri("pack://application:,,,/Themes/CoolBreezeTheme.xaml"),
+                _            => new Uri("pack://application:,,,/Themes/DarkTheme.xaml")
+            };
+
+            var dictionaries = Application.Current.Resources.MergedDictionaries;
+            dictionaries.Clear();
+            dictionaries.Add(new ResourceDictionary { Source = uri });
+
+            ThemeChanged?.Invoke(theme);
+        }
+    }
+}
diff --git a/Dashboard/Helpers/TimeDisplayMode.cs b/Dashboard/Helpers/TimeDisplayMode.cs
new file mode 100644
index 0000000..41912ae
--- /dev/null
+++ b/Dashboard/Helpers/TimeDisplayMode.cs
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+namespace PerformanceMonitorDashboard.Helpers
+{
+    public enum TimeDisplayMode
+    {
+        ServerTime,
+        LocalTime,
+        UTC
+    }
+}
diff --git a/Dashboard/MainWindow.xaml b/Dashboard/MainWindow.xaml
index 7bc9579..1edd0c2 100644
--- a/Dashboard/MainWindow.xaml
+++ b/Dashboard/MainWindow.xaml
@@ -183,6 +183,16 @@
                             </Border>
                         </Grid>
                     </Button>
+                    <Button x:Name="OpenPlanViewerButton"
+                            Click="OpenPlanViewer_Click"
+                            Height="32"
+                            Margin="0,0,0,8"
+                            ToolTip="Open or paste an execution plan (independent of any server)">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="&#x1F50D;" FontSize="12" VerticalAlignment="Center" Margin="0,0,6,0"/>
+                            <TextBlock Text="Open Plan Viewer" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </Button>
                     <Separator Margin="0,0,0,8"/>
                     <Button x:Name="RefreshAllButton"
                             Content="&#x21BB; Refresh All Status"
diff --git a/Dashboard/MainWindow.xaml.cs b/Dashboard/MainWindow.xaml.cs
index 0836a4e..6358cfd 100644
--- a/Dashboard/MainWindow.xaml.cs
+++ b/Dashboard/MainWindow.xaml.cs
@@ -24,6 +24,8 @@
 using PerformanceMonitorDashboard.Controls;
 using PerformanceMonitorDashboard.Helpers;
 using PerformanceMonitorDashboard.Services;
+using System.ComponentModel;
+using System.Windows.Data;
 
 namespace PerformanceMonitorDashboard
 {
@@ -45,7 +47,9 @@ public partial class MainWindow : Window
         private TabItem? _nocTab;
         private LandingPage? _landingPage;
         private TabItem? _alertsTab;
+        private TabItem? _planViewerTab;
         private AlertsHistoryContent? _alertsHistoryContent;
+
         private McpHostService? _mcpHostService;
         private CancellationTokenSource? _mcpCts;
 
@@ -74,6 +78,7 @@ public partial class MainWindow : Window
         private const double CollapsedWidth = 52;
         private const string NocTabId = "__NOC_OVERVIEW__";
         private const string AlertsTabId = "__ALERTS_HISTORY__";
+        private const string PlanViewerTabId = "__PLAN_VIEWER__";
 
         public MainWindow()
         {
@@ -137,11 +142,13 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
 
         private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
         {
-            // Sync CSV separator from preferences
+            // Sync preferences
             var startupPrefs = _preferencesService.GetPreferences();
             TabHelpers.CsvSeparator = startupPrefs.CsvSeparator;
+            if (Enum.TryParse<Helpers.TimeDisplayMode>(startupPrefs.TimeDisplayMode, out var tdm))
+                Helpers.ServerTimeHelper.CurrentDisplayMode = tdm;
 
-            LoadServerList();
+            await LoadServerListAsync();
             InitializeNotificationService();
             OpenNocTab();
             OpenAlertsTab();
@@ -337,7 +344,7 @@ private void ApplySidebarState()
             }
         }
 
-        private void LoadServerList()
+        private async System.Threading.Tasks.Task LoadServerListAsync()
         {
             var servers = _serverManager.GetAllServers();
 
@@ -348,10 +355,13 @@ private void LoadServerList()
                 _serverListItems.Add(new ServerListItem(server, status));
             }
 
+            // Add default sort for the list of servers by server display name.
+            _serverListItems.OrderBy(s => s.DisplayName).ToList().ForEach(s => _serverListItems.Move(_serverListItems.IndexOf(s), _serverListItems.Count - 1));
+
             // Also refresh the landing page if it exists
             if (_landingPage != null)
             {
-                _ = _landingPage.ReloadServersAsync();
+                await _landingPage.ReloadServersAsync();
             }
         }
 
@@ -683,6 +693,15 @@ private void CloseTab_Click(object sender, RoutedEventArgs e)
                         _alertsHistoryContent = null;
                     }
                 }
+                else if (tabId == PlanViewerTabId)
+                {
+                    if (_planViewerTab != null)
+                    {
+                        ServerTabControl.Items.Remove(_planViewerTab);
+                        _planViewerTab = null;
+                        _mainPlanTabControl = null;
+                    }
+                }
                 else if (_openTabs.TryGetValue(tabId, out var tabToClose))
                 {
                     _openTabs.Remove(tabId);
@@ -706,7 +725,7 @@ private void LandingPage_ServerCardClicked(object? sender, ServerConnection serv
             OpenServerTab(server);
         }
 
-        private void AddServer_Click(object sender, RoutedEventArgs e)
+        private async void AddServer_Click(object sender, RoutedEventArgs e)
         {
             var dialog = new AddServerDialog();
             if (dialog.ShowDialog() == true)
@@ -718,7 +737,7 @@ private void AddServer_Click(object sender, RoutedEventArgs e)
                 try
                 {
                     _serverManager.AddServer(server, username, password);
-                    LoadServerList();
+                    await LoadServerListAsync();
 
                     MessageBox.Show(
                         $"Server '{server.DisplayName}' added successfully!\n\n" +
@@ -740,7 +759,7 @@ private void AddServer_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void EditServer_Click(object sender, RoutedEventArgs e)
+        private async void EditServer_Click(object sender, RoutedEventArgs e)
         {
             if (ServerListView.SelectedItem is ServerListItem item)
             {
@@ -755,7 +774,7 @@ private void EditServer_Click(object sender, RoutedEventArgs e)
                     try
                     {
                         _serverManager.UpdateServer(updatedServer, username, password);
-                        LoadServerList();
+                        await LoadServerListAsync();
 
                         if (_openTabs.TryGetValue(server.Id, out var tabItem))
                         {
@@ -826,7 +845,7 @@ private async void RemoveServer_Click(object sender, RoutedEventArgs e)
                     _latestHealthStatus.Remove(server.Id);
 
                     _serverManager.DeleteServer(server.Id);
-                    LoadServerList();
+                    await LoadServerListAsync();
 
                     MessageBox.Show(
                         $"Server '{server.DisplayName}' removed successfully!",
@@ -846,25 +865,25 @@ private void ServerContextMenu_Opened(object sender, RoutedEventArgs e)
             }
         }
 
-        private void ToggleFavorite_Click(object sender, RoutedEventArgs e)
+        private async void ToggleFavorite_Click(object sender, RoutedEventArgs e)
         {
             if (ServerListView.SelectedItem is ServerListItem item)
             {
                 var server = item.Server;
                 server.IsFavorite = !server.IsFavorite;
                 _serverManager.UpdateServer(server, null, null);
-                LoadServerList();
+                await LoadServerListAsync();
             }
         }
 
-        private void ManageServers_Click(object sender, RoutedEventArgs e)
+        private async void ManageServers_Click(object sender, RoutedEventArgs e)
         {
             var dialog = new ManageServersWindow(_serverManager);
             dialog.Owner = this;
 
             if (dialog.ShowDialog() == true && dialog.ServersModified)
             {
-                LoadServerList();
+                await LoadServerListAsync();
             }
         }
 
@@ -1646,5 +1665,416 @@ private void UnsilenceServer_Click(object sender, RoutedEventArgs e)
         }
 
         #endregion
+
+        #region Main Window Plan Viewer
+
+        private const string PlanAddTabId = "__PLAN_ADD_TAB__";
+        private TabControl? _mainPlanTabControl;
+        private Grid? _planViewerContainer;
+
+        private void OpenPlanViewer_Click(object sender, RoutedEventArgs e)
+        {
+            if (_planViewerTab != null && ServerTabControl.Items.Contains(_planViewerTab))
+            {
+                AddNewEmptyPlanSubTab();
+                ServerTabControl.SelectedItem = _planViewerTab;
+                Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new Action(() => _planViewerContainer?.Focus()));
+                return;
+            }
+            OpenPlanViewerTab();
+        }
+
+        private void OpenPlanViewerTab()
+        {
+            if (_planViewerTab != null && ServerTabControl.Items.Contains(_planViewerTab))
+            {
+                ServerTabControl.SelectedItem = _planViewerTab;
+                return;
+            }
+
+            _mainPlanTabControl = new TabControl
+            {
+                Background = System.Windows.Media.Brushes.Transparent,
+                BorderThickness = new Thickness(0)
+            };
+
+            // "+" tab at the end of the inner strip
+            var addTabHeader = new TextBlock
+            {
+                Text = "+",
+                FontSize = 14,
+                FontWeight = FontWeights.Bold,
+                VerticalAlignment = VerticalAlignment.Center,
+                ToolTip = "Open a new plan sub-tab"
+            };
+            var addTab = new TabItem
+            {
+                Header = addTabHeader,
+                Tag = PlanAddTabId,
+                Content = new Grid() // no content needed
+            };
+            _mainPlanTabControl.Items.Add(addTab);
+
+            _mainPlanTabControl.SelectionChanged += (_, _) =>
+            {
+                if (_mainPlanTabControl.SelectedItem is TabItem { Tag: string t } && t == PlanAddTabId)
+                {
+                    var newSub = AddNewEmptyPlanSubTab();
+                    _mainPlanTabControl.SelectedItem = newSub;
+                }
+            };
+
+            var container = new Grid();
+            container.AllowDrop = true;
+            container.Focusable = true;
+            container.DragOver += MainWindowPlanViewer_DragOver;
+            container.Drop += MainWindowPlanViewer_Drop;
+            container.KeyDown += MainWindowPlanViewer_KeyDown;
+            container.Children.Add(_mainPlanTabControl);
+            _planViewerContainer = container;
+
+            var header = new StackPanel { Orientation = Orientation.Horizontal };
+            header.Children.Add(new TextBlock
+            {
+                Text = "Plan Viewer",
+                VerticalAlignment = VerticalAlignment.Center,
+                FontWeight = FontWeights.SemiBold
+            });
+            var closeBtn = new Button
+            {
+                Style = (Style)FindResource("TabCloseButton"),
+                Tag = PlanViewerTabId
+            };
+            closeBtn.Click += CloseTab_Click;
+            header.Children.Add(closeBtn);
+
+            _planViewerTab = new TabItem
+            {
+                Header = header,
+                Content = container,
+                Tag = PlanViewerTabId
+            };
+
+            ServerTabControl.Items.Add(_planViewerTab);
+            ServerTabControl.SelectedItem = _planViewerTab;
+
+            // Open the first empty sub-tab immediately
+            AddNewEmptyPlanSubTab();
+            Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new Action(() => _planViewerContainer?.Focus()));
+        }
+
+        /// <summary>
+        /// Adds a new empty "New Plan" sub-tab to the inner plan TabControl and selects it.
+        /// Returns the newly created sub-tab.
+        /// </summary>
+        private TabItem AddNewEmptyPlanSubTab()
+        {
+            // --- Empty state layer ---
+            var emptyState = new Grid();
+            var dashedRect = new System.Windows.Shapes.Rectangle
+            {
+                Margin = new Thickness(24),
+                Stroke = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                StrokeThickness = 1.5,
+                StrokeDashArray = new System.Windows.Media.DoubleCollection { 6, 4 },
+                RadiusX = 10, RadiusY = 10,
+                Opacity = 0.25
+            };
+            var emptyStack = new StackPanel { HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center };
+            emptyStack.Children.Add(new TextBlock
+            {
+                Text = "\uE896",
+                FontFamily = new System.Windows.Media.FontFamily("Segoe MDL2 Assets"),
+                FontSize = 52,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                Opacity = 0.45,
+                Margin = new Thickness(0, 0, 0, 12)
+            });
+            emptyStack.Children.Add(new TextBlock
+            {
+                Text = "New Plan",
+                FontSize = 20,
+                FontWeight = FontWeights.Light,
+                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                HorizontalAlignment = HorizontalAlignment.Center
+            });
+            emptyStack.Children.Add(new TextBlock
+            {
+                Text = "Open or paste execution plan XML to render it",
+                FontSize = 13,
+                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Margin = new Thickness(0, 8, 0, 0)
+            });
+            var btnPanel = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Center, Margin = new Thickness(0, 20, 0, 0) };
+            var openBtn = new Button { Content = "Open .sqlplan File", Height = 28, Padding = new Thickness(12, 0, 12, 0), ToolTip = "Open a .sqlplan or .xml file from disk" };
+            var pasteBtn = new Button { Content = "Paste XML", Height = 28, Padding = new Thickness(12, 0, 12, 0), Margin = new Thickness(8, 0, 0, 0), ToolTip = "Paste execution plan XML to render it (or use Ctrl+V)" };
+            btnPanel.Children.Add(openBtn);
+            btnPanel.Children.Add(pasteBtn);
+            emptyStack.Children.Add(btnPanel);
+            emptyStack.Children.Add(new TextBlock
+            {
+                Text = "or drag & drop a .sqlplan file anywhere in this area",
+                FontSize = 11,
+                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Margin = new Thickness(0, 12, 0, 0)
+            });
+            emptyState.Children.Add(dashedRect);
+            emptyState.Children.Add(emptyStack);
+
+            // --- Viewer layer (hidden until a plan is loaded) ---
+            var viewer = new Controls.PlanViewerControl
+            {
+                Visibility = Visibility.Collapsed
+            };
+
+            // Sub-tab content grid: index 0 = emptyState, index 1 = viewer
+            var subTabContent = new Grid();
+            subTabContent.Children.Add(emptyState);
+            subTabContent.Children.Add(viewer);
+
+            // --- Sub-tab header: label + close button ---
+            var initialLabel = GetUniqueSubTabLabel("New Plan");
+            var labelBlock = new TextBlock
+            {
+                Text = initialLabel,
+                VerticalAlignment = VerticalAlignment.Center,
+                ToolTip = initialLabel
+            };
+            var subCloseBtn = new Button { Style = (Style)FindResource("TabCloseButton") };
+            var subTabHeader = new StackPanel { Orientation = Orientation.Horizontal };
+            subTabHeader.Children.Add(labelBlock);
+            subTabHeader.Children.Add(subCloseBtn);
+
+            var subTab = new TabItem { Header = subTabHeader, Content = subTabContent };
+
+            subCloseBtn.Tag = subTab;
+            subCloseBtn.Click += (_, _) =>
+            {
+                _mainPlanTabControl!.Items.Remove(subTab);
+                // If only the "+" tab remains, re-open a fresh empty sub-tab
+                if (_mainPlanTabControl.Items.Count == 1 &&
+                    _mainPlanTabControl.Items[0] is TabItem { Tag: string t2 } && t2 == PlanAddTabId)
+                {
+                    AddNewEmptyPlanSubTab();
+                }
+            };
+
+            // Wire per-sub-tab buttons with closures over this sub-tab
+            openBtn.Click += (_, _) =>
+            {
+                var dialog = new Microsoft.Win32.OpenFileDialog
+                {
+                    Filter = "SQL Plan Files (*.sqlplan)|*.sqlplan|XML Files (*.xml)|*.xml|All Files (*.*)|*.*",
+                    DefaultExt = ".sqlplan",
+                    Multiselect = true
+                };
+                if (dialog.ShowDialog() != true) return;
+                var isFirst = true;
+                foreach (var fileName in dialog.FileNames)
+                {
+                    try
+                    {
+                        var xml = System.IO.File.ReadAllText(fileName);
+                        var targetTab = isFirst ? subTab : AddNewEmptyPlanSubTab();
+                        LoadPlanIntoSubTab(targetTab, xml, System.IO.Path.GetFileName(fileName));
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show($"Failed to open file:\n\n{ex.Message}", "Error",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                    isFirst = false;
+                }
+            };
+
+            pasteBtn.Click += (_, _) =>
+            {
+                var xml = Clipboard.GetText();
+                if (!string.IsNullOrWhiteSpace(xml))
+                {
+                    LoadPlanIntoSubTab(subTab, xml, "Pasted Plan");
+                    return;
+                }
+                MessageBox.Show("The clipboard does not contain any text.", "Paste Plan XML",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            };
+
+            // Insert before the "+" tab
+            var addTabIndex = -1;
+            for (var i = 0; i < _mainPlanTabControl!.Items.Count; i++)
+            {
+                if (_mainPlanTabControl.Items[i] is TabItem { Tag: string t3 } && t3 == PlanAddTabId)
+                {
+                    addTabIndex = i;
+                    break;
+                }
+            }
+            if (addTabIndex >= 0)
+                _mainPlanTabControl.Items.Insert(addTabIndex, subTab);
+            else
+                _mainPlanTabControl.Items.Add(subTab);
+
+            _mainPlanTabControl.SelectedItem = subTab;
+            return subTab;
+        }
+
+        /// <summary>
+        /// Loads plan XML into an existing sub-tab (replacing whatever was there before).
+        /// Updates the sub-tab header label and shows the viewer layer.
+        /// </summary>
+        private void LoadPlanIntoSubTab(TabItem subTab, string planXml, string label, string? queryText = null)
+        {
+            try { System.Xml.Linq.XDocument.Parse(planXml); }
+            catch (System.Xml.XmlException ex)
+            {
+                MessageBox.Show(
+                    $"The plan XML is not valid:\n\n{ex.Message}",
+                    "Invalid Plan XML",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Warning);
+                return;
+            }
+
+            if (subTab.Content is not Grid subTabContent) return;
+            if (subTabContent.Children.Count < 2) return;
+
+            var emptyState = subTabContent.Children[0] as FrameworkElement;
+            var viewer = subTabContent.Children[1] as Controls.PlanViewerControl;
+            if (viewer == null) return;
+
+            viewer.LoadPlan(planXml, label, queryText);
+            emptyState!.Visibility = Visibility.Collapsed;
+            viewer.Visibility = Visibility.Visible;
+
+            // Update header label (unique)
+            var uniqueLabel = GetUniqueSubTabLabel(label);
+            if (subTab.Header is StackPanel headerPanel &&
+                headerPanel.Children[0] is TextBlock headerLabel)
+            {
+                headerLabel.Text = uniqueLabel.Length > 30 ? uniqueLabel[..30] + "\u2026" : uniqueLabel;
+                headerLabel.ToolTip = uniqueLabel;
+            }
+        }
+
+        /// <summary>
+        /// Returns a label that is unique among current inner plan sub-tab headers.
+        /// If <paramref name="baseLabel"/> is already taken, appends " (1)", " (2)", …
+        /// </summary>
+        private string GetUniqueSubTabLabel(string baseLabel)
+        {
+            var existing = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var item in _mainPlanTabControl!.Items)
+            {
+                if (item is TabItem { Tag: string t } && t == PlanAddTabId) continue;
+                if (item is TabItem subTab &&
+                    subTab.Header is StackPanel sp &&
+                    sp.Children[0] is TextBlock tb)
+                    existing.Add(tb.ToolTip as string ?? tb.Text);
+            }
+            if (!existing.Contains(baseLabel)) return baseLabel;
+            var counter = 1;
+            string candidate;
+            do { candidate = $"{baseLabel} ({counter++})"; }
+            while (existing.Contains(candidate));
+            return candidate;
+        }
+
+        /// <summary>
+        /// Returns the currently active real plan sub-tab (skips the "+" tab).
+        /// </summary>
+        private TabItem? GetActivePlanSubTab()
+        {
+            if (_mainPlanTabControl == null) return null;
+            if (_mainPlanTabControl.SelectedItem is TabItem { Tag: string t } && t == PlanAddTabId)
+                return null;
+            return _mainPlanTabControl.SelectedItem as TabItem;
+        }
+
+        private void MainWindowPlanViewer_DragOver(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            {
+                var files = e.Data.GetData(DataFormats.FileDrop) as string[];
+                if (files?.Any(IsPlanFile) == true)
+                {
+                    e.Effects = DragDropEffects.Copy;
+                    e.Handled = true;
+                    return;
+                }
+            }
+            e.Effects = DragDropEffects.None;
+            e.Handled = true;
+        }
+
+        private void MainWindowPlanViewer_Drop(object sender, DragEventArgs e)
+        {
+            if (!e.Data.GetDataPresent(DataFormats.FileDrop)) return;
+            var planFiles = (e.Data.GetData(DataFormats.FileDrop) as string[])
+                ?.Where(IsPlanFile).ToArray();
+            if (planFiles == null || planFiles.Length == 0) return;
+            LoadMainWindowPlanFromFileIntoActiveTab(planFiles[0]);
+            for (var i = 1; i < planFiles.Length; i++)
+            {
+                var newTab = AddNewEmptyPlanSubTab();
+                try
+                {
+                    var xml = System.IO.File.ReadAllText(planFiles[i]);
+                    LoadPlanIntoSubTab(newTab, xml, System.IO.Path.GetFileName(planFiles[i]));
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"Failed to open file:\n\n{ex.Message}", "Error",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+        }
+
+        private void MainWindowPlanViewer_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == System.Windows.Input.Key.V &&
+                System.Windows.Input.Keyboard.Modifiers == System.Windows.Input.ModifierKeys.Control &&
+                e.OriginalSource is not System.Windows.Controls.TextBox)
+            {
+                var xml = Clipboard.GetText();
+                if (!string.IsNullOrWhiteSpace(xml))
+                {
+                    e.Handled = true;
+                    LoadPlanIntoActivePlanSubTab(xml, "Pasted Plan");
+                }
+            }
+        }
+
+        private void LoadMainWindowPlanFromFileIntoActiveTab(string path)
+        {
+            try
+            {
+                var xml = System.IO.File.ReadAllText(path);
+                LoadPlanIntoActivePlanSubTab(xml, System.IO.Path.GetFileName(path));
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Failed to open file:\n\n{ex.Message}", "Error",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void LoadPlanIntoActivePlanSubTab(string planXml, string label)
+        {
+            var activeSubTab = GetActivePlanSubTab();
+            if (activeSubTab != null)
+                LoadPlanIntoSubTab(activeSubTab, planXml, label);
+        }
+
+        private static bool IsPlanFile(string path)
+        {
+            var ext = System.IO.Path.GetExtension(path);
+            return string.Equals(ext, ".sqlplan", StringComparison.OrdinalIgnoreCase)
+                || string.Equals(ext, ".xml", StringComparison.OrdinalIgnoreCase);
+        }
+
+        #endregion
     }
 }
diff --git a/Dashboard/Models/PlanModels.cs b/Dashboard/Models/PlanModels.cs
index c6a6f87..57d6a25 100644
--- a/Dashboard/Models/PlanModels.cs
+++ b/Dashboard/Models/PlanModels.cs
@@ -110,6 +110,12 @@ public class PlanStatement
     public bool ExclusiveProfileTimeActive { get; set; }
     public string? OptimizationReplayScript { get; set; }
 
+    // QueryPlan-level MemoryGrant attribute (unsignedLong)
+    public long QueryPlanMemoryGrantKB { get; set; }
+
+    // StmtUseDb: USE database statement
+    public string? StmtUseDatabaseName { get; set; }
+
     // XSD gap: BaseStmtInfoType
     public int QueryCompilationReplay { get; set; }
 
@@ -272,8 +278,11 @@ public class PlanNode
     public string? ActionColumn { get; set; }
     public long ActualSegmentReads { get; set; }
     public long ActualSegmentSkips { get; set; }
-    public long UdfCpuTimeUs { get; set; }
-    public long UdfElapsedTimeUs { get; set; }
+    public long UdfCpuTimeMs { get; set; }
+    public long UdfElapsedTimeMs { get; set; }
+    public long InputMemoryGrantKB { get; set; }
+    public long OutputMemoryGrantKB { get; set; }
+    public long UsedMemoryGrantKB { get; set; }
 
     // XSD gap: RelOp-level metadata
     public bool GroupExecuted { get; set; }
@@ -317,6 +326,26 @@ public class PlanNode
     public string? RemoteSource { get; set; }
     public string? RemoteObject { get; set; }
     public string? RemoteQuery { get; set; }
+
+    // GuessedSelectivity — optimizer guessed selectivity on predicates
+    public bool GuessedSelectivity { get; set; }
+
+    // ForeignKeyReferenceCheck attributes
+    public int ForeignKeyReferencesCount { get; set; }
+    public int NoMatchingIndexCount { get; set; }
+    public int PartialMatchingIndexCount { get; set; }
+
+    // ConstantScan Values (parsed rows as displayable string)
+    public string? ConstantScanValues { get; set; }
+
+    // SpillOccurred detail flag (node-level, from Warnings element)
+    public bool SpillOccurredDetail { get; set; }
+
+    // UDX UsedUDXColumns (column references for CLR aggregate operators)
+    public string? UdxUsedColumns { get; set; }
+
+    // Row Goal: the optimizer's estimate before TOP/EXISTS reduced it
+    public double EstimateRowsWithoutRowGoal { get; set; }
 }
 
 public class MissingIndex
diff --git a/Dashboard/Models/UserPreferences.cs b/Dashboard/Models/UserPreferences.cs
index 37e48e6..01e5dd7 100644
--- a/Dashboard/Models/UserPreferences.cs
+++ b/Dashboard/Models/UserPreferences.cs
@@ -11,6 +11,9 @@ namespace PerformanceMonitorDashboard.Models
 {
     public class UserPreferences
     {
+        // Time display mode: ServerTime, LocalTime, UTC
+        public string TimeDisplayMode { get; set; } = "ServerTime";
+
         // Default date range preferences (hours back)
         public int DefaultHoursBack { get; set; } = 24;
 
@@ -111,6 +114,9 @@ private static string GetDefaultCsvSeparator()
         // Navigation settings
         public bool FocusServerTabOnClick { get; set; } = true;
 
+        // Color theme ("Dark" or "Light")
+        public string ColorTheme { get; set; } = "Dark";
+
         // Update check settings
         public bool CheckForUpdatesOnStartup { get; set; } = true;
 
diff --git a/Dashboard/ProcedureHistoryWindow.xaml b/Dashboard/ProcedureHistoryWindow.xaml
index 972006f..317faa8 100644
--- a/Dashboard/ProcedureHistoryWindow.xaml
+++ b/Dashboard/ProcedureHistoryWindow.xaml
@@ -86,7 +86,7 @@
                   Margin="10">
             <DataGrid.Columns>
                 <!-- Collection Info -->
-                <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                <DataGridTextColumn Binding="{Binding CollectionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -94,7 +94,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding LastExecutionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                <DataGridTextColumn Binding="{Binding LastExecutionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastExecutionTime" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -102,7 +102,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding CachedTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                <DataGridTextColumn Binding="{Binding CachedTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CachedTime" Click="Filter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/ProcedureHistoryWindow.xaml.cs b/Dashboard/ProcedureHistoryWindow.xaml.cs
index 8bf6243..0875f95 100644
--- a/Dashboard/ProcedureHistoryWindow.xaml.cs
+++ b/Dashboard/ProcedureHistoryWindow.xaml.cs
@@ -69,13 +69,21 @@ public ProcedureHistoryWindow(
 
             ProcedureIdentifierText.Text = $"Procedure Execution History: {objectName} in [{databaseName}]";
 
-            ApplyDarkModeToChart();
+            ApplyThemeToChart();
             Loaded += ProcedureHistoryWindow_Loaded;
+            Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
+            Closed += (s, e) => Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
         }
 
-        private void ApplyDarkModeToChart()
+        private void ApplyThemeToChart()
         {
-            Helpers.TabHelpers.ApplyDarkModeToChart(HistoryChart);
+            Helpers.TabHelpers.ApplyThemeToChart(HistoryChart);
+        }
+
+        private void OnThemeChanged(string _)
+        {
+            ApplyThemeToChart();
+            HistoryChart.Refresh();
         }
 
         private async void ProcedureHistoryWindow_Loaded(object sender, RoutedEventArgs e)
diff --git a/Dashboard/QueryExecutionHistoryWindow.xaml b/Dashboard/QueryExecutionHistoryWindow.xaml
index 55293b3..17f8c2b 100644
--- a/Dashboard/QueryExecutionHistoryWindow.xaml
+++ b/Dashboard/QueryExecutionHistoryWindow.xaml
@@ -88,7 +88,7 @@
                   Margin="10">
             <DataGrid.Columns>
                 <!-- Collection Info -->
-                <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                <DataGridTextColumn Binding="{Binding CollectionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="Filter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/QueryExecutionHistoryWindow.xaml.cs b/Dashboard/QueryExecutionHistoryWindow.xaml.cs
index 06f4fb7..33f7036 100644
--- a/Dashboard/QueryExecutionHistoryWindow.xaml.cs
+++ b/Dashboard/QueryExecutionHistoryWindow.xaml.cs
@@ -64,13 +64,21 @@ public QueryExecutionHistoryWindow(
 
             QueryIdentifierText.Text = $"Query Execution History: Query {queryId} in [{databaseName}]";
 
-            ApplyDarkModeToChart();
+            ApplyThemeToChart();
             Loaded += QueryExecutionHistoryWindow_Loaded;
+            Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
+            Closed += (s, e) => Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
         }
 
-        private void ApplyDarkModeToChart()
+        private void ApplyThemeToChart()
         {
-            Helpers.TabHelpers.ApplyDarkModeToChart(HistoryChart);
+            Helpers.TabHelpers.ApplyThemeToChart(HistoryChart);
+        }
+
+        private void OnThemeChanged(string _)
+        {
+            ApplyThemeToChart();
+            HistoryChart.Refresh();
         }
 
         private async void QueryExecutionHistoryWindow_Loaded(object sender, RoutedEventArgs e)
diff --git a/Dashboard/QueryStatsHistoryWindow.xaml b/Dashboard/QueryStatsHistoryWindow.xaml
index d222e41..19a30da 100644
--- a/Dashboard/QueryStatsHistoryWindow.xaml
+++ b/Dashboard/QueryStatsHistoryWindow.xaml
@@ -86,7 +86,7 @@
                   Margin="10">
             <DataGrid.Columns>
                 <!-- Collection Info -->
-                <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                <DataGridTextColumn Binding="{Binding CollectionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -94,7 +94,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding LastExecutionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                <DataGridTextColumn Binding="{Binding LastExecutionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastExecutionTime" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -102,7 +102,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding CreationTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                <DataGridTextColumn Binding="{Binding CreationTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CreationTime" Click="Filter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/QueryStatsHistoryWindow.xaml.cs b/Dashboard/QueryStatsHistoryWindow.xaml.cs
index 4e1b014..755c823 100644
--- a/Dashboard/QueryStatsHistoryWindow.xaml.cs
+++ b/Dashboard/QueryStatsHistoryWindow.xaml.cs
@@ -60,13 +60,21 @@ public QueryStatsHistoryWindow(
 
             QueryIdentifierText.Text = $"Query Stats History: {queryHash} in [{databaseName}]";
 
-            ApplyDarkModeToChart();
+            ApplyThemeToChart();
             Loaded += QueryStatsHistoryWindow_Loaded;
+            Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
+            Closed += (s, e) => Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
         }
 
-        private void ApplyDarkModeToChart()
+        private void ApplyThemeToChart()
         {
-            Helpers.TabHelpers.ApplyDarkModeToChart(HistoryChart);
+            Helpers.TabHelpers.ApplyThemeToChart(HistoryChart);
+        }
+
+        private void OnThemeChanged(string _)
+        {
+            ApplyThemeToChart();
+            HistoryChart.Refresh();
         }
 
         private async void QueryStatsHistoryWindow_Loaded(object sender, RoutedEventArgs e)
diff --git a/Dashboard/ServerTab.xaml b/Dashboard/ServerTab.xaml
index c9bffc0..a7ccd60 100644
--- a/Dashboard/ServerTab.xaml
+++ b/Dashboard/ServerTab.xaml
@@ -8,9 +8,6 @@
              xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF">
         <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
             <converters:NullToBooleanConverter x:Key="NullToBooleanConverter"/>
             <converters:StatusToBrushConverter x:Key="StatusToBrushConverter"/>
             <converters:LatencyToBrushConverter x:Key="LatencyToBrushConverter"/>
@@ -91,22 +88,22 @@
                 <!-- Row 1: Time Range Buttons -->
                 <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal">
                     <TextBlock Text="Time Range:" VerticalAlignment="Center" Margin="0,0,10,0" FontWeight="Bold" Foreground="{DynamicResource ForegroundBrush}"/>
-                    <Button x:Name="GlobalLast1HourButton" Content="1 Hour" Click="GlobalTimeRange_Click" Tag="1" Style="{StaticResource TimeRangeButton}"/>
-                    <Button x:Name="GlobalLast4HoursButton" Content="4 Hours" Click="GlobalTimeRange_Click" Tag="4" Style="{StaticResource TimeRangeButton}"/>
-                    <Button x:Name="GlobalLast8HoursButton" Content="8 Hours" Click="GlobalTimeRange_Click" Tag="8" Style="{StaticResource TimeRangeButton}"/>
-                    <Button x:Name="GlobalLast12HoursButton" Content="12 Hours" Click="GlobalTimeRange_Click" Tag="12" Style="{StaticResource TimeRangeButton}"/>
-                    <Button x:Name="GlobalLast24HoursButton" Content="24 Hours" Click="GlobalTimeRange_Click" Tag="24" Style="{StaticResource TimeRangeButton}"/>
-                    <Button x:Name="GlobalLast7DaysButton" Content="7 Days" Click="GlobalTimeRange_Click" Tag="168" Style="{StaticResource TimeRangeButton}"/>
-                    <Button x:Name="GlobalLast30DaysButton" Content="30 Days" Click="GlobalTimeRange_Click" Tag="720" Style="{StaticResource TimeRangeButton}"/>
+                    <Button x:Name="GlobalLast1HourButton" Content="1 Hour" Click="GlobalTimeRange_Click" Tag="1" Style="{DynamicResource TimeRangeButton}"/>
+                    <Button x:Name="GlobalLast4HoursButton" Content="4 Hours" Click="GlobalTimeRange_Click" Tag="4" Style="{DynamicResource TimeRangeButton}"/>
+                    <Button x:Name="GlobalLast8HoursButton" Content="8 Hours" Click="GlobalTimeRange_Click" Tag="8" Style="{DynamicResource TimeRangeButton}"/>
+                    <Button x:Name="GlobalLast12HoursButton" Content="12 Hours" Click="GlobalTimeRange_Click" Tag="12" Style="{DynamicResource TimeRangeButton}"/>
+                    <Button x:Name="GlobalLast24HoursButton" Content="24 Hours" Click="GlobalTimeRange_Click" Tag="24" Style="{DynamicResource TimeRangeButton}"/>
+                    <Button x:Name="GlobalLast7DaysButton" Content="7 Days" Click="GlobalTimeRange_Click" Tag="168" Style="{DynamicResource TimeRangeButton}"/>
+                    <Button x:Name="GlobalLast30DaysButton" Content="30 Days" Click="GlobalTimeRange_Click" Tag="720" Style="{DynamicResource TimeRangeButton}"/>
                 </StackPanel>
 
                 <!-- Row 1: Action Buttons and Status -->
                 <StackPanel Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Vertical" Margin="15,0,0,0">
                     <StackPanel Orientation="Horizontal">
-                        <Button x:Name="ApplyToAllButton" Content="Apply to All Tabs" Click="ApplyToAllTabs_Click" Margin="2,0" Padding="12,5" Style="{StaticResource AccentButton}"/>
-                        <Button x:Name="RefreshButton" Content="Refresh Tab" Click="RefreshButton_Click" Margin="2,0" Padding="12,5" Style="{StaticResource SuccessButton}"/>
+                        <Button x:Name="ApplyToAllButton" Content="Apply to All Tabs" Click="ApplyToAllTabs_Click" Margin="2,0" Padding="12,5" Style="{DynamicResource AccentButton}"/>
+                        <Button x:Name="RefreshButton" Content="Refresh Tab" Click="RefreshButton_Click" Margin="2,0" Padding="12,5" Style="{DynamicResource SuccessButton}"/>
                         <ToggleButton x:Name="AutoRefreshToggle" Content="Auto-Refresh: Off" Click="AutoRefreshToggle_Click" Margin="8,0,2,0" Padding="12,5" MinWidth="130" ToolTip="Toggle auto-refresh on/off. Configure interval in Settings."/>
-                        <Button Content="Edit Schedules" Click="EditSchedules_Click" Margin="8,0,2,0" Padding="12,5" Style="{StaticResource AccentButton}" ToolTip="Edit collector schedules (frequency, retention, enabled/disabled)"/>
+                        <Button Content="Edit Schedules" Click="EditSchedules_Click" Margin="8,0,2,0" Padding="12,5" Style="{DynamicResource AccentButton}" ToolTip="Edit collector schedules (frequency, retention, enabled/disabled)"/>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" Margin="2,4,0,0">
                         <TextBlock x:Name="GlobalDateRangeIndicator"
@@ -276,7 +273,7 @@
                                                     </StackPanel>
                                                 </DataGridTextColumn.Header>
                                             </DataGridTextColumn>
-                                            <DataGridTextColumn Binding="{Binding LastSuccessTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                                            <DataGridTextColumn Binding="{Binding LastSuccessTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                                                 <DataGridTextColumn.Header>
                                                     <StackPanel Orientation="Horizontal">
                                                         <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastSuccessTime" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
@@ -357,7 +354,7 @@
                                             <TextBlock Text="Job Name" FontWeight="Bold"/>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding StartTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                                    <DataGridTextColumn Binding="{Binding StartTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                                         <DataGridTextColumn.Header>
                                             <TextBlock Text="Start Time" FontWeight="Bold"/>
                                         </DataGridTextColumn.Header>
@@ -412,15 +409,28 @@
 
             <!-- Plan Viewer Tab -->
             <TabItem Header="Plan Viewer" x:Name="PlanViewerTabItem">
-                <Grid>
-                    <StackPanel x:Name="PlanEmptyState" HorizontalAlignment="Center"
-                                VerticalAlignment="Center">
-                        <TextBlock Text="No Plan Loaded" FontSize="20" FontWeight="Light"
-                                   Foreground="{DynamicResource ForegroundMutedBrush}" HorizontalAlignment="Center"/>
-                        <TextBlock Text="Right-click a query row and choose 'View Plan' or 'Get Actual Plan'"
-                                   FontSize="13" Foreground="{DynamicResource ForegroundMutedBrush}"
-                                   HorizontalAlignment="Center" Margin="0,8,0,0"/>
-                    </StackPanel>
+                <Grid Background="Transparent">
+                    <Grid x:Name="PlanEmptyState">
+                        <!-- Dashed drop-zone border fills the whole tab -->
+                        <Rectangle Margin="24"
+                                   Stroke="{DynamicResource ForegroundMutedBrush}"
+                                   StrokeThickness="1.5"
+                                   StrokeDashArray="6,4"
+                                   RadiusX="10" RadiusY="10"
+                                   Opacity="0.25"/>
+                        <!-- Centered content -->
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock Text="&#xE896;" FontFamily="Segoe MDL2 Assets" FontSize="52"
+                                       HorizontalAlignment="Center"
+                                       Foreground="{DynamicResource ForegroundMutedBrush}" Opacity="0.45"
+                                       Margin="0,0,0,12"/>
+                            <TextBlock Text="No Plan Loaded" FontSize="20" FontWeight="Light"
+                                       Foreground="{DynamicResource ForegroundMutedBrush}" HorizontalAlignment="Center"/>
+                            <TextBlock Text="Right-click a query row and choose 'View Plan' or 'Get Actual Plan'"
+                                       FontSize="13" Foreground="{DynamicResource ForegroundMutedBrush}"
+                                       HorizontalAlignment="Center" Margin="0,8,0,0"/>
+                        </StackPanel>
+                    </Grid>
                     <StackPanel x:Name="PlanLoadingState" HorizontalAlignment="Center"
                                 VerticalAlignment="Center" Visibility="Collapsed">
                         <ProgressBar IsIndeterminate="True" Width="200" Height="4" Margin="0,0,0,12"/>
@@ -590,7 +600,7 @@
                                       RowStyle="{StaticResource DefaultRowStyle}"
                                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
                                 <DataGrid.Columns>
-                                    <DataGridTextColumn Binding="{Binding EventTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                                    <DataGridTextColumn Binding="{Binding EventTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="EventTime" Click="BlockingEventsFilter_Click" Margin="0,0,4,0"/>
@@ -747,7 +757,7 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                                    <DataGridTextColumn Binding="{Binding CollectionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="BlockingEventsFilter_Click" Margin="0,0,4,0"/>
@@ -779,7 +789,7 @@
                                       RowStyle="{StaticResource DefaultRowStyle}"
                                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
                                 <DataGrid.Columns>
-                                    <DataGridTextColumn Binding="{Binding EventDate, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                                    <DataGridTextColumn Binding="{Binding EventDate, Converter={StaticResource ServerTimeConverter}}" Width="150">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="EventDate" Click="DeadlocksFilter_Click" Margin="0,0,4,0"/>
@@ -947,7 +957,7 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                                    <DataGridTextColumn Binding="{Binding CollectionTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="DeadlocksFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/ServerTab.xaml.cs b/Dashboard/ServerTab.xaml.cs
index 027631b..d1dd898 100644
--- a/Dashboard/ServerTab.xaml.cs
+++ b/Dashboard/ServerTab.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -86,6 +86,16 @@ public ServerTab(ServerConnection serverConnection, int utcOffsetMinutes = 0)
         {
             InitializeComponent();
 
+            // Apply theme immediately to every WpfPlot field in this control.
+            // Child UserControls (MemoryContent, ResourceMetricsContent, etc.) handle their own charts;
+            // this loop covers the charts declared directly in ServerTab.xaml (ResourceOverview*, Blocking*, etc.).
+            foreach (var field in GetType().GetFields(
+                System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance))
+            {
+                if (field.GetValue(this) is ScottPlot.WPF.WpfPlot chart)
+                    Helpers.TabHelpers.ApplyThemeToChart(chart);
+            }
+
             _resourceOverviewCpuHover = new Helpers.ChartHoverHelper(ResourceOverviewCpuChart, "%");
             _resourceOverviewMemoryHover = new Helpers.ChartHoverHelper(ResourceOverviewMemoryChart, "MB");
             _resourceOverviewIoHover = new Helpers.ChartHoverHelper(ResourceOverviewIoChart, "ms");
@@ -113,6 +123,7 @@ public ServerTab(ServerConnection serverConnection, int utcOffsetMinutes = 0)
             Loaded += ServerTab_Loaded;
             Unloaded += ServerTab_Unloaded;
             KeyDown += ServerTab_KeyDown;
+            Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
             Focusable = true;
 
             // Initialize Overview sub-tab UserControls
@@ -169,6 +180,20 @@ private void CancelPlanButton_Click(object sender, RoutedEventArgs e)
 
         private void OpenPlanTab(string planXml, string label, string? queryText = null)
         {
+            try
+            {
+                System.Xml.Linq.XDocument.Parse(planXml);
+            }
+            catch (System.Xml.XmlException ex)
+            {
+                MessageBox.Show(
+                    $"The plan XML is not valid:\n\n{ex.Message}",
+                    "Invalid Plan XML",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Warning);
+                return;
+            }
+
             HidePlanLoading();
             var viewer = new Controls.PlanViewerControl();
             viewer.LoadPlan(planXml, label, queryText);
@@ -315,13 +340,11 @@ private void SetupAutoRefresh()
                 _autoRefreshTimer.Start();
                 AutoRefreshToggle.IsChecked = true;
                 AutoRefreshToggle.Content = $"Auto-Refresh: {prefs.AutoRefreshIntervalSeconds}s";
-                AutoRefreshToggle.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#1A472A")); // Dark green when active
             }
             else
             {
                 AutoRefreshToggle.IsChecked = false;
                 AutoRefreshToggle.Content = "Auto-Refresh: Off";
-                AutoRefreshToggle.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2a2d35")); // Gray when inactive
             }
         }
 
@@ -332,11 +355,25 @@ private void ServerTab_Unloaded(object sender, RoutedEventArgs e)
             _autoRefreshTimer = null;
 
             // Unsubscribe event handlers to prevent memory leaks
+            Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
             Loaded -= ServerTab_Loaded;
             Unloaded -= ServerTab_Unloaded;
             KeyDown -= ServerTab_KeyDown;
         }
 
+        private void OnThemeChanged(string _)
+        {
+            foreach (var field in GetType().GetFields(
+                System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance))
+            {
+                if (field.GetValue(this) is ScottPlot.WPF.WpfPlot chart)
+                {
+                    Helpers.TabHelpers.ApplyThemeToChart(chart);
+                    chart.Refresh();
+                }
+            }
+        }
+
         public void RefreshAutoRefreshSettings()
         {
             // Stop existing timer
@@ -382,9 +419,9 @@ public void RefreshAutoRefreshSettings()
             }
         }
 
-        private void ApplyDarkModeToChart(ScottPlot.WPF.WpfPlot chart)
+        private void ApplyThemeToChart(ScottPlot.WPF.WpfPlot chart)
         {
-            TabHelpers.ApplyDarkModeToChart(chart);
+            TabHelpers.ApplyThemeToChart(chart);
         }
 
         private void AutoRefreshToggle_Click(object sender, RoutedEventArgs e)
@@ -422,7 +459,6 @@ private void AutoRefreshToggle_Click(object sender, RoutedEventArgs e)
                 };
                 _autoRefreshTimer.Start();
                 AutoRefreshToggle.Content = $"Auto-Refresh: {prefs.AutoRefreshIntervalSeconds}s";
-                AutoRefreshToggle.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#1A472A")); // Dark green when active
             }
             else
             {
@@ -433,7 +469,6 @@ private void AutoRefreshToggle_Click(object sender, RoutedEventArgs e)
                 _autoRefreshTimer?.Stop();
                 _autoRefreshTimer = null;
                 AutoRefreshToggle.Content = "Auto-Refresh: Off";
-                AutoRefreshToggle.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2a2d35")); // Gray when inactive
             }
         }
 
@@ -446,6 +481,19 @@ private async void ServerTab_KeyDown(object sender, System.Windows.Input.KeyEven
                     e.Handled = true;
                     await LoadDataAsync();
                 }
+                else if (e.Key == System.Windows.Input.Key.V &&
+                         System.Windows.Input.Keyboard.Modifiers == System.Windows.Input.ModifierKeys.Control &&
+                         e.OriginalSource is not System.Windows.Controls.TextBox &&
+                         PlanViewerTabItem.IsSelected)
+                {
+                    var xml = System.Windows.Clipboard.GetText();
+                    if (!string.IsNullOrWhiteSpace(xml))
+                    {
+                        e.Handled = true;
+                        OpenPlanTab(xml, "Pasted Plan");
+                        PlanViewerTabItem.IsSelected = true;
+                    }
+                }
             }
             catch (Exception ex)
             {
@@ -646,7 +694,7 @@ private void DatePicker_CalendarOpened(object sender, RoutedEventArgs e)
                     var popup = datePicker.Template.FindName("PART_Popup", datePicker) as System.Windows.Controls.Primitives.Popup;
                     if (popup?.Child is System.Windows.Controls.Calendar calendar)
                     {
-                        TabHelpers.ApplyDarkThemeToCalendar(calendar);
+                        TabHelpers.ApplyThemeToCalendar(calendar);
                     }
                 }));
             }
@@ -722,20 +770,24 @@ private string GetOriginalRangeText()
 
         private static string FormatDateRange(string prefix, DateTime from, DateTime to)
         {
-            // Same day: "Feb 7, 2:15 PM – 3:15 PM"
-            if (from.Date == to.Date)
+            var tz = Helpers.ServerTimeHelper.GetTimezoneLabel(Helpers.ServerTimeHelper.CurrentDisplayMode);
+            var displayFrom = Helpers.ServerTimeHelper.ConvertForDisplay(from, Helpers.ServerTimeHelper.CurrentDisplayMode);
+            var displayTo = Helpers.ServerTimeHelper.ConvertForDisplay(to, Helpers.ServerTimeHelper.CurrentDisplayMode);
+
+            // Same day: "Feb 7, 2:15 PM – 3:15 PM (PST)"
+            if (displayFrom.Date == displayTo.Date)
             {
-                return $"{prefix}: {from:MMM d, h:mm tt} – {to:h:mm tt}";
+                return $"{prefix}: {displayFrom:MMM d, h:mm tt} – {displayTo:h:mm tt} ({tz})";
             }
 
-            // Same year, different days: "Feb 6, 3:15 PM – Feb 7, 3:15 PM"
-            if (from.Year == to.Year)
+            // Same year, different days: "Feb 6, 3:15 PM – Feb 7, 3:15 PM (PST)"
+            if (displayFrom.Year == displayTo.Year)
             {
-                return $"{prefix}: {from:MMM d, h:mm tt} – {to:MMM d, h:mm tt}";
+                return $"{prefix}: {displayFrom:MMM d, h:mm tt} – {displayTo:MMM d, h:mm tt} ({tz})";
             }
 
-            // Different years: "Dec 31, 2025, 11:00 PM – Jan 1, 2026, 11:00 PM"
-            return $"{prefix}: {from:MMM d, yyyy, h:mm tt} – {to:MMM d, yyyy, h:mm tt}";
+            // Different years: "Dec 31, 2025, 11:00 PM – Jan 1, 2026, 11:00 PM (PST)"
+            return $"{prefix}: {displayFrom:MMM d, yyyy, h:mm tt} – {displayTo:MMM d, yyyy, h:mm tt} ({tz})";
         }
 
         private void StoreOriginalRangeIfNeeded()
@@ -837,22 +889,20 @@ private void ClearZoomStateWithoutRefresh()
 
         private void ClearTimeButtonHighlights()
         {
-            // Use dark theme background color (#404040)
-            var defaultBrush = new SolidColorBrush(Color.FromRgb(0x40, 0x40, 0x40));
             GlobalLast1HourButton.FontWeight = FontWeights.Normal;
-            GlobalLast1HourButton.Background = defaultBrush;
+            GlobalLast1HourButton.ClearValue(Control.BackgroundProperty);
             GlobalLast4HoursButton.FontWeight = FontWeights.Normal;
-            GlobalLast4HoursButton.Background = defaultBrush;
+            GlobalLast4HoursButton.ClearValue(Control.BackgroundProperty);
             GlobalLast8HoursButton.FontWeight = FontWeights.Normal;
-            GlobalLast8HoursButton.Background = defaultBrush;
+            GlobalLast8HoursButton.ClearValue(Control.BackgroundProperty);
             GlobalLast12HoursButton.FontWeight = FontWeights.Normal;
-            GlobalLast12HoursButton.Background = defaultBrush;
+            GlobalLast12HoursButton.ClearValue(Control.BackgroundProperty);
             GlobalLast24HoursButton.FontWeight = FontWeights.Normal;
-            GlobalLast24HoursButton.Background = defaultBrush;
+            GlobalLast24HoursButton.ClearValue(Control.BackgroundProperty);
             GlobalLast7DaysButton.FontWeight = FontWeights.Normal;
-            GlobalLast7DaysButton.Background = defaultBrush;
+            GlobalLast7DaysButton.ClearValue(Control.BackgroundProperty);
             GlobalLast30DaysButton.FontWeight = FontWeights.Normal;
-            GlobalLast30DaysButton.Background = defaultBrush;
+            GlobalLast30DaysButton.ClearValue(Control.BackgroundProperty);
         }
 
         private void HighlightTimeButton(int hours)
@@ -1449,7 +1499,7 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
             // Blocking Events Chart (raw per-interval count, not delta)
             BlockingStatsBlockingEventsChart.Plot.Clear();
             _blockingEventsHover?.Clear();
-            ApplyDarkModeToChart(BlockingStatsBlockingEventsChart);
+            ApplyThemeToChart(BlockingStatsBlockingEventsChart);
             var (blockingXs, blockingYs) = TabHelpers.FillTimeSeriesGaps(
                 orderedData.Select(d => d.CollectionTime),
                 orderedData.Select(d => (double)d.BlockingEventCount));
@@ -1478,7 +1528,7 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
             // Blocking Duration Chart (raw per-interval total, not delta)
             BlockingStatsDurationChart.Plot.Clear();
             _blockingDurationHover?.Clear();
-            ApplyDarkModeToChart(BlockingStatsDurationChart);
+            ApplyThemeToChart(BlockingStatsDurationChart);
             var (durationXs, durationYs) = TabHelpers.FillTimeSeriesGaps(
                 orderedData.Select(d => d.CollectionTime),
                 orderedData.Select(d => (double)d.TotalBlockingDurationMs));
@@ -1507,7 +1557,7 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
             // Deadlock Count Chart (raw per-interval count, not delta)
             BlockingStatsDeadlocksChart.Plot.Clear();
             _deadlocksHover?.Clear();
-            ApplyDarkModeToChart(BlockingStatsDeadlocksChart);
+            ApplyThemeToChart(BlockingStatsDeadlocksChart);
             var (deadlockXs, deadlockYs) = TabHelpers.FillTimeSeriesGaps(
                 orderedData.Select(d => d.CollectionTime),
                 orderedData.Select(d => (double)d.DeadlockCount));
@@ -1536,7 +1586,7 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
             // Deadlock Wait Time Chart (raw per-interval total, not delta)
             BlockingStatsDeadlockWaitTimeChart.Plot.Clear();
             _deadlockWaitTimeHover?.Clear();
-            ApplyDarkModeToChart(BlockingStatsDeadlockWaitTimeChart);
+            ApplyThemeToChart(BlockingStatsDeadlockWaitTimeChart);
             var (deadlockWaitXs, deadlockWaitYs) = TabHelpers.FillTimeSeriesGaps(
                 orderedData.Select(d => d.CollectionTime),
                 orderedData.Select(d => (double)d.TotalDeadlockWaitTimeMs));
@@ -1572,7 +1622,7 @@ private void UpdateCollectorDurationChart(List<CollectionLogEntry> data)
             }
             CollectorDurationChart.Plot.Clear();
             _collectorDurationHover?.Clear();
-            ApplyDarkModeToChart(CollectorDurationChart);
+            ApplyThemeToChart(CollectorDurationChart);
 
             if (data.Count == 0) { CollectorDurationChart.Refresh(); return; }
 
@@ -1627,7 +1677,7 @@ private void LoadLockWaitStatsChart(List<LockWaitStatsItem> data, int hoursBack,
             }
             LockWaitStatsChart.Plot.Clear();
             _lockWaitStatsHover?.Clear();
-            ApplyDarkModeToChart(LockWaitStatsChart);
+            ApplyThemeToChart(LockWaitStatsChart);
 
             // Get all unique time points across all wait types for gap filling
             // Group by wait type and plot each as a separate series
@@ -1688,7 +1738,7 @@ private void LoadCurrentWaitsDurationChart(List<WaitingTaskTrendItem> data, int
             }
             CurrentWaitsDurationChart.Plot.Clear();
             _currentWaitsDurationHover?.Clear();
-            ApplyDarkModeToChart(CurrentWaitsDurationChart);
+            ApplyThemeToChart(CurrentWaitsDurationChart);
 
             var waitTypes = data.Select(d => d.WaitType).Distinct().OrderBy(w => w).ToList();
             var colors = TabHelpers.ChartColors;
@@ -1745,7 +1795,7 @@ private void LoadCurrentWaitsBlockedChart(List<BlockedSessionTrendItem> data, in
             }
             CurrentWaitsBlockedChart.Plot.Clear();
             _currentWaitsBlockedHover?.Clear();
-            ApplyDarkModeToChart(CurrentWaitsBlockedChart);
+            ApplyThemeToChart(CurrentWaitsBlockedChart);
 
             var databases = data.Select(d => d.DatabaseName).Distinct().OrderBy(d => d).ToList();
             var colors = TabHelpers.ChartColors;
@@ -2089,7 +2139,7 @@ private void LoadResourceOverviewCpuChart(IEnumerable<CpuDataPoint> cpuData, int
             }
             ResourceOverviewCpuChart.Plot.Clear();
             _resourceOverviewCpuHover?.Clear();
-            ApplyDarkModeToChart(ResourceOverviewCpuChart);
+            ApplyThemeToChart(ResourceOverviewCpuChart);
 
             var dataList = cpuData?.OrderBy(d => d.SampleTime).ToList() ?? new List<CpuDataPoint>();
 
@@ -2141,7 +2191,7 @@ private void LoadResourceOverviewMemoryChart(IEnumerable<MemoryDataPoint> memory
             }
             ResourceOverviewMemoryChart.Plot.Clear();
             _resourceOverviewMemoryHover?.Clear();
-            ApplyDarkModeToChart(ResourceOverviewMemoryChart);
+            ApplyThemeToChart(ResourceOverviewMemoryChart);
 
             var dataList = memoryData?.OrderBy(d => d.CollectionTime).ToList() ?? new List<MemoryDataPoint>();
             // Buffer Pool series with gap filling
@@ -2203,7 +2253,7 @@ private void LoadResourceOverviewIoChart(IEnumerable<FileIoDataPoint> ioData, in
             }
             ResourceOverviewIoChart.Plot.Clear();
             _resourceOverviewIoHover?.Clear();
-            ApplyDarkModeToChart(ResourceOverviewIoChart);
+            ApplyThemeToChart(ResourceOverviewIoChart);
 
             var dataList = ioData?.OrderBy(d => d.CollectionTime).ToList() ?? new List<FileIoDataPoint>();
             int bucketMinutes = hoursBack <= 1 ? 1 : hoursBack <= 6 ? 5 : hoursBack <= 24 ? 15 : 60;
@@ -2281,7 +2331,7 @@ private void LoadResourceOverviewWaitChart(IEnumerable<WaitStatsDataPoint> waitD
             }
             ResourceOverviewWaitChart.Plot.Clear();
             _resourceOverviewWaitHover?.Clear();
-            ApplyDarkModeToChart(ResourceOverviewWaitChart);
+            ApplyThemeToChart(ResourceOverviewWaitChart);
 
             var dataList = waitData?.OrderBy(d => d.CollectionTime).ToList() ?? new List<WaitStatsDataPoint>();
 
diff --git a/Dashboard/Services/DataGridFilterService.cs b/Dashboard/Services/DataGridFilterService.cs
index 13e5293..f524697 100644
--- a/Dashboard/Services/DataGridFilterService.cs
+++ b/Dashboard/Services/DataGridFilterService.cs
@@ -118,18 +118,27 @@ public static bool MatchesFilter(object item, ColumnFilterState filter)
             var stringValue = rawValue?.ToString() ?? string.Empty;
             var filterValue = filter.Value ?? string.Empty;
 
-            // Handle comparison operators
+            // Split comma-separated values for text operators (e.g., "db1, db2")
+            var terms = filterValue.Split(',')
+                .Select(t => t.Trim())
+                .Where(t => !string.IsNullOrEmpty(t))
+                .ToArray();
+
+            if (terms.Length == 0)
+                return true;
+
+            // Text operators match ANY term, NotEquals excludes ALL terms
             return filter.Operator switch
             {
-                FilterOperator.Contains => stringValue.Contains(filterValue, StringComparison.OrdinalIgnoreCase),
-                FilterOperator.Equals => CompareValues(rawValue, filterValue, (a, b) => a == b),
-                FilterOperator.NotEquals => CompareValues(rawValue, filterValue, (a, b) => a != b),
+                FilterOperator.Contains => terms.Any(t => stringValue.Contains(t, StringComparison.OrdinalIgnoreCase)),
+                FilterOperator.Equals => terms.Any(t => CompareValues(rawValue, t, (a, b) => a == b)),
+                FilterOperator.NotEquals => terms.All(t => CompareValues(rawValue, t, (a, b) => a != b)),
                 FilterOperator.GreaterThan => CompareNumeric(rawValue, filterValue, (a, b) => a > b),
                 FilterOperator.GreaterThanOrEqual => CompareNumeric(rawValue, filterValue, (a, b) => a >= b),
                 FilterOperator.LessThan => CompareNumeric(rawValue, filterValue, (a, b) => a < b),
                 FilterOperator.LessThanOrEqual => CompareNumeric(rawValue, filterValue, (a, b) => a <= b),
-                FilterOperator.StartsWith => stringValue.StartsWith(filterValue, StringComparison.OrdinalIgnoreCase),
-                FilterOperator.EndsWith => stringValue.EndsWith(filterValue, StringComparison.OrdinalIgnoreCase),
+                FilterOperator.StartsWith => terms.Any(t => stringValue.StartsWith(t, StringComparison.OrdinalIgnoreCase)),
+                FilterOperator.EndsWith => terms.Any(t => stringValue.EndsWith(t, StringComparison.OrdinalIgnoreCase)),
                 _ => true
             };
         }
diff --git a/Dashboard/Services/DatabaseService.NocHealth.cs b/Dashboard/Services/DatabaseService.NocHealth.cs
index 7a98b65..4e711ef 100644
--- a/Dashboard/Services/DatabaseService.NocHealth.cs
+++ b/Dashboard/Services/DatabaseService.NocHealth.cs
@@ -563,7 +563,7 @@ SELECT TOP (3)
                     waiting_tasks_count_delta,
                     avg_ms_per_wait =
                         CASE WHEN waiting_tasks_count_delta > 0
-                        THEN CAST(wait_time_ms_delta AS decimal(19, 2)) / waiting_tasks_count_delta
+                        THEN CAST(CAST(wait_time_ms_delta AS decimal(19, 2)) / waiting_tasks_count_delta AS decimal(18, 4))
                         ELSE 0 END
                 FROM collect.wait_stats
                 WHERE wait_type IN (N'THREADPOOL', N'RESOURCE_SEMAPHORE', N'RESOURCE_SEMAPHORE_QUERY_COMPILE')
@@ -605,9 +605,22 @@ ORDER BY collection_time DESC
         /// </summary>
         private async Task<List<LongRunningQueryInfo>> GetLongRunningQueriesAsync(SqlConnection connection, int thresholdMinutes)
         {
-            const string query = @"SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-                SELECT TOP (5)
+            // Exclude internal SP_SERVER_DIAGNOSTICS queries by default, as they often run long and aren't actionable.
+            string spServerDiagnosticsFilter = "AND r.wait_type NOT LIKE N'%SP_SERVER_DIAGNOSTICS%'";
+
+            // Exclude WAITFOR queries by default, as they can run indefinitely and may not indicate a problem.
+            string waitForFilter = "AND r.wait_type NOT IN (N'WAITFOR', N'BROKER_RECEIVE_WAITFOR')";
+
+            // Exclude backup waits if specified, as they can run long and aren't typically actionable in this context.
+            string backupsFilter = "AND r.wait_type NOT IN (N'BACKUPTHREAD', N'BACKUPIO')";
+
+            // Exclude miscellaneous wait type that aren't typically actionable
+            string miscWaitsFilter = "AND r.wait_type NOT IN (N'XE_LIVE_TARGET_TVF')";
+
+            string query = @$"SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+                SELECT TOP(5)
                     r.session_id,
                     DB_NAME(r.database_id) AS database_name,
                     SUBSTRING(t.text, 1, 300) AS query_text,
@@ -621,10 +634,13 @@ SELECT TOP (5)
                 FROM sys.dm_exec_requests AS r
                 CROSS APPLY sys.dm_exec_sql_text(r.sql_handle) AS t
                 JOIN sys.dm_exec_sessions AS s ON s.session_id = r.session_id
-                WHERE r.session_id > 50
-                AND r.total_elapsed_time >= @thresholdMs
-                AND t.text NOT LIKE N'%waitfor delay%'
-                AND t.text NOT LIKE N'%waitfor receive%'
+                WHERE 
+                    r.session_id > 50
+                    AND r.total_elapsed_time >= @thresholdMs
+                    {spServerDiagnosticsFilter}
+                    {waitForFilter}
+                    {backupsFilter}
+                    {miscWaitsFilter}
                 ORDER BY r.total_elapsed_time DESC
                 OPTION(MAXDOP 1, RECOMPILE);";
 
diff --git a/Dashboard/Services/DatabaseService.QueryPerformance.cs b/Dashboard/Services/DatabaseService.QueryPerformance.cs
index 88e9045..6c3c2c8 100644
--- a/Dashboard/Services/DatabaseService.QueryPerformance.cs
+++ b/Dashboard/Services/DatabaseService.QueryPerformance.cs
@@ -2328,7 +2328,7 @@ GROUP BY
         )
         SELECT
             ed.collection_time,
-            executions_per_second = CAST(ed.total_execution_count AS decimal(19, 4)) / ed.interval_seconds
+            executions_per_second = CAST(CAST(ed.total_execution_count AS decimal(19, 4)) / ed.interval_seconds AS decimal(18, 4))
         FROM exec_deltas AS ed
         WHERE ed.interval_seconds > 0
         ORDER BY
@@ -2362,7 +2362,7 @@ GROUP BY
         )
         SELECT
             ed.collection_time,
-            executions_per_second = CAST(ed.total_execution_count AS decimal(19, 4)) / ed.interval_seconds
+            executions_per_second = CAST(CAST(ed.total_execution_count AS decimal(19, 4)) / ed.interval_seconds AS decimal(18, 4))
         FROM exec_deltas AS ed
         WHERE ed.interval_seconds > 0
         ORDER BY
@@ -2747,7 +2747,7 @@ WHERE ws.wait_type LIKE N'LCK%'
             wait_time_ms_per_second =
                 CASE
                     WHEN ld.interval_seconds > 0
-                    THEN CAST(ld.wait_time_ms_delta AS decimal(19, 4)) / ld.interval_seconds
+                    THEN CAST(CAST(ld.wait_time_ms_delta AS decimal(19, 4)) / ld.interval_seconds AS decimal(18, 4))
                     ELSE 0
                 END
         FROM lock_deltas AS ld
@@ -2790,7 +2790,7 @@ WHERE ws.wait_type LIKE N'LCK%'
             wait_time_ms_per_second =
                 CASE
                     WHEN ld.interval_seconds > 0
-                    THEN CAST(ld.wait_time_ms_delta AS decimal(19, 4)) / ld.interval_seconds
+                    THEN CAST(CAST(ld.wait_time_ms_delta AS decimal(19, 4)) / ld.interval_seconds AS decimal(18, 4))
                     ELSE 0
                 END
         FROM lock_deltas AS ld
diff --git a/Dashboard/Services/DatabaseService.ResourceMetrics.cs b/Dashboard/Services/DatabaseService.ResourceMetrics.cs
index a6b2bc2..4912092 100644
--- a/Dashboard/Services/DatabaseService.ResourceMetrics.cs
+++ b/Dashboard/Services/DatabaseService.ResourceMetrics.cs
@@ -444,13 +444,13 @@ AND   ws.wait_type IN (SELECT wait_type FROM top_waits)
                                 wait_time_ms_per_second =
                                     CASE
                                         WHEN wd.interval_seconds > 0
-                                        THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+                                        THEN CAST(CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds AS decimal(18, 4))
                                         ELSE 0
                                     END,
                                 signal_wait_time_ms_per_second =
                                     CASE
                                         WHEN wd.interval_seconds > 0
-                                        THEN CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+                                        THEN CAST(CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds AS decimal(18, 4))
                                         ELSE 0
                                     END,
                                 wd.waiting_tasks_count
@@ -521,13 +521,13 @@ AND   ws.wait_type IN (SELECT wait_type FROM top_waits)
                                 wait_time_ms_per_second =
                                     CASE
                                         WHEN wd.interval_seconds > 0
-                                        THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+                                        THEN CAST(CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds AS decimal(18, 4))
                                         ELSE 0
                                     END,
                                 signal_wait_time_ms_per_second =
                                     CASE
                                         WHEN wd.interval_seconds > 0
-                                        THEN CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+                                        THEN CAST(CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds AS decimal(18, 4))
                                         ELSE 0
                                     END,
                                 wd.waiting_tasks_count
@@ -1879,19 +1879,19 @@ FROM collect.wait_stats AS ws
     wait_time_ms_per_second =
         CASE
             WHEN wd.interval_seconds > 0
-            THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+            THEN CAST(CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds AS decimal(18, 4))
             ELSE 0
         END,
     signal_wait_time_ms_per_second =
         CASE
             WHEN wd.interval_seconds > 0
-            THEN CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+            THEN CAST(CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds AS decimal(18, 4))
             ELSE 0
         END,
     avg_ms_per_wait =
         CASE
             WHEN wd.waiting_tasks_delta > 0
-            THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.waiting_tasks_delta
+            THEN CAST(CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.waiting_tasks_delta AS decimal(18, 4))
             ELSE 0
         END
 FROM wait_deltas AS wd
@@ -1957,19 +1957,19 @@ FROM collect.wait_stats AS ws
     wait_time_ms_per_second =
         CASE
             WHEN wd.interval_seconds > 0
-            THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+            THEN CAST(CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds AS decimal(18, 4))
             ELSE 0
         END,
     signal_wait_time_ms_per_second =
         CASE
             WHEN wd.interval_seconds > 0
-            THEN CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+            THEN CAST(CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds AS decimal(18, 4))
             ELSE 0
         END,
     avg_ms_per_wait =
         CASE
             WHEN wd.waiting_tasks_delta > 0
-            THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.waiting_tasks_delta
+            THEN CAST(CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.waiting_tasks_delta AS decimal(18, 4))
             ELSE 0
         END
 FROM wait_deltas AS wd
@@ -2066,15 +2066,15 @@ FROM collect.wait_stats AS ws
     wd.wait_type,
     wait_time_ms_per_second =
         CASE WHEN wd.interval_seconds > 0
-        THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+        THEN CAST(CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds AS decimal(18, 4))
         ELSE 0 END,
     signal_wait_time_ms_per_second =
         CASE WHEN wd.interval_seconds > 0
-        THEN CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+        THEN CAST(CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds AS decimal(18, 4))
         ELSE 0 END,
     avg_ms_per_wait =
         CASE WHEN wd.waiting_tasks_delta > 0
-        THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.waiting_tasks_delta
+        THEN CAST(CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.waiting_tasks_delta AS decimal(18, 4))
         ELSE 0 END
 FROM wait_deltas AS wd
 WHERE wd.wait_time_ms_delta > 0
@@ -2124,15 +2124,15 @@ FROM collect.wait_stats AS ws
     wd.wait_type,
     wait_time_ms_per_second =
         CASE WHEN wd.interval_seconds > 0
-        THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+        THEN CAST(CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds AS decimal(18, 4))
         ELSE 0 END,
     signal_wait_time_ms_per_second =
         CASE WHEN wd.interval_seconds > 0
-        THEN CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds
+        THEN CAST(CAST(wd.signal_wait_time_ms_delta AS decimal(19, 4)) / wd.interval_seconds AS decimal(18, 4))
         ELSE 0 END,
     avg_ms_per_wait =
         CASE WHEN wd.waiting_tasks_delta > 0
-        THEN CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.waiting_tasks_delta
+        THEN CAST(CAST(wd.wait_time_ms_delta AS decimal(19, 4)) / wd.waiting_tasks_delta AS decimal(18, 4))
         ELSE 0 END
 FROM wait_deltas AS wd
 WHERE wd.wait_time_ms_delta > 0
diff --git a/Dashboard/Services/NotificationService.cs b/Dashboard/Services/NotificationService.cs
index 3a43394..5e30b33 100644
--- a/Dashboard/Services/NotificationService.cs
+++ b/Dashboard/Services/NotificationService.cs
@@ -27,37 +27,45 @@ public NotificationService(Window mainWindow, IUserPreferencesService? preferenc
         {
             _mainWindow = mainWindow;
             _preferencesService = preferencesService ?? new UserPreferencesService();
+            Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
         }
 
         public void Initialize()
         {
             // Dispose any existing icon first
-            _trayIcon?.Dispose();
+            if (_trayIcon != null)
+            {
+                _trayIcon.Visibility = Visibility.Collapsed;
+                _trayIcon.Dispose();
+                _trayIcon = null;
+            }
 
             _trayIcon = new TaskbarIcon();
 
-            /* Custom dark tooltip (native ToolTipText uses Windows light theme) */
+            bool HasLightBackground = Helpers.ThemeManager.HasLightBackground;
+
+            /* Custom tooltip styled to match current theme */
             _trayIcon.TrayToolTip = new Border
             {
-                Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#22252b")),
-                BorderBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#33363e")),
+                Background = new SolidColorBrush(HasLightBackground
+                    ? (Color)ColorConverter.ConvertFromString("#FFFFFF")
+                    : (Color)ColorConverter.ConvertFromString("#22252b")),
+                BorderBrush = new SolidColorBrush(HasLightBackground
+                    ? (Color)ColorConverter.ConvertFromString("#DEE2E6")
+                    : (Color)ColorConverter.ConvertFromString("#33363e")),
                 BorderThickness = new Thickness(1),
                 Padding = new Thickness(10, 8, 10, 8),
                 CornerRadius = new CornerRadius(4),
                 Child = new TextBlock
                 {
                     Text = "SQL Server Performance Monitor",
-                    Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB")),
+                    Foreground = new SolidColorBrush(HasLightBackground
+                        ? (Color)ColorConverter.ConvertFromString("#1A1D23")
+                        : (Color)ColorConverter.ConvertFromString("#E4E6EB")),
                     FontSize = 12
                 }
             };
 
-            // Load dark theme for context menu styling
-            var darkTheme = new ResourceDictionary
-            {
-                Source = new Uri("pack://application:,,,/Themes/DarkTheme.xaml", UriKind.Absolute)
-            };
-
             // Load icon from embedded resource using pack URI
             try
             {
@@ -69,9 +77,7 @@ public void Initialize()
                 // Icon loading failed, tray icon will be blank but functional
             }
 
-            // Create context menu with dark theme
             var contextMenu = new ContextMenu();
-            contextMenu.Resources.MergedDictionaries.Add(darkTheme);
 
             var showItem = new MenuItem
             {
@@ -280,17 +286,27 @@ protected virtual void Dispose(bool disposing)
         {
             if (_disposed) return;
 
-            if (disposing && _trayIcon != null)
+            if (disposing)
             {
-                // Hide the icon before disposing to ensure it's removed from tray
-                _trayIcon.Visibility = Visibility.Collapsed;
-                _trayIcon.Dispose();
-                _trayIcon = null;
+                Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
+
+                if (_trayIcon != null)
+                {
+                    // Hide the icon before disposing to ensure it's removed from tray
+                    _trayIcon.Visibility = Visibility.Collapsed;
+                    _trayIcon.Dispose();
+                    _trayIcon = null;
+                }
             }
 
             _disposed = true;
         }
 
+        private void OnThemeChanged(string theme)
+        {
+            _mainWindow.Dispatcher.InvokeAsync(Initialize);
+        }
+
     }
 
     public enum NotificationType
@@ -301,3 +317,4 @@ public enum NotificationType
         Error
     }
 }
+
diff --git a/Dashboard/Services/PlanAnalyzer.cs b/Dashboard/Services/PlanAnalyzer.cs
index 89a6568..ec03090 100644
--- a/Dashboard/Services/PlanAnalyzer.cs
+++ b/Dashboard/Services/PlanAnalyzer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using PerformanceMonitorDashboard.Models;
 
 namespace PerformanceMonitorDashboard.Services;
@@ -11,6 +12,23 @@ namespace PerformanceMonitorDashboard.Services;
 /// </summary>
 public static class PlanAnalyzer
 {
+    private static readonly Regex FunctionInPredicateRegex = new(
+        @"\b(CONVERT_IMPLICIT|CONVERT|CAST|isnull|coalesce|datepart|datediff|dateadd|year|month|day|upper|lower|ltrim|rtrim|trim|substring|left|right|charindex|replace|len|datalength|abs|floor|ceiling|round|reverse|stuff|format)\s*\(",
+        RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+    private static readonly Regex LeadingWildcardLikeRegex = new(
+        @"\blike\b[^'""]*?N?'%",
+        RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+    private static readonly Regex CaseInPredicateRegex = new(
+        @"\bCASE\s+(WHEN\b|$)",
+        RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+    // Matches CTE definitions: WITH name AS ( or , name AS (
+    private static readonly Regex CteDefinitionRegex = new(
+        @"(?:\bWITH\s+|\,\s*)(\w+)\s+AS\s*\(",
+        RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
     public static void Analyze(ParsedPlan plan)
     {
         foreach (var batch in plan.Batches)
@@ -20,7 +38,7 @@ public static void Analyze(ParsedPlan plan)
                 AnalyzeStatement(stmt);
 
                 if (stmt.RootNode != null)
-                    AnalyzeNodeTree(stmt.RootNode);
+                    AnalyzeNodeTree(stmt.RootNode, stmt);
             }
         }
     }
@@ -33,9 +51,9 @@ private static void AnalyzeStatement(PlanStatement stmt)
             var reason = stmt.NonParallelPlanReason switch
             {
                 "MaxDOPSetToOne" => "MAXDOP is set to 1",
-                "EstimatedDOPIsOne" => "Estimated DOP is 1",
+                "EstimatedDOPIsOne" => "Estimated DOP is 1 (the plan's estimated cost was below the cost threshold for parallelism)",
                 "NoParallelPlansInDesktopOrExpressEdition" => "Express/Desktop edition does not support parallelism",
-                "CouldNotGenerateValidParallelPlan" => "Optimizer could not generate a valid parallel plan",
+                "CouldNotGenerateValidParallelPlan" => "Optimizer could not generate a valid parallel plan. Common causes: scalar UDFs, inserts into table variables, certain system functions, or OPTION (MAXDOP 1) hints",
                 "QueryHintNoParallelSet" => "OPTION (MAXDOP 1) hint forces serial execution",
                 _ => stmt.NonParallelPlanReason
             };
@@ -43,7 +61,7 @@ private static void AnalyzeStatement(PlanStatement stmt)
             stmt.PlanWarnings.Add(new PlanWarning
             {
                 WarningType = "Serial Plan",
-                Message = $"Query forced to run serially: {reason}",
+                Message = $"Query running serially: {reason}.",
                 Severity = PlanWarningSeverity.Warning
             });
         }
@@ -57,12 +75,14 @@ private static void AnalyzeStatement(PlanStatement stmt)
             if (grant.GrantedMemoryKB > 0 && grant.MaxUsedMemoryKB > 0)
             {
                 var wasteRatio = (double)grant.GrantedMemoryKB / grant.MaxUsedMemoryKB;
-                if (wasteRatio >= 10 && grant.GrantedMemoryKB > 1024)
+                if (wasteRatio >= 10 && grant.GrantedMemoryKB >= 1048576)
                 {
+                    var grantMB = grant.GrantedMemoryKB / 1024.0;
+                    var usedMB = grant.MaxUsedMemoryKB / 1024.0;
                     stmt.PlanWarnings.Add(new PlanWarning
                     {
                         WarningType = "Excessive Memory Grant",
-                        Message = $"Granted {grant.GrantedMemoryKB:N0} KB but only used {grant.MaxUsedMemoryKB:N0} KB ({wasteRatio:F0}x overestimate). Wasted memory blocks other queries.",
+                        Message = $"Granted {grantMB:N0} MB but only used {usedMB:N0} MB ({wasteRatio:F0}x overestimate). The unused memory is reserved and unavailable to other queries.",
                         Severity = PlanWarningSeverity.Warning
                     });
                 }
@@ -74,30 +94,212 @@ private static void AnalyzeStatement(PlanStatement stmt)
                 stmt.PlanWarnings.Add(new PlanWarning
                 {
                     WarningType = "Memory Grant Wait",
-                    Message = $"Query waited {grant.GrantWaitTimeMs:N0}ms for a memory grant. Server may be under memory pressure.",
+                    Message = $"Query waited {grant.GrantWaitTimeMs:N0}ms for a memory grant before it could start running. Other queries were using all available workspace memory.",
                     Severity = grant.GrantWaitTimeMs >= 5000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
                 });
             }
+
+            // Large memory grant with sort/hash guidance
+            if (grant.GrantedMemoryKB >= 1048576 && stmt.RootNode != null)
+            {
+                var consumers = new List<string>();
+                FindMemoryConsumers(stmt.RootNode, consumers);
+
+                var grantMB = grant.GrantedMemoryKB / 1024.0;
+                var guidance = consumers.Count > 0
+                    ? $" Memory consumers: {string.Join(", ", consumers)}. Check whether these operators are processing more rows than necessary."
+                    : "";
+
+                stmt.PlanWarnings.Add(new PlanWarning
+                {
+                    WarningType = "Large Memory Grant",
+                    Message = $"Query granted {grantMB:F0} MB of memory.{guidance}",
+                    Severity = grantMB >= 4096 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+                });
+            }
+        }
+
+        // Rule 18: Compile memory exceeded (early abort)
+        if (stmt.StatementOptmEarlyAbortReason == "MemoryLimitExceeded")
+        {
+            stmt.PlanWarnings.Add(new PlanWarning
+            {
+                WarningType = "Compile Memory Exceeded",
+                Message = "Optimization was aborted early because the compile memory limit was exceeded. The plan is likely suboptimal. Simplify the query by breaking it into smaller steps using #temp tables.",
+                Severity = PlanWarningSeverity.Critical
+            });
+        }
+
+        // Rule 19: High compile CPU
+        if (stmt.CompileCPUMs >= 1000)
+        {
+            stmt.PlanWarnings.Add(new PlanWarning
+            {
+                WarningType = "High Compile CPU",
+                Message = $"Query took {stmt.CompileCPUMs:N0}ms of CPU just to compile a plan (before any data was read). Simplify the query by breaking it into smaller steps using #temp tables.",
+                Severity = stmt.CompileCPUMs >= 5000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 4 (statement-level): UDF execution timing from QueryTimeStats
+        // Some plans report UDF timing only at the statement level, not per-node.
+        if (stmt.QueryUdfCpuTimeMs > 0 || stmt.QueryUdfElapsedTimeMs > 0)
+        {
+            stmt.PlanWarnings.Add(new PlanWarning
+            {
+                WarningType = "UDF Execution",
+                Message = $"Scalar UDF cost in this statement: {stmt.QueryUdfElapsedTimeMs:N0}ms elapsed, {stmt.QueryUdfCpuTimeMs:N0}ms CPU. Scalar UDFs run once per row and prevent parallelism. Rewrite as an inline table-valued function, or dump results to a #temp table and apply the UDF only to the final result set.",
+                Severity = stmt.QueryUdfElapsedTimeMs >= 1000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 20: Local variables without RECOMPILE
+        // Parameters with no CompiledValue are likely local variables — the optimizer
+        // cannot sniff their values and uses density-based ("unknown") estimates.
+        if (stmt.Parameters.Count > 0)
+        {
+            var unsnifffedParams = stmt.Parameters
+                .Where(p => string.IsNullOrEmpty(p.CompiledValue))
+                .ToList();
+
+            if (unsnifffedParams.Count > 0)
+            {
+                var hasRecompile = stmt.StatementText.Contains("RECOMPILE", StringComparison.OrdinalIgnoreCase);
+                if (!hasRecompile)
+                {
+                    var names = string.Join(", ", unsnifffedParams.Select(p => p.Name));
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Local Variables",
+                        Message = $"Local variables detected: {names}. SQL Server cannot sniff local variable values at compile time, so it uses average density estimates instead of your actual values. Test with OPTION (RECOMPILE) to see if the plan improves. For a permanent fix, use dynamic SQL or a stored procedure to pass the values as parameters instead of local variables.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+        }
+
+        // Rule 21: CTE referenced multiple times
+        if (!string.IsNullOrEmpty(stmt.StatementText))
+        {
+            DetectMultiReferenceCte(stmt);
+        }
+
+        // Rule 27: OPTIMIZE FOR UNKNOWN in statement text
+        if (!string.IsNullOrEmpty(stmt.StatementText) &&
+            Regex.IsMatch(stmt.StatementText, @"OPTIMIZE\s+FOR\s+UNKNOWN", RegexOptions.IgnoreCase))
+        {
+            stmt.PlanWarnings.Add(new PlanWarning
+            {
+                WarningType = "Optimize For Unknown",
+                Message = "OPTIMIZE FOR UNKNOWN uses average density estimates instead of sniffed parameter values. This can help when parameter sniffing causes plan instability, but may produce suboptimal plans for skewed data distributions.",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 25: Ineffective parallelism — parallel plan where CPU ≈ elapsed
+        if (stmt.DegreeOfParallelism > 1 && stmt.QueryTimeStats != null)
+        {
+            var cpu = stmt.QueryTimeStats.CpuTimeMs;
+            var elapsed = stmt.QueryTimeStats.ElapsedTimeMs;
+
+            if (elapsed >= 1000 && cpu > 0)
+            {
+                var ratio = (double)cpu / elapsed;
+                if (ratio <= 1.3)
+                {
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Ineffective Parallelism",
+                        Message = $"Parallel plan (DOP {stmt.DegreeOfParallelism}) but CPU time ({cpu:N0}ms) is nearly equal to elapsed time ({elapsed:N0}ms). " +
+                                  $"The work ran essentially serially despite the overhead of parallelism. " +
+                                  $"Look for parallel thread skew, blocking exchanges, or serial zones in the plan that prevent effective parallel execution.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+        }
+
+        // Rule 30: Missing index quality evaluation
+        {
+            // Detect duplicate suggestions for the same table
+            var tableSuggestionCount = stmt.MissingIndexes
+                .GroupBy(mi => $"{mi.Schema}.{mi.Table}", StringComparer.OrdinalIgnoreCase)
+                .Where(g => g.Count() > 1)
+                .ToDictionary(g => g.Key, g => g.Count(), StringComparer.OrdinalIgnoreCase);
+
+            foreach (var mi in stmt.MissingIndexes)
+            {
+                var keyCount = mi.EqualityColumns.Count + mi.InequalityColumns.Count;
+                var includeCount = mi.IncludeColumns.Count;
+                var tableKey = $"{mi.Schema}.{mi.Table}";
+
+                // Low-impact suggestion (< 25% improvement)
+                if (mi.Impact < 25)
+                {
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Low Impact Index",
+                        Message = $"Missing index suggestion for {mi.Table} has only {mi.Impact:F0}% estimated impact. Low-impact indexes add maintenance overhead (insert/update/delete cost) that may not justify the modest query improvement.",
+                        Severity = PlanWarningSeverity.Info
+                    });
+                }
+
+                // Wide INCLUDE columns (> 5)
+                if (includeCount > 5)
+                {
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Wide Index Suggestion",
+                        Message = $"Missing index suggestion for {mi.Table} has {includeCount} INCLUDE columns. This is a \"kitchen sink\" index — SQL Server suggests covering every column the query touches, but the resulting index would be very wide and expensive to maintain. Evaluate which columns are actually needed, or consider a narrower index with fewer includes.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+                // Wide key columns (> 4)
+                else if (keyCount > 4)
+                {
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Wide Index Suggestion",
+                        Message = $"Missing index suggestion for {mi.Table} has {keyCount} key columns ({mi.EqualityColumns.Count} equality + {mi.InequalityColumns.Count} inequality). Wide key columns increase index size and maintenance cost. Evaluate whether all key columns are needed for seek predicates.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+
+                // Multiple suggestions for same table
+                if (tableSuggestionCount.TryGetValue(tableKey, out var count))
+                {
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Duplicate Index Suggestions",
+                        Message = $"{count} missing index suggestions target {mi.Table}. Multiple suggestions for the same table often overlap — consolidate into fewer, broader indexes rather than creating all of them.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                    // Only warn once per table
+                    tableSuggestionCount.Remove(tableKey);
+                }
+            }
         }
     }
 
-    private static void AnalyzeNodeTree(PlanNode node)
+    private static void AnalyzeNodeTree(PlanNode node, PlanStatement stmt)
     {
-        AnalyzeNode(node);
+        AnalyzeNode(node, stmt);
 
         foreach (var child in node.Children)
-            AnalyzeNodeTree(child);
+            AnalyzeNodeTree(child, stmt);
     }
 
-    private static void AnalyzeNode(PlanNode node)
+    private static void AnalyzeNode(PlanNode node, PlanStatement stmt)
     {
         // Rule 1: Filter operators — rows survived the tree just to be discarded
+        // Quantify the impact by summing child subtree cost (reads, CPU, time).
         if (node.PhysicalOp == "Filter" && !string.IsNullOrEmpty(node.Predicate))
         {
+            var impact = QuantifyFilterImpact(node);
             node.Warnings.Add(new PlanWarning
             {
                 WarningType = "Filter Operator",
-                Message = $"Filter discards rows late in the plan. Predicate: {Truncate(node.Predicate, 200)}",
+                Message = $"Filter operator discarding rows late in the plan.{impact} Predicate: {Truncate(node.Predicate, 200)}",
                 Severity = PlanWarningSeverity.Warning
             });
         }
@@ -106,45 +308,74 @@ private static void AnalyzeNode(PlanNode node)
         if (node.LogicalOp == "Eager Spool" &&
             node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase))
         {
-            var message = "Optimizer is building a temporary index at runtime. A permanent index may help.";
+            var message = "SQL Server is building a temporary index in TempDB at runtime because no suitable permanent index exists. This is expensive — it builds the index from scratch on every execution. Create a permanent index on the underlying table to eliminate this operator entirely.";
             if (!string.IsNullOrEmpty(node.SuggestedIndex))
-                message += $"\n\nSuggested index:\n{node.SuggestedIndex}";
+                message += $"\n\nCreate this index:\n{node.SuggestedIndex}";
 
             node.Warnings.Add(new PlanWarning
             {
                 WarningType = "Eager Index Spool",
                 Message = message,
-                Severity = PlanWarningSeverity.Warning
+                Severity = PlanWarningSeverity.Critical
             });
         }
 
         // Rule 4: UDF timing — any node spending time in UDFs (actual plans)
-        if (node.UdfCpuTimeUs > 0 || node.UdfElapsedTimeUs > 0)
+        if (node.UdfCpuTimeMs > 0 || node.UdfElapsedTimeMs > 0)
         {
-            var cpuMs = node.UdfCpuTimeUs / 1000.0;
-            var elapsedMs = node.UdfElapsedTimeUs / 1000.0;
             node.Warnings.Add(new PlanWarning
             {
                 WarningType = "UDF Execution",
-                Message = $"Scalar UDF executing on this operator. UDF elapsed: {elapsedMs:F1}ms, UDF CPU: {cpuMs:F1}ms",
-                Severity = elapsedMs >= 1000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+                Message = $"Scalar UDF executing on this operator ({node.UdfElapsedTimeMs:N0}ms elapsed, {node.UdfCpuTimeMs:N0}ms CPU). Scalar UDFs run once per row and prevent parallelism. Rewrite as an inline table-valued function, or dump the query results to a #temp table first and apply the UDF only to the final result set.",
+                Severity = node.UdfElapsedTimeMs >= 1000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
             });
         }
 
         // Rule 5: Large estimate vs actual row gaps (actual plans only)
+        // Only warn when the bad estimate actually causes observable harm:
+        // - The node itself spilled (Sort/Hash with bad memory grant)
+        // - A parent join may have chosen the wrong strategy
+        // - Root nodes with no parent to harm are skipped
+        // - Nodes whose only parents are Parallelism/Top/Sort (no spill) are skipped
         if (node.HasActualStats && node.EstimateRows > 0)
         {
-            var ratio = node.ActualRows / node.EstimateRows;
-            if (ratio >= 10.0 || ratio <= 0.1)
+            if (node.ActualRows == 0)
             {
-                var direction = ratio >= 10.0 ? "underestimated" : "overestimated";
-                var factor = ratio >= 10.0 ? ratio : 1.0 / ratio;
-                node.Warnings.Add(new PlanWarning
+                // Zero rows is always worth noting — resources were allocated for nothing
+                if (node.EstimateRows >= 100)
                 {
-                    WarningType = "Row Estimate Mismatch",
-                    Message = $"Estimated {node.EstimateRows:N0} rows, actual {node.ActualRows:N0} ({factor:F0}x {direction}). May cause poor plan choices.",
-                    Severity = factor >= 100 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
-                });
+                    node.Warnings.Add(new PlanWarning
+                    {
+                        WarningType = "Row Estimate Mismatch",
+                        Message = $"Estimated {node.EstimateRows:N0} rows but actual 0 rows returned. SQL Server allocated resources for rows that never materialized.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+            else
+            {
+                // Compare per-execution actuals to estimates (SQL Server estimates are per-execution)
+                var executions = node.ActualExecutions > 0 ? node.ActualExecutions : 1;
+                var actualPerExec = (double)node.ActualRows / executions;
+                var ratio = actualPerExec / node.EstimateRows;
+                if (ratio >= 10.0 || ratio <= 0.1)
+                {
+                    var harm = AssessEstimateHarm(node, ratio);
+                    if (harm != null)
+                    {
+                        var direction = ratio >= 10.0 ? "underestimated" : "overestimated";
+                        var factor = ratio >= 10.0 ? ratio : 1.0 / ratio;
+                        var actualDisplay = executions > 1
+                            ? $"actual {actualPerExec:N0}/exec ({node.ActualRows:N0} total across {executions:N0} executions)"
+                            : $"actual {node.ActualRows:N0}";
+                        node.Warnings.Add(new PlanWarning
+                        {
+                            WarningType = "Row Estimate Mismatch",
+                            Message = $"Estimated {node.EstimateRows:N0} rows, {actualDisplay} ({factor:F0}x {direction}). {harm}",
+                            Severity = factor >= 100 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+                        });
+                    }
+                }
             }
         }
 
@@ -155,61 +386,857 @@ private static void AnalyzeNode(PlanNode node)
             node.Warnings.Add(new PlanWarning
             {
                 WarningType = "Scalar UDF",
-                Message = $"Scalar {type} UDF reference: {udf.FunctionName}. Scalar UDFs execute row-by-row and prevent parallelism.",
+                Message = $"Scalar {type} UDF: {udf.FunctionName}. Scalar UDFs run once per row and prevent parallelism. Rewrite as an inline table-valued function, or dump results to a #temp table and apply the UDF only to the final result set.",
                 Severity = PlanWarningSeverity.Warning
             });
         }
 
-        // Rule 7: Spill detection — promote severity for large spills
+        // Rule 7: Spill detection — calculate operator time and set severity
+        // based on what percentage of statement elapsed time the spill accounts for.
+        // Exchange spills on Parallelism operators get special handling since their
+        // timing is unreliable but the write count tells the story.
         foreach (var w in node.Warnings.ToList())
         {
-            if (w.SpillDetails != null && w.SpillDetails.WritesToTempDb > 1000)
-                w.Severity = PlanWarningSeverity.Critical;
+            if (w.SpillDetails == null)
+                continue;
+
+            var isExchangeSpill = w.SpillDetails.SpillType == "Exchange";
+
+            if (isExchangeSpill)
+            {
+                // Exchange spills: severity based on write count since timing is unreliable
+                var writes = w.SpillDetails.WritesToTempDb;
+                if (writes >= 1_000_000)
+                    w.Severity = PlanWarningSeverity.Critical;
+                else if (writes >= 10_000)
+                    w.Severity = PlanWarningSeverity.Warning;
+
+                // Surface Parallelism operator time when available (actual plans)
+                if (node.ActualElapsedMs > 0)
+                {
+                    var operatorMs = GetParallelismOperatorElapsedMs(node);
+                    var stmtMs = stmt.QueryTimeStats?.ElapsedTimeMs ?? 0;
+                    if (stmtMs > 0 && operatorMs > 0)
+                    {
+                        var pct = (double)operatorMs / stmtMs;
+                        w.Message += $" Operator time: {operatorMs:N0}ms ({pct:P0} of statement).";
+                    }
+                }
+            }
+            else if (node.ActualElapsedMs > 0)
+            {
+                // Sort/Hash spills: severity based on operator time percentage
+                var operatorMs = GetOperatorOwnElapsedMs(node);
+                var stmtMs = stmt.QueryTimeStats?.ElapsedTimeMs ?? 0;
+
+                if (stmtMs > 0)
+                {
+                    var pct = (double)operatorMs / stmtMs;
+                    w.Message += $" Operator time: {operatorMs:N0}ms ({pct:P0} of statement).";
+
+                    if (pct >= 0.5)
+                        w.Severity = PlanWarningSeverity.Critical;
+                    else if (pct >= 0.1)
+                        w.Severity = PlanWarningSeverity.Warning;
+                }
+            }
         }
 
         // Rule 8: Parallel thread skew (actual plans with per-thread stats)
+        // Only warn when there are enough rows to meaningfully distribute across threads
         if (node.PerThreadStats.Count > 1)
         {
             var totalRows = node.PerThreadStats.Sum(t => t.ActualRows);
-            if (totalRows > 0)
+            var minRowsForSkew = node.PerThreadStats.Count * 1000;
+            if (totalRows >= minRowsForSkew)
             {
                 var maxThread = node.PerThreadStats.OrderByDescending(t => t.ActualRows).First();
                 var skewRatio = (double)maxThread.ActualRows / totalRows;
-                if (skewRatio >= 0.9 && node.PerThreadStats.Count >= 4)
+                var skewThreshold = node.PerThreadStats.Count == 2 ? 0.75 : 0.50;
+                if (skewRatio >= skewThreshold)
                 {
                     node.Warnings.Add(new PlanWarning
                     {
                         WarningType = "Parallel Skew",
-                        Message = $"Thread {maxThread.ThreadId} processed {skewRatio:P0} of rows ({maxThread.ActualRows:N0}/{totalRows:N0}). Work is heavily skewed to one thread.",
+                        Message = $"Thread {maxThread.ThreadId} processed {skewRatio:P0} of rows ({maxThread.ActualRows:N0}/{totalRows:N0}). Work is heavily skewed to one thread, so parallelism isn't helping much.",
                         Severity = PlanWarningSeverity.Warning
                     });
                 }
             }
         }
 
-        // Rule 10: Key Lookup with residual predicate
-        if (node.Lookup && !string.IsNullOrEmpty(node.Predicate))
+        // Rule 10: Key Lookup / RID Lookup with residual predicate
+        // Check RID Lookup first — it's more specific (PhysicalOp) and also has Lookup=true
+        if (node.PhysicalOp == "RID Lookup")
+        {
+            var message = "RID Lookup — this table is a heap (no clustered index). SQL Server found rows via a nonclustered index but had to follow row identifiers back to unordered heap pages. Heap lookups are more expensive than key lookups because pages are not sorted and may have forwarding pointers. Add a clustered index to the table.";
+            if (!string.IsNullOrEmpty(node.Predicate))
+                message += $" Predicate: {Truncate(node.Predicate, 200)}";
+
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "RID Lookup",
+                Message = message,
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+        else if (node.Lookup && !string.IsNullOrEmpty(node.Predicate))
         {
             node.Warnings.Add(new PlanWarning
             {
                 WarningType = "Key Lookup",
-                Message = $"Key Lookup with residual predicate. A covering index may eliminate this lookup. Predicate: {Truncate(node.Predicate, 200)}",
+                Message = $"Key Lookup — SQL Server found rows via a nonclustered index but had to go back to the clustered index for additional columns. Alter the nonclustered index to add the predicate column as a key column or as an INCLUDE column. Predicate: {Truncate(node.Predicate, 200)}",
                 Severity = PlanWarningSeverity.Warning
             });
         }
 
-        // Rule 11: Scan with residual predicate (not spools)
-        if (node.PhysicalOp.Contains("Scan", StringComparison.OrdinalIgnoreCase) &&
-            !node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase) &&
-            !string.IsNullOrEmpty(node.Predicate))
+        // Rule 12: Non-SARGable predicate on scan
+        var nonSargableReason = DetectNonSargablePredicate(node);
+        if (nonSargableReason != null)
+        {
+            var nonSargableAdvice = nonSargableReason switch
+            {
+                "Implicit conversion (CONVERT_IMPLICIT)" =>
+                    "Implicit conversion (CONVERT_IMPLICIT) prevents an index seek. Match the parameter or variable data type to the column data type.",
+                "ISNULL/COALESCE wrapping column" =>
+                    "ISNULL/COALESCE wrapping a column prevents an index seek. Rewrite the predicate to avoid wrapping the column, e.g. use \"WHERE col = @val OR col IS NULL\" instead of \"WHERE ISNULL(col, '') = @val\".",
+                "Leading wildcard LIKE pattern" =>
+                    "Leading wildcard LIKE prevents an index seek — SQL Server must scan every row. If substring search performance is critical, consider a full-text index or a trigram-based approach.",
+                "CASE expression in predicate" =>
+                    "CASE expression in a predicate prevents an index seek. Rewrite using separate WHERE clauses combined with OR, or split into multiple queries.",
+                _ when nonSargableReason.StartsWith("Function call") =>
+                    $"{nonSargableReason} prevents an index seek. Remove the function from the column side — apply it to the parameter instead, or create a computed column with the expression and index that.",
+                _ =>
+                    $"{nonSargableReason} prevents an index seek, forcing a scan."
+            };
+
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Non-SARGable Predicate",
+                Message = $"{nonSargableAdvice} Predicate: {Truncate(node.Predicate!, 200)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 11: Scan with residual predicate (skip if non-SARGable already flagged)
+        // A PROBE() alone is just a bitmap filter — not a real residual predicate.
+        if (nonSargableReason == null && IsRowstoreScan(node) && !string.IsNullOrEmpty(node.Predicate) &&
+            !IsProbeOnly(node.Predicate))
         {
             node.Warnings.Add(new PlanWarning
             {
                 WarningType = "Scan With Predicate",
-                Message = $"Scan filtering rows with a residual predicate. An index on the predicate columns may help. Predicate: {Truncate(node.Predicate, 200)}",
+                Message = $"Scan with residual predicate — SQL Server is reading every row and filtering after the fact. Create an index on the predicate columns. Predicate: {Truncate(node.Predicate, 200)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 13: Mismatched data types (GetRangeWithMismatchedTypes / GetRangeThroughConvert)
+        if (node.PhysicalOp == "Compute Scalar" && !string.IsNullOrEmpty(node.DefinedValues))
+        {
+            var hasMismatch = node.DefinedValues.Contains("GetRangeWithMismatchedTypes", StringComparison.OrdinalIgnoreCase);
+            var hasConvert = node.DefinedValues.Contains("GetRangeThroughConvert", StringComparison.OrdinalIgnoreCase);
+
+            if (hasMismatch || hasConvert)
+            {
+                var reason = hasMismatch
+                    ? "Mismatched data types between the column and the parameter/literal. SQL Server is converting every row to compare, preventing index seeks. Match your data types — don't pass nvarchar to a varchar column, or int to a bigint column."
+                    : "CONVERT/CAST wrapping a column in the predicate. SQL Server is converting every row to compare, preventing index seeks. Match your data types — convert the parameter/literal instead of the column.";
+
+                node.Warnings.Add(new PlanWarning
+                {
+                    WarningType = "Data Type Mismatch",
+                    Message = reason,
+                    Severity = PlanWarningSeverity.Warning
+                });
+            }
+        }
+
+        // Rule 14: Lazy Table Spool unfavorable rebind/rewind ratio
+        // Rebinds = cache misses (child re-executes), rewinds = cache hits (reuse cached result)
+        if (node.LogicalOp == "Lazy Spool")
+        {
+            var rebinds = node.HasActualStats ? (double)node.ActualRebinds : node.EstimateRebinds;
+            var rewinds = node.HasActualStats ? (double)node.ActualRewinds : node.EstimateRewinds;
+            var source = node.HasActualStats ? "actual" : "estimated";
+
+            if (rebinds > 100 && rewinds < rebinds * 5)
+            {
+                var severity = rewinds < rebinds
+                    ? PlanWarningSeverity.Critical
+                    : PlanWarningSeverity.Warning;
+
+                var ratio = rewinds > 0
+                    ? $"{rewinds / rebinds:F1}x rewinds (cache hits) per rebind (cache miss)"
+                    : "no rewinds (cache hits) at all";
+
+                node.Warnings.Add(new PlanWarning
+                {
+                    WarningType = "Lazy Spool Ineffective",
+                    Message = $"Lazy spool has low cache hit ratio ({source}): {rebinds:N0} rebinds (cache misses), {rewinds:N0} rewinds (cache hits) — {ratio}. The spool is caching results but rarely reusing them, adding overhead for no benefit.",
+                    Severity = severity
+                });
+            }
+        }
+
+        // Rule 15: Join OR clause
+        // Pattern: Nested Loops → Merge Interval → TopN Sort → [Compute Scalar] → Concatenation → [Compute Scalar] → 2+ Constant Scans
+        if (node.PhysicalOp == "Concatenation")
+        {
+            var constantScanBranches = node.Children
+                .Count(c => c.PhysicalOp == "Constant Scan" ||
+                            (c.PhysicalOp == "Compute Scalar" &&
+                             c.Children.Any(gc => gc.PhysicalOp == "Constant Scan")));
+
+            if (constantScanBranches >= 2 && IsOrExpansionChain(node))
+            {
+                node.Warnings.Add(new PlanWarning
+                {
+                    WarningType = "Join OR Clause",
+                    Message = $"OR in a join predicate. SQL Server rewrote the OR as {constantScanBranches} separate lookups, each evaluated independently — this multiplies the work on the inner side. Rewrite as separate queries joined with UNION ALL. For example, change \"FROM a JOIN b ON a.x = b.x OR a.y = b.y\" to \"FROM a JOIN b ON a.x = b.x UNION ALL FROM a JOIN b ON a.y = b.y\".",
+                    Severity = PlanWarningSeverity.Warning
+                });
+            }
+        }
+
+        // Rule 16: Nested Loops high inner-side execution count
+        // Deep analysis: combine execution count + outer estimate mismatch + inner cost
+        if (node.PhysicalOp == "Nested Loops" &&
+            node.LogicalOp.Contains("Join", StringComparison.OrdinalIgnoreCase) &&
+            !node.IsAdaptive &&
+            node.Children.Count >= 2)
+        {
+            var outerChild = node.Children[0];
+            var innerChild = node.Children[1];
+
+            if (innerChild.HasActualStats && innerChild.ActualExecutions > 100000)
+            {
+                var dop = stmt.DegreeOfParallelism > 0 ? stmt.DegreeOfParallelism : 1;
+                var details = new List<string>();
+
+                // Core fact
+                details.Add($"Nested Loops inner side executed {innerChild.ActualExecutions:N0} times (DOP {dop}).");
+
+                // Outer side estimate mismatch — explains WHY the optimizer chose NL
+                if (outerChild.HasActualStats && outerChild.EstimateRows > 0)
+                {
+                    var outerExecs = outerChild.ActualExecutions > 0 ? outerChild.ActualExecutions : 1;
+                    var outerActualPerExec = (double)outerChild.ActualRows / outerExecs;
+                    var outerRatio = outerActualPerExec / outerChild.EstimateRows;
+                    if (outerRatio >= 10.0)
+                    {
+                        details.Add($"Outer side: estimated {outerChild.EstimateRows:N0} rows, actual {outerActualPerExec:N0} ({outerRatio:F0}x underestimate). The optimizer chose Nested Loops expecting far fewer iterations.");
+                    }
+                }
+
+                // Inner side cost — reads and time spent doing the repeated work
+                long innerReads = SumSubtreeReads(innerChild);
+                if (innerReads > 0)
+                    details.Add($"Inner side total: {innerReads:N0} logical reads.");
+
+                if (innerChild.ActualElapsedMs > 0)
+                {
+                    var stmtMs = stmt.QueryTimeStats?.ElapsedTimeMs ?? 0;
+                    if (stmtMs > 0)
+                    {
+                        var pct = (double)innerChild.ActualElapsedMs / stmtMs * 100;
+                        details.Add($"Inner side time: {innerChild.ActualElapsedMs:N0}ms ({pct:N0}% of statement).");
+                    }
+                    else
+                    {
+                        details.Add($"Inner side time: {innerChild.ActualElapsedMs:N0}ms.");
+                    }
+                }
+
+                // Cause/recommendation
+                var hasParams = stmt.Parameters.Count > 0;
+                if (hasParams)
+                    details.Add("This may be caused by parameter sniffing — the optimizer chose Nested Loops based on a sniffed value that produced far fewer outer rows.");
+                else
+                    details.Add("Consider whether a hash or merge join would be more appropriate for this row count.");
+
+                node.Warnings.Add(new PlanWarning
+                {
+                    WarningType = "Nested Loops High Executions",
+                    Message = string.Join(" ", details),
+                    Severity = innerChild.ActualExecutions > 1000000
+                        ? PlanWarningSeverity.Critical
+                        : PlanWarningSeverity.Warning
+                });
+            }
+            // Estimated plans: the optimizer knew the row count and chose Nested Loops
+            // deliberately — don't second-guess it without actual execution data.
+        }
+
+        // Rule 17: Many-to-many Merge Join
+        // In actual plans, the Merge Join operator reports logical reads when the worktable is used.
+        // When ActualLogicalReads is 0, the worktable wasn't hit and the warning is noise.
+        if (node.ManyToMany && node.PhysicalOp.Contains("Merge", StringComparison.OrdinalIgnoreCase) &&
+            (!node.HasActualStats || node.ActualLogicalReads > 0))
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Many-to-Many Merge Join",
+                Message = node.HasActualStats
+                    ? $"Many-to-many Merge Join — SQL Server created a worktable in TempDB ({node.ActualLogicalReads:N0} logical reads) because both sides have duplicate values in the join columns."
+                    : "Many-to-many Merge Join — SQL Server will create a worktable in TempDB because both sides have duplicate values in the join columns.",
                 Severity = PlanWarningSeverity.Warning
             });
         }
+
+        // Rule 22: Table variables (Object name starts with @)
+        if (!string.IsNullOrEmpty(node.ObjectName) &&
+            node.ObjectName.StartsWith("@"))
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Table Variable",
+                Message = "Table variable detected. Table variables lack column-level statistics, which causes bad row estimates, join choices, and memory grant decisions. Replace with a #temp table.",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 23: Table-valued functions
+        if (node.LogicalOp == "Table-valued function")
+        {
+            var funcName = node.ObjectName ?? node.PhysicalOp;
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Table-Valued Function",
+                Message = $"Table-valued function: {funcName}. Multi-statement TVFs have no statistics — SQL Server guesses 1 row (pre-2017) or 100 rows (2017+) regardless of actual size. Rewrite as an inline table-valued function if possible, or dump the function results into a #temp table and join to that instead.",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 24: Top above a scan on the inner side of Nested Loops
+        // This pattern means the scan executes once per outer row, and the Top
+        // limits each iteration — but with no supporting index the scan is a
+        // linear search repeated potentially millions of times.
+        if (node.PhysicalOp == "Nested Loops" && node.Children.Count >= 2)
+        {
+            var inner = node.Children[1];
+
+            // Walk through pass-through operators to find Top
+            while (inner.PhysicalOp == "Compute Scalar" && inner.Children.Count > 0)
+                inner = inner.Children[0];
+
+            if (inner.PhysicalOp == "Top" && inner.Children.Count > 0)
+            {
+                // Walk through pass-through operators below the Top to find the scan
+                var scanCandidate = inner.Children[0];
+                while (scanCandidate.PhysicalOp == "Compute Scalar" && scanCandidate.Children.Count > 0)
+                    scanCandidate = scanCandidate.Children[0];
+
+                if (IsScanOperator(scanCandidate))
+                {
+                    var predInfo = !string.IsNullOrEmpty(scanCandidate.Predicate)
+                        ? " The scan has a residual predicate, so it may read many rows before the Top is satisfied."
+                        : "";
+                    inner.Warnings.Add(new PlanWarning
+                    {
+                        WarningType = "Top Above Scan",
+                        Message = $"Top operator reads from {scanCandidate.PhysicalOp} (Node {scanCandidate.NodeId}) on the inner side of Nested Loops (Node {node.NodeId}).{predInfo} Create an index on the predicate columns to convert the scan into a seek.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+        }
+
+        // Rule 26: Row Goal (informational) — optimizer reduced estimate due to TOP/EXISTS/IN
+        if (node.EstimateRowsWithoutRowGoal > 0 && node.EstimateRows > 0 &&
+            node.EstimateRowsWithoutRowGoal > node.EstimateRows)
+        {
+            var reduction = node.EstimateRowsWithoutRowGoal / node.EstimateRows;
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Row Goal",
+                Message = $"Row goal active: estimate reduced from {node.EstimateRowsWithoutRowGoal:N0} to {node.EstimateRows:N0} ({reduction:N0}x reduction) due to TOP, EXISTS, IN, or FAST hint. The optimizer chose this plan shape expecting to stop reading early. If the query reads all rows anyway, the plan choice may be suboptimal.",
+                Severity = PlanWarningSeverity.Info
+            });
+        }
+
+        // Rule 28: Row Count Spool — NOT IN with nullable column
+        // Pattern: Row Count Spool with high rewinds, child scan has IS NULL predicate,
+        // and statement text contains NOT IN
+        if (node.PhysicalOp == "Row Count Spool")
+        {
+            var rewinds = node.HasActualStats ? (double)node.ActualRewinds : node.EstimateRewinds;
+            if (rewinds > 10000 && HasNotInPattern(node, stmt))
+            {
+                node.Warnings.Add(new PlanWarning
+                {
+                    WarningType = "NOT IN with Nullable Column",
+                    Message = $"Row Count Spool with {rewinds:N0} rewinds. This pattern occurs when NOT IN is used with a nullable column — SQL Server cannot use an efficient Anti Semi Join because it must check for NULL values on every outer row. Rewrite as NOT EXISTS, or add WHERE column IS NOT NULL to the subquery.",
+                    Severity = rewinds > 1_000_000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+                });
+            }
+        }
+
+        // Rule 29: Enhance implicit conversion warnings — Seek Plan is more severe
+        foreach (var w in node.Warnings.ToList())
+        {
+            if (w.WarningType == "Implicit Conversion" && w.Message.StartsWith("Seek Plan", StringComparison.Ordinal))
+            {
+                w.Severity = PlanWarningSeverity.Critical;
+                w.Message = $"Implicit conversion prevented an index seek, forcing a scan instead. Fix the data type mismatch: ensure the parameter or variable type matches the column type exactly. {w.Message}";
+            }
+        }
+    }
+
+    /// <summary>
+    /// Detects the NOT IN with nullable column pattern: statement has NOT IN,
+    /// and a nearby Nested Loops Anti Semi Join has an IS NULL residual predicate.
+    /// Checks ancestors and their children (siblings of ancestors) since the IS NULL
+    /// predicate may be on a sibling Anti Semi Join rather than a direct parent.
+    /// </summary>
+    private static bool HasNotInPattern(PlanNode spoolNode, PlanStatement stmt)
+    {
+        // Check statement text for NOT IN
+        if (string.IsNullOrEmpty(stmt.StatementText) ||
+            !Regex.IsMatch(stmt.StatementText, @"\bNOT\s+IN\b", RegexOptions.IgnoreCase))
+            return false;
+
+        // Walk up the tree checking ancestors and their children
+        var parent = spoolNode.Parent;
+        while (parent != null)
+        {
+            if (IsAntiSemiJoinWithIsNull(parent))
+                return true;
+
+            // Check siblings: the IS NULL predicate may be on a sibling Anti Semi Join
+            // (e.g. outer NL Anti Semi Join has two children: inner NL Anti Semi Join + Row Count Spool)
+            foreach (var sibling in parent.Children)
+            {
+                if (sibling != spoolNode && IsAntiSemiJoinWithIsNull(sibling))
+                    return true;
+            }
+
+            parent = parent.Parent;
+        }
+
+        return false;
+    }
+
+    private static bool IsAntiSemiJoinWithIsNull(PlanNode node) =>
+        node.PhysicalOp == "Nested Loops" &&
+        node.LogicalOp.Contains("Anti Semi", StringComparison.OrdinalIgnoreCase) &&
+        !string.IsNullOrEmpty(node.Predicate) &&
+        node.Predicate.Contains("IS NULL", StringComparison.OrdinalIgnoreCase);
+
+    /// <summary>
+    /// Returns true for rowstore scan operators (Index Scan, Clustered Index Scan,
+    /// Table Scan). Excludes columnstore scans, spools, and constant scans.
+    /// </summary>
+    private static bool IsRowstoreScan(PlanNode node)
+    {
+        return node.PhysicalOp.Contains("Scan", StringComparison.OrdinalIgnoreCase) &&
+               !node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase) &&
+               !node.PhysicalOp.Contains("Constant", StringComparison.OrdinalIgnoreCase) &&
+               !node.PhysicalOp.Contains("Columnstore", StringComparison.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// Returns true when the predicate contains ONLY PROBE() bitmap filter(s)
+    /// with no real residual predicate. PROBE alone is a bitmap filter pushed
+    /// down from a hash join — not interesting by itself. If a real predicate
+    /// exists alongside PROBE (e.g. "[col]=(1) AND PROBE(...)"), returns false.
+    /// </summary>
+    private static bool IsProbeOnly(string predicate)
+    {
+        // Strip all PROBE(...) expressions — PROBE args can contain nested parens
+        var stripped = Regex.Replace(predicate, @"PROBE\s*\([^()]*(?:\([^()]*\)[^()]*)*\)", "",
+            RegexOptions.IgnoreCase).Trim();
+
+        // Remove leftover AND/OR connectors and whitespace
+        stripped = Regex.Replace(stripped, @"\b(AND|OR)\b", "", RegexOptions.IgnoreCase).Trim();
+
+        // If nothing meaningful remains, it was PROBE-only
+        return stripped.Length == 0;
+    }
+
+    /// <summary>
+    /// Returns true for any scan operator including columnstore.
+    /// Excludes spools and constant scans.
+    /// </summary>
+    private static bool IsScanOperator(PlanNode node)
+    {
+        return node.PhysicalOp.Contains("Scan", StringComparison.OrdinalIgnoreCase) &&
+               !node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase) &&
+               !node.PhysicalOp.Contains("Constant", StringComparison.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// Detects non-SARGable patterns in scan predicates.
+    /// Returns a description of the issue, or null if the predicate is fine.
+    /// </summary>
+    private static string? DetectNonSargablePredicate(PlanNode node)
+    {
+        if (string.IsNullOrEmpty(node.Predicate))
+            return null;
+
+        // Only check rowstore scan operators — columnstore is designed to be scanned
+        if (!IsRowstoreScan(node))
+            return null;
+
+        var predicate = node.Predicate;
+
+        // CASE expression in predicate — check first because CASE bodies
+        // often contain CONVERT_IMPLICIT that isn't the root cause
+        if (CaseInPredicateRegex.IsMatch(predicate))
+            return "CASE expression in predicate";
+
+        // CONVERT_IMPLICIT — most common non-SARGable pattern
+        if (predicate.Contains("CONVERT_IMPLICIT", StringComparison.OrdinalIgnoreCase))
+            return "Implicit conversion (CONVERT_IMPLICIT)";
+
+        // ISNULL / COALESCE wrapping column
+        if (Regex.IsMatch(predicate, @"\b(isnull|coalesce)\s*\(", RegexOptions.IgnoreCase))
+            return "ISNULL/COALESCE wrapping column";
+
+        // Common function calls on columns
+        var funcMatch = FunctionInPredicateRegex.Match(predicate);
+        if (funcMatch.Success)
+        {
+            var funcName = funcMatch.Groups[1].Value.ToUpperInvariant();
+            if (funcName != "CONVERT_IMPLICIT")
+                return $"Function call ({funcName}) on column";
+        }
+
+        // Leading wildcard LIKE
+        if (LeadingWildcardLikeRegex.IsMatch(predicate))
+            return "Leading wildcard LIKE pattern";
+
+        return null;
+    }
+
+    /// <summary>
+    /// Detects CTEs that are referenced more than once in the statement text.
+    /// Each reference re-executes the CTE since SQL Server does not materialize them.
+    /// </summary>
+    private static void DetectMultiReferenceCte(PlanStatement stmt)
+    {
+        var text = stmt.StatementText;
+        var cteMatches = CteDefinitionRegex.Matches(text);
+        if (cteMatches.Count == 0)
+            return;
+
+        foreach (Match match in cteMatches)
+        {
+            var cteName = match.Groups[1].Value;
+            if (string.IsNullOrEmpty(cteName))
+                continue;
+
+            // Count references as FROM/JOIN targets after the CTE definition
+            var refPattern = new Regex(
+                $@"\b(FROM|JOIN)\s+{Regex.Escape(cteName)}\b",
+                RegexOptions.IgnoreCase);
+            var refCount = refPattern.Matches(text).Count;
+
+            if (refCount > 1)
+            {
+                stmt.PlanWarnings.Add(new PlanWarning
+                {
+                    WarningType = "CTE Multiple References",
+                    Message = $"CTE \"{cteName}\" is referenced {refCount} times. SQL Server re-executes the entire CTE each time — it does not materialize the results. Materialize into a #temp table instead.",
+                    Severity = PlanWarningSeverity.Warning
+                });
+            }
+        }
+    }
+
+    /// <summary>
+    /// Verifies the OR expansion chain walking up from a Concatenation node:
+    /// Nested Loops → Merge Interval → TopN Sort → [Compute Scalar] → Concatenation
+    /// </summary>
+    private static bool IsOrExpansionChain(PlanNode concatenationNode)
+    {
+        // Walk up, skipping Compute Scalar
+        var parent = concatenationNode.Parent;
+        while (parent != null && parent.PhysicalOp == "Compute Scalar")
+            parent = parent.Parent;
+
+        // Expect TopN Sort
+        if (parent == null || parent.LogicalOp != "TopN Sort")
+            return false;
+
+        // Walk up to Merge Interval
+        parent = parent.Parent;
+        if (parent == null || parent.PhysicalOp != "Merge Interval")
+            return false;
+
+        // Walk up to Nested Loops
+        parent = parent.Parent;
+        if (parent == null || parent.PhysicalOp != "Nested Loops")
+            return false;
+
+        return true;
+    }
+
+    /// <summary>
+    /// Finds Sort and Hash Match operators in the tree that consume memory.
+    /// </summary>
+    private static void FindMemoryConsumers(PlanNode node, List<string> consumers)
+    {
+        if (node.PhysicalOp.Contains("Sort", StringComparison.OrdinalIgnoreCase) &&
+            !node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase))
+        {
+            var rows = node.HasActualStats
+                ? $"{node.ActualRows:N0} actual rows"
+                : $"{node.EstimateRows:N0} estimated rows";
+            consumers.Add($"Sort (Node {node.NodeId}, {rows})");
+        }
+        else if (node.PhysicalOp.Contains("Hash", StringComparison.OrdinalIgnoreCase))
+        {
+            var rows = node.HasActualStats
+                ? $"{node.ActualRows:N0} actual rows"
+                : $"{node.EstimateRows:N0} estimated rows";
+            consumers.Add($"Hash Match (Node {node.NodeId}, {rows})");
+        }
+
+        foreach (var child in node.Children)
+            FindMemoryConsumers(child, consumers);
+    }
+
+    /// <summary>
+    /// Calculates an operator's own elapsed time by subtracting child time.
+    /// In batch mode, operator times are self-contained (exclusive).
+    /// In row mode, times are cumulative (include all children below).
+    /// For parallel plans, we calculate self-time per-thread then take the max,
+    /// avoiding cross-thread subtraction errors.
+    /// Exchange operators accumulate downstream wait time (e.g. from spilling
+    /// children) so their self-time is unreliable — see sql.kiwi/2021/03.
+    /// </summary>
+    private static long GetOperatorOwnElapsedMs(PlanNode node)
+    {
+        if (node.ActualExecutionMode == "Batch")
+            return node.ActualElapsedMs;
+
+        // Parallel plan with per-thread data: calculate self-time per thread
+        if (node.PerThreadStats.Count > 1)
+            return GetPerThreadOwnElapsed(node);
+
+        // Serial row mode: subtract all direct children's elapsed time
+        return GetSerialOwnElapsed(node);
+    }
+
+    /// <summary>
+    /// Per-thread self-time calculation for parallel row mode operators.
+    /// For each thread: self = parent_elapsed[t] - sum(children_elapsed[t]).
+    /// Returns max across threads.
+    /// </summary>
+    private static long GetPerThreadOwnElapsed(PlanNode node)
+    {
+        // Build lookup: threadId -> parent elapsed for this node
+        var parentByThread = new Dictionary<int, long>();
+        foreach (var ts in node.PerThreadStats)
+            parentByThread[ts.ThreadId] = ts.ActualElapsedMs;
+
+        // Build lookup: threadId -> sum of all direct children's elapsed
+        var childSumByThread = new Dictionary<int, long>();
+        foreach (var child in node.Children)
+        {
+            var childNode = child;
+
+            // Exchange operators have unreliable times — look through to their child
+            if (child.PhysicalOp == "Parallelism" && child.Children.Count > 0)
+                childNode = child.Children.OrderByDescending(c => c.ActualElapsedMs).First();
+
+            foreach (var ts in childNode.PerThreadStats)
+            {
+                childSumByThread.TryGetValue(ts.ThreadId, out var existing);
+                childSumByThread[ts.ThreadId] = existing + ts.ActualElapsedMs;
+            }
+        }
+
+        // Self-time per thread = parent - children, take max across threads
+        var maxSelf = 0L;
+        foreach (var (threadId, parentMs) in parentByThread)
+        {
+            childSumByThread.TryGetValue(threadId, out var childMs);
+            var self = Math.Max(0, parentMs - childMs);
+            if (self > maxSelf) maxSelf = self;
+        }
+
+        return maxSelf;
+    }
+
+    /// <summary>
+    /// Serial row mode self-time: subtract all direct children's elapsed.
+    /// Exchange children are skipped through to their real child.
+    /// </summary>
+    private static long GetSerialOwnElapsed(PlanNode node)
+    {
+        var totalChildElapsed = 0L;
+        foreach (var child in node.Children)
+        {
+            var childElapsed = child.ActualElapsedMs;
+
+            // Exchange operators have unreliable times — skip to their child
+            if (child.PhysicalOp == "Parallelism" && child.Children.Count > 0)
+                childElapsed = child.Children.Max(c => c.ActualElapsedMs);
+
+            totalChildElapsed += childElapsed;
+        }
+
+        return Math.Max(0, node.ActualElapsedMs - totalChildElapsed);
+    }
+
+    /// <summary>
+    /// Calculates a Parallelism (exchange) operator's own elapsed time.
+    /// Exchange times are unreliable — they accumulate wait time caused by
+    /// downstream operators (e.g. spilling sorts). This returns a best-effort
+    /// value but callers should treat it with caution.
+    /// </summary>
+    private static long GetParallelismOperatorElapsedMs(PlanNode node)
+    {
+        if (node.Children.Count == 0)
+            return node.ActualElapsedMs;
+
+        if (node.PerThreadStats.Count > 1)
+            return GetPerThreadOwnElapsed(node);
+
+        var maxChildElapsed = node.Children.Max(c => c.ActualElapsedMs);
+        return Math.Max(0, node.ActualElapsedMs - maxChildElapsed);
+    }
+
+    /// <summary>
+    /// Quantifies the cost of work below a Filter operator by summing child subtree metrics.
+    /// </summary>
+    private static string QuantifyFilterImpact(PlanNode filterNode)
+    {
+        if (filterNode.Children.Count == 0)
+            return "";
+
+        var parts = new List<string>();
+
+        // Rows input vs output — how many rows did the filter discard?
+        var inputRows = filterNode.Children.Sum(c => c.ActualRows);
+        if (filterNode.HasActualStats && inputRows > 0 && filterNode.ActualRows < inputRows)
+        {
+            var discarded = inputRows - filterNode.ActualRows;
+            var pct = (double)discarded / inputRows * 100;
+            parts.Add($"{discarded:N0} of {inputRows:N0} rows discarded ({pct:N0}%)");
+        }
+
+        // Logical reads across the entire child subtree
+        long totalReads = 0;
+        foreach (var child in filterNode.Children)
+            totalReads += SumSubtreeReads(child);
+        if (totalReads > 0)
+            parts.Add($"{totalReads:N0} logical reads below");
+
+        // Elapsed time: use the direct child's time (cumulative in row mode, includes its children)
+        var childElapsed = filterNode.Children.Max(c => c.ActualElapsedMs);
+        if (childElapsed > 0)
+            parts.Add($"{childElapsed:N0}ms elapsed below");
+
+        if (parts.Count == 0)
+            return "";
+
+        return $" Subtree cost to produce filtered rows: {string.Join(", ", parts)}.";
+    }
+
+    private static long SumSubtreeReads(PlanNode node)
+    {
+        long reads = node.ActualLogicalReads;
+        foreach (var child in node.Children)
+            reads += SumSubtreeReads(child);
+        return reads;
+    }
+
+    /// <summary>
+    /// Determines whether a row estimate mismatch actually caused observable harm.
+    /// Returns a description of the harm, or null if the bad estimate is benign.
+    /// </summary>
+    private static string? AssessEstimateHarm(PlanNode node, double ratio)
+    {
+        // Root node: no parent to harm.
+        // The synthetic statement root (SELECT/INSERT/etc.) has NodeId == -1.
+        if (node.Parent == null || node.Parent.NodeId == -1)
+            return null;
+
+        // The node itself has a spill — bad estimate caused bad memory grant
+        if (HasSpillWarning(node))
+        {
+            return ratio >= 10.0
+                ? "The underestimate likely caused an insufficient memory grant, leading to a spill to TempDB."
+                : "The overestimate may have caused an excessive memory grant, wasting workspace memory.";
+        }
+
+        // Sort/Hash that did NOT spill — estimate was wrong but no observable harm
+        if ((node.PhysicalOp.Contains("Sort", StringComparison.OrdinalIgnoreCase) ||
+             node.PhysicalOp.Contains("Hash", StringComparison.OrdinalIgnoreCase)) &&
+            !HasSpillWarning(node))
+        {
+            return null;
+        }
+
+        // The node is a join — bad estimate means wrong join type or excessive work
+        // Adaptive joins (2017+) switch strategy at runtime, so the estimate didn't lock in a bad choice.
+        if (node.LogicalOp.Contains("Join", StringComparison.OrdinalIgnoreCase) && !node.IsAdaptive)
+        {
+            return ratio >= 10.0
+                ? "The underestimate may have caused the optimizer to choose a suboptimal join strategy."
+                : "The overestimate may have caused the optimizer to choose a suboptimal join strategy.";
+        }
+
+        // Walk up to check if a parent was harmed by this bad estimate
+        var ancestor = node.Parent;
+        while (ancestor != null)
+        {
+            // Transparent operators — skip through
+            if (ancestor.PhysicalOp == "Parallelism" ||
+                ancestor.PhysicalOp == "Compute Scalar" ||
+                ancestor.PhysicalOp == "Segment" ||
+                ancestor.PhysicalOp == "Sequence Project" ||
+                ancestor.PhysicalOp == "Top" ||
+                ancestor.PhysicalOp == "Filter")
+            {
+                ancestor = ancestor.Parent;
+                continue;
+            }
+
+            // Parent join — bad row count from below caused wrong join choice
+            // Adaptive joins handle this at runtime, so skip them.
+            if (ancestor.LogicalOp.Contains("Join", StringComparison.OrdinalIgnoreCase))
+            {
+                if (ancestor.IsAdaptive)
+                    return null; // Adaptive join self-corrects — no harm
+
+                return ratio >= 10.0
+                    ? $"The underestimate may have caused the optimizer to choose {ancestor.PhysicalOp} when a different join type would be more efficient."
+                    : $"The overestimate may have caused the optimizer to choose {ancestor.PhysicalOp} when a different join type would be more efficient.";
+            }
+
+            // Parent Sort/Hash that spilled — downstream bad estimate caused the spill
+            if (HasSpillWarning(ancestor))
+            {
+                return ratio >= 10.0
+                    ? $"The underestimate contributed to {ancestor.PhysicalOp} (Node {ancestor.NodeId}) spilling to TempDB."
+                    : $"The overestimate contributed to {ancestor.PhysicalOp} (Node {ancestor.NodeId}) receiving an excessive memory grant.";
+            }
+
+            // Parent Sort/Hash with no spill — benign
+            if (ancestor.PhysicalOp.Contains("Sort", StringComparison.OrdinalIgnoreCase) ||
+                ancestor.PhysicalOp.Contains("Hash", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            // Any other operator — stop walking
+            break;
+        }
+
+        // Default: the estimate is off but we can't identify specific harm
+        return null;
+    }
+
+    /// <summary>
+    /// Checks if a node has any spill-related warnings (Sort/Hash/Exchange spills).
+    /// </summary>
+    private static bool HasSpillWarning(PlanNode node)
+    {
+        return node.Warnings.Any(w => w.SpillDetails != null);
     }
 
     private static string Truncate(string value, int maxLength)
diff --git a/Dashboard/Services/ShowPlanParser.cs b/Dashboard/Services/ShowPlanParser.cs
index 6dfabd3..2177801 100644
--- a/Dashboard/Services/ShowPlanParser.cs
+++ b/Dashboard/Services/ShowPlanParser.cs
@@ -160,6 +160,10 @@ private static List<PlanStatement> ParseStatementAndChildren(XElement stmtEl)
             StatementEstRows = ParseDouble(stmtEl.Attribute("StatementEstRows")?.Value)
         };
 
+        // StmtUseDb: capture the Database attribute
+        if (stmtEl.Name.LocalName == "StmtUseDb")
+            stmt.StmtUseDatabaseName = stmtEl.Attribute("Database")?.Value;
+
         var queryPlanEl = stmtEl.Element(Ns + "QueryPlan");
 
         // XSD gap: Dispatcher/PSP (on StmtSimple, not inside QueryPlan)
@@ -436,6 +440,9 @@ private static void ParseQueryPlanElements(PlanStatement stmt, XElement stmtEl,
         stmt.DispatcherPlanHandle = queryPlanEl.Attribute("DispatcherPlanHandle")?.Value;
         stmt.ExclusiveProfileTimeActive = queryPlanEl.Attribute("ExclusiveProfileTimeActive")?.Value is "true" or "1";
 
+        // QueryPlan-level MemoryGrant attribute (unsignedLong)
+        stmt.QueryPlanMemoryGrantKB = ParseLong(queryPlanEl.Attribute("MemoryGrant")?.Value);
+
         // XSD gap: OptimizationReplay
         var optReplayEl = queryPlanEl.Element(Ns + "OptimizationReplay");
         if (optReplayEl != null)
@@ -637,7 +644,7 @@ private static PlanNode ParseRelOp(XElement relOpEl)
             {
                 var db = objEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
                 var schema = objEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
-                var table = objEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
+                var table = CleanTempTableName(objEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "");
                 var index = objEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
 
                 node.DatabaseName = db;
@@ -703,6 +710,10 @@ private static PlanNode ParseRelOp(XElement relOpEl)
             if (seekParts.Count > 0)
                 node.SeekPredicates = string.Join(" AND ", seekParts);
 
+            // GuessedSelectivity — check if optimizer guessed selectivity on predicates
+            if (ScopedDescendants(physicalOpEl, Ns + "GuessedSelectivity").Any())
+                node.GuessedSelectivity = true;
+
             // Residual predicate
             var predEl = physicalOpEl.Elements(Ns + "Predicate").FirstOrDefault();
             if (predEl != null)
@@ -824,8 +835,9 @@ private static PlanNode ParseRelOp(XElement relOpEl)
             // Table cardinality and rows to be read (on <RelOp> per XSD)
             node.TableCardinality = ParseDouble(relOpEl.Attribute("TableCardinality")?.Value);
             node.EstimatedRowsRead = ParseDouble(relOpEl.Attribute("EstimatedRowsRead")?.Value);
+            node.EstimateRowsWithoutRowGoal = ParseDouble(relOpEl.Attribute("EstimateRowsWithoutRowGoal")?.Value);
             if (node.EstimatedRowsRead == 0)
-                node.EstimatedRowsRead = ParseDouble(relOpEl.Attribute("EstimateRowsWithoutRowGoal")?.Value);
+                node.EstimatedRowsRead = node.EstimateRowsWithoutRowGoal;
 
             // TOP operator properties
             var topExprEl = physicalOpEl.Element(Ns + "TopExpression")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
@@ -1061,6 +1073,41 @@ private static PlanNode ParseRelOp(XElement relOpEl)
             node.RemoteSource = physicalOpEl.Attribute("RemoteSource")?.Value;
             node.RemoteObject = physicalOpEl.Attribute("RemoteObject")?.Value;
             node.RemoteQuery = physicalOpEl.Attribute("RemoteQuery")?.Value;
+
+            // ForeignKeyReferenceCheck attributes
+            node.ForeignKeyReferencesCount = (int)ParseDouble(physicalOpEl.Attribute("ForeignKeyReferencesCount")?.Value);
+            node.NoMatchingIndexCount = (int)ParseDouble(physicalOpEl.Attribute("NoMatchingIndexCount")?.Value);
+            node.PartialMatchingIndexCount = (int)ParseDouble(physicalOpEl.Attribute("PartialMatchingIndexCount")?.Value);
+
+            // ConstantScan Values — parse Values/Row/ScalarOperator children
+            var valuesEl = physicalOpEl.Element(Ns + "Values");
+            if (valuesEl != null)
+            {
+                var rowParts = new List<string>();
+                foreach (var rowEl in valuesEl.Elements(Ns + "Row"))
+                {
+                    var scalars = rowEl.Elements(Ns + "ScalarOperator")
+                        .Select(s => s.Attribute("ScalarString")?.Value ?? "")
+                        .Where(s => !string.IsNullOrEmpty(s));
+                    var rowStr = string.Join(", ", scalars);
+                    if (!string.IsNullOrEmpty(rowStr))
+                        rowParts.Add($"({rowStr})");
+                }
+                if (rowParts.Count > 0)
+                    node.ConstantScanValues = string.Join(", ", rowParts);
+            }
+
+            // UDX UsedUDXColumns — column references for CLR aggregate operators
+            var udxColsEl = physicalOpEl.Element(Ns + "UsedUDXColumns");
+            if (udxColsEl != null)
+            {
+                var udxCols = udxColsEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var udxColStr = string.Join(", ", udxCols);
+                if (!string.IsNullOrEmpty(udxColStr))
+                    node.UdxUsedColumns = udxColStr;
+            }
         }
 
         // Output columns
@@ -1083,6 +1130,11 @@ private static PlanNode ParseRelOp(XElement relOpEl)
         // Warnings
         node.Warnings = ParseWarnings(relOpEl);
 
+        // SpillOccurred detail flag (node-level boolean)
+        var warningsCheckEl = relOpEl.Element(Ns + "Warnings");
+        if (warningsCheckEl?.Element(Ns + "SpillOccurred") != null)
+            node.SpillOccurredDetail = true;
+
         // Wave 3.2: MemoryFractions (on RelOp)
         var memFracEl = relOpEl.Element(Ns + "MemoryFractions");
         if (memFracEl != null)
@@ -1129,6 +1181,7 @@ private static PlanNode ParseRelOp(XElement relOpEl)
             long totalLobLogicalReads = 0, totalLobPhysicalReads = 0, totalLobReadAheads = 0;
             long totalSegmentReads = 0, totalSegmentSkips = 0;
             long totalUdfCpu = 0, maxUdfElapsed = 0;
+            long maxInputMemoryGrant = 0, maxOutputMemoryGrant = 0, maxUsedMemoryGrant = 0;
             string? actualExecMode = null;
 
             foreach (var thread in runtimeEl.Elements(Ns + "RunTimeCountersPerThread"))
@@ -1156,6 +1209,14 @@ private static PlanNode ParseRelOp(XElement relOpEl)
                 var udfElapsed = ParseLong(thread.Attribute("UdfElapsedTime")?.Value);
                 if (udfElapsed > maxUdfElapsed) maxUdfElapsed = udfElapsed;
 
+                // Per-operator memory grant (same value on all threads, take max)
+                var inputMem = ParseLong(thread.Attribute("InputMemoryGrant")?.Value);
+                var outputMem = ParseLong(thread.Attribute("OutputMemoryGrant")?.Value);
+                var usedMem = ParseLong(thread.Attribute("UsedMemoryGrant")?.Value);
+                if (inputMem > maxInputMemoryGrant) maxInputMemoryGrant = inputMem;
+                if (outputMem > maxOutputMemoryGrant) maxOutputMemoryGrant = outputMem;
+                if (usedMem > maxUsedMemoryGrant) maxUsedMemoryGrant = usedMem;
+
                 actualExecMode ??= thread.Attribute("ActualExecutionMode")?.Value;
 
                 var elapsed = ParseLong(thread.Attribute("ActualElapsedms")?.Value);
@@ -1179,8 +1240,11 @@ private static PlanNode ParseRelOp(XElement relOpEl)
             node.ActualExecutionMode = actualExecMode;
             node.ActualSegmentReads = totalSegmentReads;
             node.ActualSegmentSkips = totalSegmentSkips;
-            node.UdfCpuTimeUs = totalUdfCpu;
-            node.UdfElapsedTimeUs = maxUdfElapsed;
+            node.UdfCpuTimeMs = totalUdfCpu;
+            node.UdfElapsedTimeMs = maxUdfElapsed;
+            node.InputMemoryGrantKB = maxInputMemoryGrant;
+            node.OutputMemoryGrantKB = maxOutputMemoryGrant;
+            node.UsedMemoryGrantKB = maxUsedMemoryGrant;
 
             // Store per-thread data for parallel skew analysis
             foreach (var thread in runtimeEl.Elements(Ns + "RunTimeCountersPerThread"))
@@ -1272,7 +1336,7 @@ private static List<MissingIndex> ParseMissingIndexes(XElement queryPlanEl)
                 {
                     Database = indexEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "") ?? "",
                     Schema = indexEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "") ?? "",
-                    Table = indexEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    Table = CleanTempTableName(indexEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? ""),
                     Impact = impact
                 };
 
@@ -1295,9 +1359,14 @@ private static List<MissingIndex> ParseMissingIndexes(XElement queryPlanEl)
                 var keyCols = mi.EqualityColumns.Concat(mi.InequalityColumns).ToList();
                 if (keyCols.Count > 0)
                 {
-                    var create = $"CREATE NONCLUSTERED INDEX [IX_{mi.Table}_{string.Join("_", keyCols.Take(3))}]\nON {mi.Schema}.{mi.Table} ({string.Join(", ", keyCols)})";
+                    var quotedKeyCols = keyCols.Select(c => $"[{c}]");
+                    var create = $"CREATE NONCLUSTERED INDEX [{mi.Table}_{string.Join("_", keyCols.Take(3))}]\nON [{mi.Schema}].[{mi.Table}] ({string.Join(", ", quotedKeyCols)})";
                     if (mi.IncludeColumns.Count > 0)
-                        create += $"\nINCLUDE ({string.Join(", ", mi.IncludeColumns)})";
+                    {
+                        var quotedIncludes = mi.IncludeColumns.Select(c => $"[{c}]");
+                        create += $"\nINCLUDE ({string.Join(", ", quotedIncludes)})";
+                    }
+                    create += ";";
                     mi.CreateStatement = create;
                 }
 
@@ -1365,77 +1434,96 @@ private static List<PlanWarning> ParseWarningsFromElement(XElement warningsEl)
             });
         }
 
-        // Spill to TempDb (with enhanced details — Wave 3.7)
-        foreach (var spillEl in warningsEl.Elements(Ns + "SpillToTempDb"))
-        {
-            var spillLevel = spillEl.Attribute("SpillLevel")?.Value ?? "?";
-            var threadCount = spillEl.Attribute("SpilledThreadCount")?.Value ?? "?";
-            var msg = $"Spill level {spillLevel}, {threadCount} thread(s)";
-
-            var grantedKB = ParseLong(spillEl.Attribute("GrantedMemoryKB")?.Value);
-            var usedKB = ParseLong(spillEl.Attribute("UsedMemoryKB")?.Value);
-            var writes = ParseLong(spillEl.Attribute("WritesToTempDb")?.Value);
-            var reads = ParseLong(spillEl.Attribute("ReadsFromTempDb")?.Value);
-            if (grantedKB > 0 || writes > 0)
-            {
-                msg += $" — Granted: {grantedKB:N0} KB, Used: {usedKB:N0} KB";
-                if (writes > 0) msg += $", Writes: {writes:N0}";
-                if (reads > 0) msg += $", Reads: {reads:N0}";
-            }
-
-            result.Add(new PlanWarning
-            {
-                WarningType = "Spill to TempDb",
-                Message = msg,
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
+        // Spill warnings — merge SpillToTempDb context (level, threads) into Sort/Hash detail warnings.
+        // SpillToTempDb has the level and thread count; SortSpillDetails/HashSpillDetails have the memory/IO.
+        // Combine them into a single warning per spill. Only emit standalone SpillToTempDb when no detail exists.
+        var spillToTempDbEl = warningsEl.Element(Ns + "SpillToTempDb");
+        var spillLevel = spillToTempDbEl?.Attribute("SpillLevel")?.Value ?? "?";
+        var spillThreads = spillToTempDbEl?.Attribute("SpilledThreadCount")?.Value ?? "?";
 
-        // Sort spill details
+        // Sort spill details (merged with SpillToTempDb context)
         foreach (var sortSpillEl in warningsEl.Elements(Ns + "SortSpillDetails"))
         {
+            var granted = ParseLong(sortSpillEl.Attribute("GrantedMemoryKb")?.Value);
+            var used = ParseLong(sortSpillEl.Attribute("UsedMemoryKb")?.Value);
+            var writes = ParseLong(sortSpillEl.Attribute("WritesToTempDb")?.Value);
+            var reads = ParseLong(sortSpillEl.Attribute("ReadsFromTempDb")?.Value);
+            var prefix = spillToTempDbEl != null
+                ? $"Sort spill level {spillLevel}, {spillThreads} thread(s)"
+                : "Sort spill";
             result.Add(new PlanWarning
             {
                 WarningType = "Sort Spill",
-                Message = $"Sort spill — Granted: {ParseLong(sortSpillEl.Attribute("GrantedMemoryKb")?.Value):N0} KB, Used: {ParseLong(sortSpillEl.Attribute("UsedMemoryKb")?.Value):N0} KB, Writes: {ParseLong(sortSpillEl.Attribute("WritesToTempDb")?.Value):N0}, Reads: {ParseLong(sortSpillEl.Attribute("ReadsFromTempDb")?.Value):N0}",
+                Message = $"{prefix} — Granted: {granted:N0} KB, Used: {used:N0} KB, Writes: {writes:N0}, Reads: {reads:N0}",
                 Severity = PlanWarningSeverity.Warning,
                 SpillDetails = new SpillDetail
                 {
                     SpillType = "Sort",
-                    GrantedMemoryKB = ParseLong(sortSpillEl.Attribute("GrantedMemoryKb")?.Value),
-                    UsedMemoryKB = ParseLong(sortSpillEl.Attribute("UsedMemoryKb")?.Value),
-                    WritesToTempDb = ParseLong(sortSpillEl.Attribute("WritesToTempDb")?.Value),
-                    ReadsFromTempDb = ParseLong(sortSpillEl.Attribute("ReadsFromTempDb")?.Value)
+                    GrantedMemoryKB = granted,
+                    UsedMemoryKB = used,
+                    WritesToTempDb = writes,
+                    ReadsFromTempDb = reads
                 }
             });
         }
 
-        // Hash spill details
+        // Hash spill details (merged with SpillToTempDb context)
         foreach (var hashSpillEl in warningsEl.Elements(Ns + "HashSpillDetails"))
         {
+            var granted = ParseLong(hashSpillEl.Attribute("GrantedMemoryKb")?.Value);
+            var used = ParseLong(hashSpillEl.Attribute("UsedMemoryKb")?.Value);
+            var writes = ParseLong(hashSpillEl.Attribute("WritesToTempDb")?.Value);
+            var reads = ParseLong(hashSpillEl.Attribute("ReadsFromTempDb")?.Value);
+            var prefix = spillToTempDbEl != null
+                ? $"Hash spill level {spillLevel}, {spillThreads} thread(s)"
+                : "Hash spill";
             result.Add(new PlanWarning
             {
                 WarningType = "Hash Spill",
-                Message = $"Hash spill — Granted: {ParseLong(hashSpillEl.Attribute("GrantedMemoryKb")?.Value):N0} KB, Used: {ParseLong(hashSpillEl.Attribute("UsedMemoryKb")?.Value):N0} KB, Writes: {ParseLong(hashSpillEl.Attribute("WritesToTempDb")?.Value):N0}, Reads: {ParseLong(hashSpillEl.Attribute("ReadsFromTempDb")?.Value):N0}",
+                Message = $"{prefix} — Granted: {granted:N0} KB, Used: {used:N0} KB, Writes: {writes:N0}, Reads: {reads:N0}",
                 Severity = PlanWarningSeverity.Warning,
                 SpillDetails = new SpillDetail
                 {
                     SpillType = "Hash",
-                    GrantedMemoryKB = ParseLong(hashSpillEl.Attribute("GrantedMemoryKb")?.Value),
-                    UsedMemoryKB = ParseLong(hashSpillEl.Attribute("UsedMemoryKb")?.Value),
-                    WritesToTempDb = ParseLong(hashSpillEl.Attribute("WritesToTempDb")?.Value),
-                    ReadsFromTempDb = ParseLong(hashSpillEl.Attribute("ReadsFromTempDb")?.Value)
+                    GrantedMemoryKB = granted,
+                    UsedMemoryKB = used,
+                    WritesToTempDb = writes,
+                    ReadsFromTempDb = reads
                 }
             });
         }
 
+        // Standalone SpillToTempDb — only when no Sort/Hash detail elements consumed the context
+        if (spillToTempDbEl != null &&
+            !warningsEl.Elements(Ns + "SortSpillDetails").Any() &&
+            !warningsEl.Elements(Ns + "HashSpillDetails").Any())
+        {
+            var msg = $"Spill level {spillLevel}, {spillThreads} thread(s)";
+            var grantedKB = ParseLong(spillToTempDbEl.Attribute("GrantedMemoryKB")?.Value);
+            var usedKB = ParseLong(spillToTempDbEl.Attribute("UsedMemoryKB")?.Value);
+            var writes = ParseLong(spillToTempDbEl.Attribute("WritesToTempDb")?.Value);
+            var reads = ParseLong(spillToTempDbEl.Attribute("ReadsFromTempDb")?.Value);
+            if (grantedKB > 0 || writes > 0)
+            {
+                msg += $" — Granted: {grantedKB:N0} KB, Used: {usedKB:N0} KB";
+                if (writes > 0) msg += $", Writes: {writes:N0}";
+                if (reads > 0) msg += $", Reads: {reads:N0}";
+            }
+            result.Add(new PlanWarning
+            {
+                WarningType = "Spill to TempDb",
+                Message = msg,
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
         // Exchange spill details
         foreach (var exchSpillEl in warningsEl.Elements(Ns + "ExchangeSpillDetails"))
         {
             result.Add(new PlanWarning
             {
                 WarningType = "Exchange Spill",
-                Message = $"Exchange spill — Writes: {ParseLong(exchSpillEl.Attribute("WritesToTempDb")?.Value):N0}",
+                Message = $"Exchange spill — {ParseLong(exchSpillEl.Attribute("WritesToTempDb")?.Value):N0} writes to TempDB. The parallel exchange operator ran out of memory buffers and spilled rows to disk. This typically means the memory grant was too small for the data volume flowing through this exchange.",
                 Severity = PlanWarningSeverity.Warning,
                 SpillDetails = new SpillDetail
                 {
@@ -1587,6 +1675,34 @@ private static string FormatColumnRef(XElement colRef)
         return result.Replace("[", "").Replace("]", "");
     }
 
+    /// <summary>
+    /// Strips the internal padding and hex session suffix from temp table names.
+    /// SQL Server internally pads #temp names with underscores to 116 chars, then appends a hex suffix.
+    /// e.g. "#comment_sil_vous_plait_______________________________0000000000A86" → "#comment_sil_vous_plait"
+    /// </summary>
+    private static string CleanTempTableName(string name)
+    {
+        if (name.Length == 0 || name[0] != '#') return name;
+
+        // Find the end of the real name: trim trailing hex suffix, then trailing underscores
+        // The hex suffix is 8-16 hex chars at the end; the padding is consecutive underscores before it
+        var i = name.Length - 1;
+
+        // Skip trailing hex digits (0-9, A-F, a-f)
+        while (i > 0 && IsHexDigit(name[i])) i--;
+
+        // Skip trailing underscores (the padding)
+        while (i > 0 && name[i] == '_') i--;
+
+        // Only clean if we actually removed a meaningful amount (at least 8 chars of padding+hex)
+        if (name.Length - i > 8)
+            return name[..(i + 1)];
+        return name;
+    }
+
+    private static bool IsHexDigit(char c) =>
+        (c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f');
+
     private static double ParseDouble(string? value)
     {
         if (string.IsNullOrEmpty(value)) return 0;
diff --git a/Dashboard/SettingsWindow.xaml b/Dashboard/SettingsWindow.xaml
index af29342..f955eff 100644
--- a/Dashboard/SettingsWindow.xaml
+++ b/Dashboard/SettingsWindow.xaml
@@ -85,7 +85,30 @@
                         <TextBlock Text="Navigation" FontWeight="Bold" FontSize="13" Margin="0,0,0,10"/>
                         <CheckBox x:Name="FocusServerTabCheckBox"
                                   Content="Focus server tab when clicking a server card"
-                                  Margin="0,0,0,0"/>
+                                  Margin="0,0,0,20"/>
+
+                        <!-- Time Display Section -->
+                        <TextBlock Text="Time Display" FontWeight="Bold" FontSize="13" Margin="0,0,0,10"/>
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,20">
+                            <TextBlock Text="Show timestamps in:" VerticalAlignment="Center" Margin="0,0,10,0"/>
+                            <ComboBox x:Name="TimeDisplayModeComboBox" Width="140">
+                                <ComboBoxItem Content="Server Time" Tag="ServerTime"/>
+                                <ComboBoxItem Content="Local Time" Tag="LocalTime"/>
+                                <ComboBoxItem Content="UTC" Tag="UTC"/>
+                            </ComboBox>
+                        </StackPanel>
+
+                        <!-- Color Theme Section -->
+                        <TextBlock Text="Color Theme" FontWeight="Bold" FontSize="13" Margin="0,0,0,10"/>
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
+                            <TextBlock Text="Theme:" VerticalAlignment="Center" Margin="0,0,10,0"/>
+                            <ComboBox x:Name="ColorThemeComboBox" Width="120"
+                                      SelectionChanged="ColorThemeComboBox_Changed">
+                                <ComboBoxItem Content="Dark" Tag="Dark"/>
+                                <ComboBoxItem Content="Light" Tag="Light"/>
+                                <ComboBoxItem Content="Cool Breeze" Tag="CoolBreeze"/>
+                            </ComboBox>
+                        </StackPanel>
                     </StackPanel>
                 </ScrollViewer>
             </TabItem>
diff --git a/Dashboard/SettingsWindow.xaml.cs b/Dashboard/SettingsWindow.xaml.cs
index 54f2e4e..86ac58d 100644
--- a/Dashboard/SettingsWindow.xaml.cs
+++ b/Dashboard/SettingsWindow.xaml.cs
@@ -20,6 +20,8 @@ public partial class SettingsWindow : Window
     {
         private readonly IUserPreferencesService _preferencesService;
         private bool _isLoading = true;
+        private readonly string _originalTheme = ThemeManager.CurrentTheme;
+        private bool _saved;
 
         public SettingsWindow(IUserPreferencesService preferencesService)
         {
@@ -104,6 +106,30 @@ private void LoadSettings()
             // Navigation settings
             FocusServerTabCheckBox.IsChecked = prefs.FocusServerTabOnClick;
 
+            // Time display mode
+            foreach (ComboBoxItem item in TimeDisplayModeComboBox.Items)
+            {
+                if (item.Tag?.ToString() == prefs.TimeDisplayMode)
+                {
+                    TimeDisplayModeComboBox.SelectedItem = item;
+                    break;
+                }
+            }
+            if (TimeDisplayModeComboBox.SelectedItem == null)
+                TimeDisplayModeComboBox.SelectedIndex = 0;
+
+            // Color theme
+            foreach (System.Windows.Controls.ComboBoxItem item in ColorThemeComboBox.Items)
+            {
+                if (item.Tag?.ToString() == prefs.ColorTheme)
+                {
+                    ColorThemeComboBox.SelectedItem = item;
+                    break;
+                }
+            }
+            if (ColorThemeComboBox.SelectedItem == null)
+                ColorThemeComboBox.SelectedIndex = 0;
+
             // Query logging settings
             LogSlowQueriesCheckBox.IsChecked = prefs.LogSlowQueries;
             QueryLogger.SetEnabled(prefs.LogSlowQueries);
@@ -183,6 +209,15 @@ private void DefaultTimeRangeComboBox_Changed(object sender, SelectionChangedEve
             // Just UI update, actual save happens on OK
         }
 
+        private void ColorThemeComboBox_Changed(object sender, SelectionChangedEventArgs e)
+        {
+            if (_isLoading) return;
+            if (ColorThemeComboBox.SelectedItem is ComboBoxItem item && item.Tag is string theme)
+            {
+                ThemeManager.Apply(theme);
+            }
+        }
+
         private void LogSlowQueriesCheckBox_Changed(object sender, RoutedEventArgs e)
         {
             if (_isLoading) return;
@@ -485,6 +520,20 @@ private void OkButton_Click(object sender, RoutedEventArgs e)
             // Save navigation settings
             prefs.FocusServerTabOnClick = FocusServerTabCheckBox.IsChecked == true;
 
+            // Save time display mode
+            if (TimeDisplayModeComboBox.SelectedItem is ComboBoxItem tdmItem && tdmItem.Tag != null)
+            {
+                prefs.TimeDisplayMode = tdmItem.Tag.ToString()!;
+                if (Enum.TryParse<TimeDisplayMode>(prefs.TimeDisplayMode, out var tdm))
+                    ServerTimeHelper.CurrentDisplayMode = tdm;
+            }
+
+            // Save color theme
+            if (ColorThemeComboBox.SelectedItem is ComboBoxItem themeItem && themeItem.Tag != null)
+            {
+                prefs.ColorTheme = themeItem.Tag.ToString()!;
+            }
+
             // Save query logging settings
             prefs.LogSlowQueries = LogSlowQueriesCheckBox.IsChecked == true;
             QueryLogger.SetEnabled(prefs.LogSlowQueries);
@@ -578,6 +627,7 @@ private void OkButton_Click(object sender, RoutedEventArgs e)
 
             _preferencesService.SavePreferences(prefs);
 
+            _saved = true;
             DialogResult = true;
             Close();
         }
@@ -588,6 +638,13 @@ private void CancelButton_Click(object sender, RoutedEventArgs e)
             Close();
         }
 
+        protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
+        {
+            if (!_saved)
+                ThemeManager.Apply(_originalTheme);
+            base.OnClosing(e);
+        }
+
         // ============================================
         // Email Alerts Tab
         // ============================================
diff --git a/Dashboard/Themes/CoolBreezeTheme.xaml b/Dashboard/Themes/CoolBreezeTheme.xaml
new file mode 100644
index 0000000..71b7078
--- /dev/null
+++ b/Dashboard/Themes/CoolBreezeTheme.xaml
@@ -0,0 +1,1263 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:helpers="clr-namespace:PerformanceMonitorDashboard.Helpers">
+
+    <!-- ============================================ -->
+    <!-- Darling Data Cool Breeze Theme                      -->
+    <!-- Flat/Minimal Design                          -->
+    <!-- ============================================ -->
+
+    <!-- Brand Colors -->
+    <Color x:Key="AccentColor">#1E6FA8</Color>
+    <Color x:Key="AccentHoverColor">#2B87C8</Color>
+    <Color x:Key="AccentPressedColor">#155A8A</Color>
+
+    <!-- Background Colors -->
+    <Color x:Key="BackgroundDarkColor">#CFDDE9</Color>
+    <Color x:Key="AlternatingRowColor">#C5D5E4</Color>
+    <Color x:Key="BackgroundColor">#DAE6F0</Color>
+    <Color x:Key="BackgroundLightColor">#EEF4FA</Color>
+    <Color x:Key="BackgroundLighterColor">#BDD0E1</Color>
+
+    <!-- Text Colors (dark on light backgrounds) -->
+    <Color x:Key="ForegroundColor">#1A2A3A</Color>
+    <Color x:Key="ForegroundDimColor">#364D61</Color>
+    <Color x:Key="ForegroundMutedColor">#5B7A90</Color>
+
+    <!-- Border Colors (subtle, low-contrast) -->
+    <Color x:Key="BorderColor">#A8BDD0</Color>
+    <Color x:Key="BorderLightColor">#8AACC4</Color>
+
+    <!-- Status Colors (Material Design 700 — visible against light backgrounds) -->
+    <Color x:Key="SuccessColor">#2E7D32</Color>
+    <Color x:Key="WarningColor">#F57F17</Color>
+    <Color x:Key="ErrorColor">#C62828</Color>
+    <Color x:Key="InfoColor">#1E6FA8</Color>
+
+    <!-- Spacing Scale -->
+    <sys:Double x:Key="SpacingXS">2</sys:Double>
+    <sys:Double x:Key="SpacingSm">4</sys:Double>
+    <sys:Double x:Key="SpacingMd">8</sys:Double>
+    <sys:Double x:Key="SpacingLg">12</sys:Double>
+    <sys:Double x:Key="SpacingXL">16</sys:Double>
+
+    <!-- Corner Radius -->
+    <CornerRadius x:Key="CornerRadiusSm">2</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusMd">4</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusLg">6</CornerRadius>
+
+    <!-- Brushes -->
+    <SolidColorBrush x:Key="AccentBrush" Color="{StaticResource AccentColor}"/>
+    <SolidColorBrush x:Key="AccentHoverBrush" Color="{StaticResource AccentHoverColor}"/>
+    <SolidColorBrush x:Key="AccentPressedBrush" Color="{StaticResource AccentPressedColor}"/>
+
+    <SolidColorBrush x:Key="BackgroundDarkBrush" Color="{StaticResource BackgroundDarkColor}"/>
+    <SolidColorBrush x:Key="AlternatingRowBrush" Color="{StaticResource AlternatingRowColor}"/>
+    <SolidColorBrush x:Key="BackgroundBrush" Color="{StaticResource BackgroundColor}"/>
+    <SolidColorBrush x:Key="BackgroundLightBrush" Color="{StaticResource BackgroundLightColor}"/>
+    <SolidColorBrush x:Key="BackgroundLighterBrush" Color="{StaticResource BackgroundLighterColor}"/>
+
+    <SolidColorBrush x:Key="ForegroundBrush" Color="{StaticResource ForegroundColor}"/>
+    <SolidColorBrush x:Key="ForegroundDimBrush" Color="{StaticResource ForegroundDimColor}"/>
+    <SolidColorBrush x:Key="ForegroundMutedBrush" Color="{StaticResource ForegroundColor}"/>
+
+    <SolidColorBrush x:Key="BorderBrush" Color="{StaticResource BorderColor}"/>
+    <SolidColorBrush x:Key="BorderLightBrush" Color="{StaticResource BorderLightColor}"/>
+
+    <SolidColorBrush x:Key="SuccessBrush" Color="{StaticResource SuccessColor}"/>
+    <SolidColorBrush x:Key="WarningBrush" Color="{StaticResource WarningColor}"/>
+    <SolidColorBrush x:Key="ErrorBrush" Color="{StaticResource ErrorColor}"/>
+    <SolidColorBrush x:Key="InfoBrush" Color="{StaticResource InfoColor}"/>
+
+    <!-- ============================================ -->
+    <!-- Window Style                                 -->
+    <!-- ============================================ -->
+    <Style TargetType="Window">
+        <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- TextBlock Style                              -->
+    <!-- ============================================ -->
+    <Style TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Label Style                                  -->
+    <!-- ============================================ -->
+    <Style TargetType="Label">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Button Style - Flat Design                   -->
+    <!-- ============================================ -->
+    <Style TargetType="Button">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="#1A2A3A"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="12,6"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetName="border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="{StaticResource BackgroundLighterColor}" Duration="0:0:0.12"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetName="border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="{StaticResource BackgroundLightColor}" Duration="0:0:0.12"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentPressedBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Accent Button Style (for primary actions) -->
+    <Style x:Key="AccentButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentPressedBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Time Range Button Style (hour picker with visible hover) -->
+    <Style x:Key="TimeRangeButton" TargetType="Button">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundDimBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="10,5"/>
+        <Setter Property="MinWidth" Value="60"/>
+        <Setter Property="Margin" Value="2,0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentPressedBrush}"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- No Data Message Style (for empty DataGrids) -->
+    <Style x:Key="NoDataMessage" TargetType="TextBlock">
+        <Setter Property="Text" Value="No data for selected time range"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Visibility" Value="Collapsed"/>
+    </Style>
+
+    <!-- Empty State Message Style (context-specific text set per usage) -->
+    <Style x:Key="EmptyStateMessage" TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Visibility" Value="Collapsed"/>
+    </Style>
+
+    <!-- Alert Badge Styles -->
+    <Style x:Key="AlertBadge" TargetType="Border">
+        <Setter Property="Background" Value="#D97706"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="4,1"/>
+        <Setter Property="Margin" Value="6,0,0,0"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <Style x:Key="AlertBadgeCritical" TargetType="Border">
+        <Setter Property="Background" Value="#DC2626"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="4,1"/>
+        <Setter Property="Margin" Value="6,0,0,0"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <!-- ToggleButton Style (respects Background in all states) -->
+    <Style TargetType="ToggleButton">
+        <Setter Property="Background" Value="#E8ECF0"/>
+        <Setter Property="Foreground" Value="#1A2A3A"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="12,5"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border x:Name="Border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            CornerRadius="2">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.85"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.7"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter Property="Background" Value="#2E7D32"/>
+                <Setter Property="Foreground" Value="White"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Tab Close Button Style -->
+    <Style x:Key="TabCloseButton" TargetType="Button">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Width" Value="22"/>
+        <Setter Property="Height" Value="22"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="6,0,0,0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="FontSize" Value="15"/>
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="ToolTip" Value="Close tab"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="3"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}">
+                        <TextBlock Text="×"
+                                   FontSize="{TemplateBinding FontSize}"
+                                   FontWeight="{TemplateBinding FontWeight}"
+                                   Foreground="{TemplateBinding Foreground}"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   Margin="0,-2,0,0"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#C42B1C"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#9A2316"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Success Button Style (for Refresh) -->
+    <Style x:Key="SuccessButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Background" Value="{StaticResource SuccessBrush}"/>
+        <Setter Property="Foreground" Value="#EEF4FA"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#5DBF60"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#3D9140"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- TextBox Style                                -->
+    <!-- ============================================ -->
+
+    <!-- Named style for filter TextBoxes in DataGrid column headers -->
+    <Style x:Key="FilterTextBoxStyle" TargetType="TextBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="#1A2A3A"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="4,2"/>
+        <Setter Property="CaretBrush" Value="#1A2A3A"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+    </Style>
+
+    <!-- Column Filter Button Style - small button with filter icon -->
+    <Style x:Key="ColumnFilterButtonStyle" TargetType="Button">
+        <Setter Property="Width" Value="18"/>
+        <Setter Property="Height" Value="18"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Content" Value="&#xE71C;"/>
+        <Setter Property="FontFamily" Value="Segoe MDL2 Assets"/>
+        <Setter Property="FontSize" Value="11"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundDimBrush}"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <ContentPresenter HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Column Filter Button Style when filter is active -->
+    <Style x:Key="ColumnFilterButtonActiveStyle" TargetType="Button" BasedOn="{StaticResource ColumnFilterButtonStyle}">
+        <Setter Property="Foreground" Value="#FFD700"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="#FFEC8B"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="TextBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TextBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            TextElement.Foreground="{StaticResource ForegroundBrush}">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Background="{StaticResource BackgroundDarkBrush}"
+                                      Margin="{TemplateBinding Padding}"
+                                      Foreground="{StaticResource ForegroundBrush}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- PasswordBox Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="PasswordBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Margin="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ComboBox Style                               -->
+    <!-- ============================================ -->
+    <ControlTemplate x:Key="ComboBoxToggleButton" TargetType="ToggleButton">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="20"/>
+            </Grid.ColumnDefinitions>
+            <Border x:Name="Border" Grid.ColumnSpan="2"
+                    Background="{StaticResource BackgroundDarkBrush}"
+                    BorderBrush="{StaticResource BorderBrush}"
+                    BorderThickness="1" CornerRadius="2"/>
+            <Border Grid.Column="0" Margin="1"
+                    Background="{StaticResource BackgroundDarkBrush}"
+                    BorderThickness="0"/>
+            <Path x:Name="Arrow" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
+                  Data="M 0 0 L 4 4 L 8 0 Z" Fill="{StaticResource ForegroundBrush}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style TargetType="ComboBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBox">
+                    <Grid>
+                        <ToggleButton x:Name="ToggleButton"
+                                      Template="{StaticResource ComboBoxToggleButton}"
+                                      Focusable="False"
+                                      IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ClickMode="Press"/>
+                        <ContentPresenter x:Name="ContentSite" IsHitTestVisible="False"
+                                          Content="{TemplateBinding SelectionBoxItem}"
+                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                          Margin="6,4,23,4" VerticalAlignment="Center" HorizontalAlignment="Left">
+                            <ContentPresenter.Resources>
+                                <Style TargetType="TextBlock">
+                                    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+                                </Style>
+                            </ContentPresenter.Resources>
+                        </ContentPresenter>
+                        <TextBox x:Name="PART_EditableTextBox"
+                                 Style="{x:Null}"
+                                 HorizontalAlignment="Left" VerticalAlignment="Center"
+                                 Margin="6,4,23,4" Focusable="True"
+                                 Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                 Visibility="Hidden" IsReadOnly="{TemplateBinding IsReadOnly}"/>
+                        <Popup x:Name="Popup" Placement="Bottom" IsOpen="{TemplateBinding IsDropDownOpen}"
+                               AllowsTransparency="True" Focusable="False" PopupAnimation="Slide">
+                            <Grid x:Name="DropDown" SnapsToDevicePixels="True"
+                                  MinWidth="{TemplateBinding ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <Border x:Name="DropDownBorder"
+                                        Background="{StaticResource BackgroundDarkBrush}"
+                                        BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"/>
+                                <ScrollViewer Margin="1" SnapsToDevicePixels="True">
+                                    <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained"/>
+                                </ScrollViewer>
+                            </Grid>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="ComboBoxItem">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBoxItem">
+                    <Border x:Name="Bd" Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- TabControl Style                             -->
+    <!-- ============================================ -->
+    <Style TargetType="TabControl">
+        <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+    </Style>
+
+    <Style TargetType="TabItem">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundDimBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="12,8"/>
+        <Setter Property="Margin" Value="0,0,2,0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TabItem">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="3,3,0,0"
+                            Padding="{TemplateBinding Padding}"
+                            Margin="{TemplateBinding Margin}">
+                        <ContentPresenter x:Name="contentPresenter"
+                                          ContentSource="Header"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentBrush}"/>
+                            <Setter Property="Foreground" Value="#EEF4FA"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- DataGrid Style                               -->
+    <!-- ============================================ -->
+    <Style TargetType="DataGrid">
+        <Setter Property="helpers:DataGridClipboardBehavior.FixHeaderCopy" Value="True"/>
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="ClipToBounds" Value="True"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="RowBackground" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="AlternatingRowBackground" Value="{StaticResource AlternatingRowBrush}"/>
+        <Setter Property="GridLinesVisibility" Value="Horizontal"/>
+        <Setter Property="HorizontalGridLinesBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="VerticalGridLinesBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="HeadersVisibility" Value="Column"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Visible"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Visible"/>
+    </Style>
+
+    <!-- Column header resize gripper -->
+    <Style x:Key="ColumnHeaderGripperStyle" TargetType="{x:Type Thumb}">
+        <Setter Property="Width" Value="8"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="SizeWE"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="DataGridColumnHeader">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0,0,1,1"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridColumnHeader">
+                    <Grid>
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <ContentPresenter Grid.Column="0"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="Center"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                <Path x:Name="SortArrow"
+                                      Grid.Column="1"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      Width="8" Height="6"
+                                      Margin="4,0,2,0"
+                                      Stretch="Fill"
+                                      Opacity="0.7"
+                                      Fill="{StaticResource ForegroundDimBrush}"
+                                      RenderTransformOrigin="0.5,0.5"
+                                      Visibility="Collapsed"
+                                      Data="M 0,0 L 8,0 L 4,6 Z"/>
+                            </Grid>
+                        </Border>
+                        <Thumb x:Name="PART_LeftHeaderGripper"
+                               HorizontalAlignment="Left"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                        <Thumb x:Name="PART_RightHeaderGripper"
+                               HorizontalAlignment="Right"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="SortDirection" Value="Ascending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="SortArrow" Property="RenderTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="SortDirection" Value="Descending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Column header style when filter is active - subtle blue highlight -->
+    <Style x:Key="FilteredColumnHeaderStyle" TargetType="DataGridColumnHeader"
+           BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+        <Setter Property="Background" Value="#9DBFD9"/>
+    </Style>
+
+    <!-- Right-aligned text style for numeric DataGrid columns -->
+    <Style x:Key="NumericCell" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+        <Setter Property="TextAlignment" Value="Right"/>
+    </Style>
+
+    <Style TargetType="DataGridCell">
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridCell">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
+                <Setter Property="Foreground" Value="#EEF4FA"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="DataGridRow">
+        <Setter Property="Background" Value="Transparent"/>
+        <Style.Triggers>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ListView Style                               -->
+    <!-- ============================================ -->
+    <Style TargetType="ListView">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+    </Style>
+
+    <Style TargetType="ListViewItem">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="Margin" Value="2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListViewItem">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                            <Setter TargetName="border" Property="BorderThickness" Value="1"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ScrollBar Style                              -->
+    <!-- ============================================ -->
+    <Style TargetType="ScrollBar">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Border Style for Panels                      -->
+    <!-- ============================================ -->
+    <Style x:Key="PanelBorder" TargetType="Border">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="6"/>
+        <Setter Property="Padding" Value="16"/>
+    </Style>
+
+    <!-- Card Style for Chart Containers -->
+    <Style x:Key="ChartCard" TargetType="Border">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="6"/>
+        <Setter Property="Margin" Value="6"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- DatePickerTextBox Style (internal control)   -->
+    <!-- ============================================ -->
+    <Style TargetType="DatePickerTextBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DatePickerTextBox">
+                    <Grid Background="{StaticResource BackgroundLightBrush}">
+                        <Border x:Name="Border"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}">
+                            <ScrollViewer x:Name="PART_ContentHost" Background="Transparent"
+                                          HorizontalContentAlignment="Stretch"
+                                          VerticalContentAlignment="Center"/>
+                        </Border>
+                        <!-- Watermark: hidden via Visibility=Collapsed -->
+                        <ContentControl x:Name="PART_Watermark"
+                                        Focusable="False"
+                                        IsHitTestVisible="False"
+                                        Visibility="Collapsed"
+                                        Foreground="{StaticResource ForegroundMutedBrush}"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- DatePicker Style                             -->
+    <!-- ============================================ -->
+    <Style TargetType="DatePicker">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="4,2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DatePicker">
+                    <Border x:Name="OuterBorder"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}">
+                        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <DatePickerTextBox x:Name="PART_TextBox"
+                                               Grid.Column="0"
+                                               Focusable="True"
+                                               HorizontalContentAlignment="Stretch"
+                                               VerticalContentAlignment="Center"
+                                               Background="Transparent"
+                                               Foreground="{StaticResource ForegroundBrush}"/>
+                            <Button x:Name="PART_Button"
+                                    Grid.Column="1"
+                                    Focusable="False"
+                                    Foreground="{StaticResource ForegroundBrush}"
+                                    Background="Transparent"
+                                    BorderThickness="0"
+                                    Padding="4,0">
+                                <Path Data="M0,0 L4,4 L8,0 Z"
+                                      Fill="{StaticResource ForegroundBrush}"
+                                      VerticalAlignment="Center"/>
+                            </Button>
+                            <Popup x:Name="PART_Popup"
+                                   AllowsTransparency="True"
+                                   Placement="Bottom"
+                                   PlacementTarget="{Binding ElementName=OuterBorder}"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Calendar Styles for DatePicker dropdown      -->
+    <!-- ============================================ -->
+
+    <!-- Calendar main style with full template -->
+    <Style TargetType="Calendar">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Calendar">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <CalendarItem x:Name="PART_CalendarItem"
+                                      Background="{StaticResource BackgroundBrush}"
+                                      BorderThickness="0"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- CalendarItem style (the container for month/year views) -->
+    <Style TargetType="CalendarItem">
+        <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarItem">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+
+                            <!-- Header: Previous/Next buttons and Month/Year title -->
+                            <Grid Grid.Row="0" Background="{StaticResource BackgroundLightBrush}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+
+                                <Button x:Name="PART_PreviousButton" Grid.Column="0"
+                                        Content="&#x25C0;" FontWeight="Bold"
+                                        Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                        BorderThickness="0" Padding="10,5"
+                                        Cursor="Hand"/>
+
+                                <Button x:Name="PART_HeaderButton" Grid.Column="1"
+                                        HorizontalAlignment="Center"
+                                        Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                        BorderThickness="0" FontWeight="SemiBold" FontSize="14"
+                                        Padding="5" Cursor="Hand"/>
+
+                                <Button x:Name="PART_NextButton" Grid.Column="2"
+                                        Content="&#x25B6;" FontWeight="Bold"
+                                        Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                        BorderThickness="0" Padding="10,5"
+                                        Cursor="Hand"/>
+                            </Grid>
+
+                            <!-- Day grid or Month/Year grid -->
+                            <Grid Grid.Row="1" Background="{StaticResource BackgroundBrush}">
+                                <Grid x:Name="PART_MonthView" Visibility="Visible">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+                                <Grid x:Name="PART_YearView" Visibility="Hidden">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+                            </Grid>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- CalendarDayButton style (individual day cells) -->
+    <Style TargetType="CalendarDayButton">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="MinWidth" Value="32"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarDayButton">
+                    <Grid>
+                        <Border x:Name="Background" Background="Transparent" CornerRadius="3"/>
+                        <ContentPresenter x:Name="Content"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsToday" Value="True">
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                            <Setter TargetName="Background" Property="BorderThickness" Value="1"/>
+                        </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsBlackedOut" Value="True">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- CalendarButton style (month/year selection cells) -->
+    <Style TargetType="CalendarButton">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="MinWidth" Value="50"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarButton">
+                    <Grid>
+                        <Border x:Name="Background" Background="Transparent" CornerRadius="3"/>
+                        <ContentPresenter x:Name="Content"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="HasSelectedDays" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- CheckBox Style                               -->
+    <!-- ============================================ -->
+    <Style TargetType="CheckBox">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CheckBox">
+                    <BulletDecorator Background="Transparent" VerticalAlignment="Center">
+                        <BulletDecorator.Bullet>
+                            <Border x:Name="Border" Width="16" Height="16"
+                                    Background="{StaticResource BackgroundDarkBrush}"
+                                    BorderBrush="{StaticResource BorderBrush}"
+                                    BorderThickness="1" CornerRadius="2">
+                                <Path x:Name="CheckMark" Width="10" Height="10" Stretch="Fill"
+                                      Stroke="{StaticResource AccentBrush}" StrokeThickness="2"
+                                      Data="M 0,5 L 4,9 L 10,0" Visibility="Collapsed"
+                                      HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                        </BulletDecorator.Bullet>
+                        <ContentPresenter Margin="6,0,0,0"
+                                          VerticalAlignment="Center"
+                                          HorizontalAlignment="Left"
+                                          RecognizesAccessKey="True"/>
+                    </BulletDecorator>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="CheckMark" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ForegroundMutedBrush}"/>
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ContextMenu Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="ContextMenu">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderLightBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ContextMenu">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            CornerRadius="4">
+                        <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="MenuItem">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="MenuItem">
+                    <Border x:Name="Border" Background="{TemplateBinding Background}" BorderThickness="0">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="26" SharedSizeGroup="MenuItemIconColumnGroup"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="17"/>
+                            </Grid.ColumnDefinitions>
+                            <!-- Icon column -->
+                            <Border x:Name="IconColumn" Grid.Column="0" Background="Transparent"/>
+                            <ContentPresenter x:Name="Icon" Grid.Column="0" Margin="4,0,6,0" VerticalAlignment="Center" ContentSource="Icon"/>
+                            <ContentPresenter Grid.Column="1" Margin="8,4" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Separator Style                              -->
+    <!-- ============================================ -->
+    <Style TargetType="Separator">
+        <Setter Property="Background" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="Margin" Value="0,4"/>
+        <Setter Property="Height" Value="1"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ToolTip Style                                -->
+    <!-- ============================================ -->
+    <Style x:Key="DarkToolTip" TargetType="ToolTip">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderLightBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="10,8"/>
+        <Setter Property="MaxWidth" Value="600"/>
+    </Style>
+
+    <!-- Apply DarkToolTip as the default for all tooltips -->
+    <Style TargetType="ToolTip" BasedOn="{StaticResource DarkToolTip}"/>
+
+</ResourceDictionary>
+
+
diff --git a/Dashboard/Themes/DarkTheme.xaml b/Dashboard/Themes/DarkTheme.xaml
index 0311a25..47165f0 100644
--- a/Dashboard/Themes/DarkTheme.xaml
+++ b/Dashboard/Themes/DarkTheme.xaml
@@ -60,7 +60,7 @@
 
     <SolidColorBrush x:Key="ForegroundBrush" Color="{StaticResource ForegroundColor}"/>
     <SolidColorBrush x:Key="ForegroundDimBrush" Color="{StaticResource ForegroundDimColor}"/>
-    <SolidColorBrush x:Key="ForegroundMutedBrush" Color="{StaticResource ForegroundMutedColor}"/>
+    <SolidColorBrush x:Key="ForegroundMutedBrush" Color="{StaticResource ForegroundColor}"/>
 
     <SolidColorBrush x:Key="BorderBrush" Color="{StaticResource BorderColor}"/>
     <SolidColorBrush x:Key="BorderLightBrush" Color="{StaticResource BorderLightColor}"/>
@@ -276,6 +276,11 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter Property="Background" Value="#1A472A"/>
+            </Trigger>
+        </Style.Triggers>
     </Style>
 
     <!-- Tab Close Button Style -->
@@ -444,6 +449,41 @@
         </Setter>
     </Style>
 
+    <!-- ============================================ -->
+    <!-- PasswordBox Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="PasswordBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Margin="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!-- ============================================ -->
     <!-- ComboBox Style                               -->
     <!-- ============================================ -->
@@ -540,14 +580,11 @@
                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsHighlighted" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
-                        </Trigger>
                         <Trigger Property="IsSelected" Value="True">
                             <Setter TargetName="Bd" Property="Background" Value="{StaticResource AccentBrush}"/>
                         </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/Dashboard/Themes/LightTheme.xaml b/Dashboard/Themes/LightTheme.xaml
new file mode 100644
index 0000000..497b142
--- /dev/null
+++ b/Dashboard/Themes/LightTheme.xaml
@@ -0,0 +1,1261 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:helpers="clr-namespace:PerformanceMonitorDashboard.Helpers">
+
+    <!-- ============================================ -->
+    <!-- Darling Data Light Theme                      -->
+    <!-- Flat/Minimal Design                          -->
+    <!-- ============================================ -->
+
+    <!-- Brand Colors -->
+    <Color x:Key="AccentColor">#2eaef1</Color>
+    <Color x:Key="AccentHoverColor">#5bc4f5</Color>
+    <Color x:Key="AccentPressedColor">#1a9ae0</Color>
+
+    <!-- Background Colors -->
+    <Color x:Key="BackgroundDarkColor">#F0F2F5</Color>
+    <Color x:Key="AlternatingRowColor">#EDF1F7</Color>
+    <Color x:Key="BackgroundColor">#F5F7FA</Color>
+    <Color x:Key="BackgroundLightColor">#FFFFFF</Color>
+    <Color x:Key="BackgroundLighterColor">#E8ECF0</Color>
+
+    <!-- Text Colors (dark on light backgrounds) -->
+    <Color x:Key="ForegroundColor">#1A1D23</Color>
+    <Color x:Key="ForegroundDimColor">#4A5568</Color>
+    <Color x:Key="ForegroundMutedColor">#718096</Color>
+
+    <!-- Border Colors (subtle, low-contrast) -->
+    <Color x:Key="BorderColor">#DEE2E6</Color>
+    <Color x:Key="BorderLightColor">#CED4DA</Color>
+
+    <!-- Status Colors (Material Design 700 — visible against light backgrounds) -->
+    <Color x:Key="SuccessColor">#2E7D32</Color>
+    <Color x:Key="WarningColor">#F57F17</Color>
+    <Color x:Key="ErrorColor">#C62828</Color>
+    <Color x:Key="InfoColor">#2eaef1</Color>
+
+    <!-- Spacing Scale -->
+    <sys:Double x:Key="SpacingXS">2</sys:Double>
+    <sys:Double x:Key="SpacingSm">4</sys:Double>
+    <sys:Double x:Key="SpacingMd">8</sys:Double>
+    <sys:Double x:Key="SpacingLg">12</sys:Double>
+    <sys:Double x:Key="SpacingXL">16</sys:Double>
+
+    <!-- Corner Radius -->
+    <CornerRadius x:Key="CornerRadiusSm">2</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusMd">4</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusLg">6</CornerRadius>
+
+    <!-- Brushes -->
+    <SolidColorBrush x:Key="AccentBrush" Color="{StaticResource AccentColor}"/>
+    <SolidColorBrush x:Key="AccentHoverBrush" Color="{StaticResource AccentHoverColor}"/>
+    <SolidColorBrush x:Key="AccentPressedBrush" Color="{StaticResource AccentPressedColor}"/>
+
+    <SolidColorBrush x:Key="BackgroundDarkBrush" Color="{StaticResource BackgroundDarkColor}"/>
+    <SolidColorBrush x:Key="AlternatingRowBrush" Color="{StaticResource AlternatingRowColor}"/>
+    <SolidColorBrush x:Key="BackgroundBrush" Color="{StaticResource BackgroundColor}"/>
+    <SolidColorBrush x:Key="BackgroundLightBrush" Color="{StaticResource BackgroundLightColor}"/>
+    <SolidColorBrush x:Key="BackgroundLighterBrush" Color="{StaticResource BackgroundLighterColor}"/>
+
+    <SolidColorBrush x:Key="ForegroundBrush" Color="{StaticResource ForegroundColor}"/>
+    <SolidColorBrush x:Key="ForegroundDimBrush" Color="{StaticResource ForegroundDimColor}"/>
+    <SolidColorBrush x:Key="ForegroundMutedBrush" Color="{StaticResource ForegroundColor}"/>
+
+    <SolidColorBrush x:Key="BorderBrush" Color="{StaticResource BorderColor}"/>
+    <SolidColorBrush x:Key="BorderLightBrush" Color="{StaticResource BorderLightColor}"/>
+
+    <SolidColorBrush x:Key="SuccessBrush" Color="{StaticResource SuccessColor}"/>
+    <SolidColorBrush x:Key="WarningBrush" Color="{StaticResource WarningColor}"/>
+    <SolidColorBrush x:Key="ErrorBrush" Color="{StaticResource ErrorColor}"/>
+    <SolidColorBrush x:Key="InfoBrush" Color="{StaticResource InfoColor}"/>
+
+    <!-- ============================================ -->
+    <!-- Window Style                                 -->
+    <!-- ============================================ -->
+    <Style TargetType="Window">
+        <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- TextBlock Style                              -->
+    <!-- ============================================ -->
+    <Style TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Label Style                                  -->
+    <!-- ============================================ -->
+    <Style TargetType="Label">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Button Style - Flat Design                   -->
+    <!-- ============================================ -->
+    <Style TargetType="Button">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="#1A1D23"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="12,6"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetName="border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="{StaticResource BackgroundLighterColor}" Duration="0:0:0.12"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetName="border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="{StaticResource BackgroundLightColor}" Duration="0:0:0.12"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentPressedBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Accent Button Style (for primary actions) -->
+    <Style x:Key="AccentButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentPressedBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Time Range Button Style (hour picker with visible hover) -->
+    <Style x:Key="TimeRangeButton" TargetType="Button">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundDimBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="10,5"/>
+        <Setter Property="MinWidth" Value="60"/>
+        <Setter Property="Margin" Value="2,0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentPressedBrush}"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- No Data Message Style (for empty DataGrids) -->
+    <Style x:Key="NoDataMessage" TargetType="TextBlock">
+        <Setter Property="Text" Value="No data for selected time range"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Visibility" Value="Collapsed"/>
+    </Style>
+
+    <!-- Empty State Message Style (context-specific text set per usage) -->
+    <Style x:Key="EmptyStateMessage" TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Visibility" Value="Collapsed"/>
+    </Style>
+
+    <!-- Alert Badge Styles -->
+    <Style x:Key="AlertBadge" TargetType="Border">
+        <Setter Property="Background" Value="#D97706"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="4,1"/>
+        <Setter Property="Margin" Value="6,0,0,0"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <Style x:Key="AlertBadgeCritical" TargetType="Border">
+        <Setter Property="Background" Value="#DC2626"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="4,1"/>
+        <Setter Property="Margin" Value="6,0,0,0"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <!-- ToggleButton Style (respects Background in all states) -->
+    <Style TargetType="ToggleButton">
+        <Setter Property="Background" Value="#E8ECF0"/>
+        <Setter Property="Foreground" Value="#1A1D23"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="12,5"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border x:Name="Border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            CornerRadius="2">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.85"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.7"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter Property="Background" Value="#2E7D32"/>
+                <Setter Property="Foreground" Value="White"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Tab Close Button Style -->
+    <Style x:Key="TabCloseButton" TargetType="Button">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Width" Value="22"/>
+        <Setter Property="Height" Value="22"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="6,0,0,0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="FontSize" Value="15"/>
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="ToolTip" Value="Close tab"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="3"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}">
+                        <TextBlock Text="×"
+                                   FontSize="{TemplateBinding FontSize}"
+                                   FontWeight="{TemplateBinding FontWeight}"
+                                   Foreground="{TemplateBinding Foreground}"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   Margin="0,-2,0,0"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#C42B1C"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#9A2316"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Success Button Style (for Refresh) -->
+    <Style x:Key="SuccessButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Background" Value="{StaticResource SuccessBrush}"/>
+        <Setter Property="Foreground" Value="#E4E6EB"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#5DBF60"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#3D9140"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- TextBox Style                                -->
+    <!-- ============================================ -->
+
+    <!-- Named style for filter TextBoxes in DataGrid column headers -->
+    <Style x:Key="FilterTextBoxStyle" TargetType="TextBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="#1A1D23"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="4,2"/>
+        <Setter Property="CaretBrush" Value="#1A1D23"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+    </Style>
+
+    <!-- Column Filter Button Style - small button with filter icon -->
+    <Style x:Key="ColumnFilterButtonStyle" TargetType="Button">
+        <Setter Property="Width" Value="18"/>
+        <Setter Property="Height" Value="18"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Content" Value="&#xE71C;"/>
+        <Setter Property="FontFamily" Value="Segoe MDL2 Assets"/>
+        <Setter Property="FontSize" Value="11"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundDimBrush}"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <ContentPresenter HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Column Filter Button Style when filter is active -->
+    <Style x:Key="ColumnFilterButtonActiveStyle" TargetType="Button" BasedOn="{StaticResource ColumnFilterButtonStyle}">
+        <Setter Property="Foreground" Value="#FFD700"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="#FFEC8B"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="TextBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TextBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            TextElement.Foreground="{StaticResource ForegroundBrush}">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Background="{StaticResource BackgroundDarkBrush}"
+                                      Margin="{TemplateBinding Padding}"
+                                      Foreground="{StaticResource ForegroundBrush}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- PasswordBox Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="PasswordBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Margin="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ComboBox Style                               -->
+    <!-- ============================================ -->
+    <ControlTemplate x:Key="ComboBoxToggleButton" TargetType="ToggleButton">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="20"/>
+            </Grid.ColumnDefinitions>
+            <Border x:Name="Border" Grid.ColumnSpan="2"
+                    Background="{StaticResource BackgroundDarkBrush}"
+                    BorderBrush="{StaticResource BorderBrush}"
+                    BorderThickness="1" CornerRadius="2"/>
+            <Border Grid.Column="0" Margin="1"
+                    Background="{StaticResource BackgroundDarkBrush}"
+                    BorderThickness="0"/>
+            <Path x:Name="Arrow" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
+                  Data="M 0 0 L 4 4 L 8 0 Z" Fill="{StaticResource ForegroundBrush}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style TargetType="ComboBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBox">
+                    <Grid>
+                        <ToggleButton x:Name="ToggleButton"
+                                      Template="{StaticResource ComboBoxToggleButton}"
+                                      Focusable="False"
+                                      IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ClickMode="Press"/>
+                        <ContentPresenter x:Name="ContentSite" IsHitTestVisible="False"
+                                          Content="{TemplateBinding SelectionBoxItem}"
+                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                          Margin="6,4,23,4" VerticalAlignment="Center" HorizontalAlignment="Left">
+                            <ContentPresenter.Resources>
+                                <Style TargetType="TextBlock">
+                                    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+                                </Style>
+                            </ContentPresenter.Resources>
+                        </ContentPresenter>
+                        <TextBox x:Name="PART_EditableTextBox"
+                                 Style="{x:Null}"
+                                 HorizontalAlignment="Left" VerticalAlignment="Center"
+                                 Margin="6,4,23,4" Focusable="True"
+                                 Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                 Visibility="Hidden" IsReadOnly="{TemplateBinding IsReadOnly}"/>
+                        <Popup x:Name="Popup" Placement="Bottom" IsOpen="{TemplateBinding IsDropDownOpen}"
+                               AllowsTransparency="True" Focusable="False" PopupAnimation="Slide">
+                            <Grid x:Name="DropDown" SnapsToDevicePixels="True"
+                                  MinWidth="{TemplateBinding ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <Border x:Name="DropDownBorder"
+                                        Background="{StaticResource BackgroundDarkBrush}"
+                                        BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"/>
+                                <ScrollViewer Margin="1" SnapsToDevicePixels="True">
+                                    <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained"/>
+                                </ScrollViewer>
+                            </Grid>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="ComboBoxItem">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBoxItem">
+                    <Border x:Name="Bd" Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- TabControl Style                             -->
+    <!-- ============================================ -->
+    <Style TargetType="TabControl">
+        <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+    </Style>
+
+    <Style TargetType="TabItem">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundDimBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="12,8"/>
+        <Setter Property="Margin" Value="0,0,2,0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TabItem">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="3,3,0,0"
+                            Padding="{TemplateBinding Padding}"
+                            Margin="{TemplateBinding Margin}">
+                        <ContentPresenter x:Name="contentPresenter"
+                                          ContentSource="Header"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentBrush}"/>
+                            <Setter Property="Foreground" Value="#E4E6EB"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- DataGrid Style                               -->
+    <!-- ============================================ -->
+    <Style TargetType="DataGrid">
+        <Setter Property="helpers:DataGridClipboardBehavior.FixHeaderCopy" Value="True"/>
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="ClipToBounds" Value="True"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="RowBackground" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="AlternatingRowBackground" Value="{StaticResource AlternatingRowBrush}"/>
+        <Setter Property="GridLinesVisibility" Value="Horizontal"/>
+        <Setter Property="HorizontalGridLinesBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="VerticalGridLinesBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="HeadersVisibility" Value="Column"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Visible"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Visible"/>
+    </Style>
+
+    <!-- Column header resize gripper -->
+    <Style x:Key="ColumnHeaderGripperStyle" TargetType="{x:Type Thumb}">
+        <Setter Property="Width" Value="8"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="SizeWE"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="DataGridColumnHeader">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0,0,1,1"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridColumnHeader">
+                    <Grid>
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <ContentPresenter Grid.Column="0"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="Center"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                <Path x:Name="SortArrow"
+                                      Grid.Column="1"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      Width="8" Height="6"
+                                      Margin="4,0,2,0"
+                                      Stretch="Fill"
+                                      Opacity="0.7"
+                                      Fill="{StaticResource ForegroundDimBrush}"
+                                      RenderTransformOrigin="0.5,0.5"
+                                      Visibility="Collapsed"
+                                      Data="M 0,0 L 8,0 L 4,6 Z"/>
+                            </Grid>
+                        </Border>
+                        <Thumb x:Name="PART_LeftHeaderGripper"
+                               HorizontalAlignment="Left"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                        <Thumb x:Name="PART_RightHeaderGripper"
+                               HorizontalAlignment="Right"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="SortDirection" Value="Ascending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="SortArrow" Property="RenderTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="SortDirection" Value="Descending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Column header style when filter is active - subtle blue highlight -->
+    <Style x:Key="FilteredColumnHeaderStyle" TargetType="DataGridColumnHeader"
+           BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+        <Setter Property="Background" Value="#BBDEFB"/>
+    </Style>
+
+    <!-- Right-aligned text style for numeric DataGrid columns -->
+    <Style x:Key="NumericCell" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+        <Setter Property="TextAlignment" Value="Right"/>
+    </Style>
+
+    <Style TargetType="DataGridCell">
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridCell">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
+                <Setter Property="Foreground" Value="#E4E6EB"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="DataGridRow">
+        <Setter Property="Background" Value="Transparent"/>
+        <Style.Triggers>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ListView Style                               -->
+    <!-- ============================================ -->
+    <Style TargetType="ListView">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+    </Style>
+
+    <Style TargetType="ListViewItem">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="Margin" Value="2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListViewItem">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                            <Setter TargetName="border" Property="BorderThickness" Value="1"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ScrollBar Style                              -->
+    <!-- ============================================ -->
+    <Style TargetType="ScrollBar">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Border Style for Panels                      -->
+    <!-- ============================================ -->
+    <Style x:Key="PanelBorder" TargetType="Border">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="6"/>
+        <Setter Property="Padding" Value="16"/>
+    </Style>
+
+    <!-- Card Style for Chart Containers -->
+    <Style x:Key="ChartCard" TargetType="Border">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="6"/>
+        <Setter Property="Margin" Value="6"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- DatePickerTextBox Style (internal control)   -->
+    <!-- ============================================ -->
+    <Style TargetType="DatePickerTextBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DatePickerTextBox">
+                    <Grid Background="{StaticResource BackgroundLightBrush}">
+                        <Border x:Name="Border"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}">
+                            <ScrollViewer x:Name="PART_ContentHost" Background="Transparent"
+                                          HorizontalContentAlignment="Stretch"
+                                          VerticalContentAlignment="Center"/>
+                        </Border>
+                        <!-- Watermark: hidden via Visibility=Collapsed -->
+                        <ContentControl x:Name="PART_Watermark"
+                                        Focusable="False"
+                                        IsHitTestVisible="False"
+                                        Visibility="Collapsed"
+                                        Foreground="{StaticResource ForegroundMutedBrush}"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- DatePicker Style                             -->
+    <!-- ============================================ -->
+    <Style TargetType="DatePicker">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="4,2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DatePicker">
+                    <Border x:Name="OuterBorder"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}">
+                        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <DatePickerTextBox x:Name="PART_TextBox"
+                                               Grid.Column="0"
+                                               Focusable="True"
+                                               HorizontalContentAlignment="Stretch"
+                                               VerticalContentAlignment="Center"
+                                               Background="Transparent"
+                                               Foreground="{StaticResource ForegroundBrush}"/>
+                            <Button x:Name="PART_Button"
+                                    Grid.Column="1"
+                                    Focusable="False"
+                                    Foreground="{StaticResource ForegroundBrush}"
+                                    Background="Transparent"
+                                    BorderThickness="0"
+                                    Padding="4,0">
+                                <Path Data="M0,0 L4,4 L8,0 Z"
+                                      Fill="{StaticResource ForegroundBrush}"
+                                      VerticalAlignment="Center"/>
+                            </Button>
+                            <Popup x:Name="PART_Popup"
+                                   AllowsTransparency="True"
+                                   Placement="Bottom"
+                                   PlacementTarget="{Binding ElementName=OuterBorder}"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Calendar Styles for DatePicker dropdown      -->
+    <!-- ============================================ -->
+
+    <!-- Calendar main style with full template -->
+    <Style TargetType="Calendar">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Calendar">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <CalendarItem x:Name="PART_CalendarItem"
+                                      Background="{StaticResource BackgroundBrush}"
+                                      BorderThickness="0"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- CalendarItem style (the container for month/year views) -->
+    <Style TargetType="CalendarItem">
+        <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarItem">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+
+                            <!-- Header: Previous/Next buttons and Month/Year title -->
+                            <Grid Grid.Row="0" Background="{StaticResource BackgroundLightBrush}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+
+                                <Button x:Name="PART_PreviousButton" Grid.Column="0"
+                                        Content="&#x25C0;" FontWeight="Bold"
+                                        Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                        BorderThickness="0" Padding="10,5"
+                                        Cursor="Hand"/>
+
+                                <Button x:Name="PART_HeaderButton" Grid.Column="1"
+                                        HorizontalAlignment="Center"
+                                        Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                        BorderThickness="0" FontWeight="SemiBold" FontSize="14"
+                                        Padding="5" Cursor="Hand"/>
+
+                                <Button x:Name="PART_NextButton" Grid.Column="2"
+                                        Content="&#x25B6;" FontWeight="Bold"
+                                        Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                        BorderThickness="0" Padding="10,5"
+                                        Cursor="Hand"/>
+                            </Grid>
+
+                            <!-- Day grid or Month/Year grid -->
+                            <Grid Grid.Row="1" Background="{StaticResource BackgroundBrush}">
+                                <Grid x:Name="PART_MonthView" Visibility="Visible">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+                                <Grid x:Name="PART_YearView" Visibility="Hidden">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+                            </Grid>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- CalendarDayButton style (individual day cells) -->
+    <Style TargetType="CalendarDayButton">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="MinWidth" Value="32"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarDayButton">
+                    <Grid>
+                        <Border x:Name="Background" Background="Transparent" CornerRadius="3"/>
+                        <ContentPresenter x:Name="Content"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsToday" Value="True">
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                            <Setter TargetName="Background" Property="BorderThickness" Value="1"/>
+                        </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsBlackedOut" Value="True">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- CalendarButton style (month/year selection cells) -->
+    <Style TargetType="CalendarButton">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="MinWidth" Value="50"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarButton">
+                    <Grid>
+                        <Border x:Name="Background" Background="Transparent" CornerRadius="3"/>
+                        <ContentPresenter x:Name="Content"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="HasSelectedDays" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- CheckBox Style                               -->
+    <!-- ============================================ -->
+    <Style TargetType="CheckBox">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CheckBox">
+                    <BulletDecorator Background="Transparent" VerticalAlignment="Center">
+                        <BulletDecorator.Bullet>
+                            <Border x:Name="Border" Width="16" Height="16"
+                                    Background="{StaticResource BackgroundDarkBrush}"
+                                    BorderBrush="{StaticResource BorderBrush}"
+                                    BorderThickness="1" CornerRadius="2">
+                                <Path x:Name="CheckMark" Width="10" Height="10" Stretch="Fill"
+                                      Stroke="{StaticResource AccentBrush}" StrokeThickness="2"
+                                      Data="M 0,5 L 4,9 L 10,0" Visibility="Collapsed"
+                                      HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                        </BulletDecorator.Bullet>
+                        <ContentPresenter Margin="6,0,0,0"
+                                          VerticalAlignment="Center"
+                                          HorizontalAlignment="Left"
+                                          RecognizesAccessKey="True"/>
+                    </BulletDecorator>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="CheckMark" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ForegroundMutedBrush}"/>
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ContextMenu Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="ContextMenu">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderLightBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ContextMenu">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            CornerRadius="4">
+                        <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="MenuItem">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="MenuItem">
+                    <Border x:Name="Border" Background="{TemplateBinding Background}" BorderThickness="0">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="26" SharedSizeGroup="MenuItemIconColumnGroup"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="17"/>
+                            </Grid.ColumnDefinitions>
+                            <!-- Icon column -->
+                            <Border x:Name="IconColumn" Grid.Column="0" Background="Transparent"/>
+                            <ContentPresenter x:Name="Icon" Grid.Column="0" Margin="4,0,6,0" VerticalAlignment="Center" ContentSource="Icon"/>
+                            <ContentPresenter Grid.Column="1" Margin="8,4" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Separator Style                              -->
+    <!-- ============================================ -->
+    <Style TargetType="Separator">
+        <Setter Property="Background" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="Margin" Value="0,4"/>
+        <Setter Property="Height" Value="1"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ToolTip Style                                -->
+    <!-- ============================================ -->
+    <Style x:Key="DarkToolTip" TargetType="ToolTip">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderLightBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="10,8"/>
+        <Setter Property="MaxWidth" Value="600"/>
+    </Style>
+
+    <!-- Apply DarkToolTip as the default for all tooltips -->
+    <Style TargetType="ToolTip" BasedOn="{StaticResource DarkToolTip}"/>
+
+</ResourceDictionary>
diff --git a/Dashboard/TracePatternHistoryWindow.xaml b/Dashboard/TracePatternHistoryWindow.xaml
index 70aaa90..8981a6e 100644
--- a/Dashboard/TracePatternHistoryWindow.xaml
+++ b/Dashboard/TracePatternHistoryWindow.xaml
@@ -79,7 +79,7 @@
                   ContextMenu="{DynamicResource DataGridContextMenu}"
                   Margin="10">
             <DataGrid.Columns>
-                <DataGridTextColumn Binding="{Binding EndTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                <DataGridTextColumn Binding="{Binding EndTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="EndTime" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -175,7 +175,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding StartTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                <DataGridTextColumn Binding="{Binding StartTime, Converter={StaticResource ServerTimeConverter}}" Width="150">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="StartTime" Click="Filter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/TracePatternHistoryWindow.xaml.cs b/Dashboard/TracePatternHistoryWindow.xaml.cs
index 94cbef9..71ce17c 100644
--- a/Dashboard/TracePatternHistoryWindow.xaml.cs
+++ b/Dashboard/TracePatternHistoryWindow.xaml.cs
@@ -64,13 +64,21 @@ public TracePatternHistoryWindow(
                 displayPattern = displayPattern.Substring(0, 120) + "...";
             QueryIdentifierText.Text = $"Trace Pattern History: [{databaseName}] — {displayPattern}";
 
-            ApplyDarkModeToChart();
+            ApplyThemeToChart();
             Loaded += TracePatternHistoryWindow_Loaded;
+            Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
+            Closed += (s, e) => Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
         }
 
-        private void ApplyDarkModeToChart()
+        private void ApplyThemeToChart()
         {
-            Helpers.TabHelpers.ApplyDarkModeToChart(HistoryChart);
+            Helpers.TabHelpers.ApplyThemeToChart(HistoryChart);
+        }
+
+        private void OnThemeChanged(string _)
+        {
+            ApplyThemeToChart();
+            HistoryChart.Refresh();
         }
 
         private async void TracePatternHistoryWindow_Loaded(object sender, RoutedEventArgs e)
diff --git a/Installer/PerformanceMonitorInstaller.csproj b/Installer/PerformanceMonitorInstaller.csproj
index f245a1b..eef02bc 100644
--- a/Installer/PerformanceMonitorInstaller.csproj
+++ b/Installer/PerformanceMonitorInstaller.csproj
@@ -20,10 +20,10 @@
     <!-- Application metadata -->
     <AssemblyName>PerformanceMonitorInstaller</AssemblyName>
     <Product>SQL Server Performance Monitor Installer</Product>
-    <Version>2.0.0</Version>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <FileVersion>2.0.0.0</FileVersion>
-    <InformationalVersion>2.0.0</InformationalVersion>
+    <Version>2.1.0</Version>
+    <AssemblyVersion>2.1.0.0</AssemblyVersion>
+    <FileVersion>2.1.0.0</FileVersion>
+    <InformationalVersion>2.1.0</InformationalVersion>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <Description>Installation utility for SQL Server Performance Monitor - Supports SQL Server 2016-2025</Description>
diff --git a/Installer/Program.cs b/Installer/Program.cs
index a47ed83..d16303a 100644
--- a/Installer/Program.cs
+++ b/Installer/Program.cs
@@ -762,6 +762,14 @@ This validates the installation and creates dynamically-generated tables
                     {
                         await connection.OpenAsync().ConfigureAwait(false);
 
+                        /*Capture timestamp before running so we only check errors from this run.
+                          Use SYSDATETIME() (local) because collection_time is stored in server local time.*/
+                        DateTime validationStart;
+                        using (var command = new SqlCommand("SELECT SYSDATETIME();", connection))
+                        {
+                            validationStart = (DateTime)(await command.ExecuteScalarAsync().ConfigureAwait(false))!;
+                        }
+
                         /*Run master collector once with @force_run_all to collect everything immediately*/
                         Console.Write("Executing master collector... ");
                         using (var command = new SqlCommand("EXECUTE PerformanceMonitor.collect.scheduled_master_collector @force_run_all = 1, @debug = 0;", connection))
@@ -772,37 +780,46 @@ This validates the installation and creates dynamically-generated tables
                         Console.WriteLine("✓ Success");
 
                         /*
-                        Verify data was collected
+                        Verify data was collected — only from this validation run, not historical errors
                         */
                         Console.WriteLine();
                         Console.Write("Verifying data collection... ");
 
-                        /* First check total count in collection_log */
-                        int totalLogEntries = 0;
-                        using (var command = new SqlCommand(@"
-                            SELECT COUNT(*) FROM PerformanceMonitor.config.collection_log;", connection))
-                        {
-                            totalLogEntries = (int)(await command.ExecuteScalarAsync().ConfigureAwait(false) ?? 0);
-                        }
-
-                        /* Check successful collections (all time - we just installed) */
+                        /* Check successful collections from this run */
                         int collectedCount = 0;
                         using (var command = new SqlCommand(@"
                             SELECT
                                 COUNT(DISTINCT collector_name)
                             FROM PerformanceMonitor.config.collection_log
-                            WHERE collection_status = 'SUCCESS';", connection))
+                            WHERE collection_status = 'SUCCESS'
+                            AND   collection_time >= @validation_start;", connection))
                         {
+                            command.Parameters.AddWithValue("@validation_start", validationStart);
                             collectedCount = (int)(await command.ExecuteScalarAsync().ConfigureAwait(false) ?? 0);
                         }
 
+                        /* Total log entries from this run */
+                        int totalLogEntries = 0;
+                        using (var command = new SqlCommand(@"
+                            SELECT COUNT(*)
+                            FROM PerformanceMonitor.config.collection_log
+                            WHERE collection_time >= @validation_start;", connection))
+                        {
+                            command.Parameters.AddWithValue("@validation_start", validationStart);
+                            totalLogEntries = (int)(await command.ExecuteScalarAsync().ConfigureAwait(false) ?? 0);
+                        }
+
                         Console.WriteLine($"✓ {collectedCount} collectors ran successfully (total log entries: {totalLogEntries})");
 
-                        /* Show failed collectors if any */
+                        /* Show failed collectors from this run */
                         int errorCount = 0;
                         using (var command = new SqlCommand(@"
-                            SELECT COUNT(*) FROM PerformanceMonitor.config.collection_log WHERE collection_status = 'ERROR';", connection))
+                            SELECT COUNT(*)
+                            FROM PerformanceMonitor.config.collection_log
+                            WHERE collection_status = 'ERROR'
+                            AND   collection_time >= @validation_start;", connection))
                         {
+                            command.Parameters.AddWithValue("@validation_start", validationStart);
                             errorCount = (int)(await command.ExecuteScalarAsync().ConfigureAwait(false) ?? 0);
                         }
 
@@ -816,8 +833,10 @@ FROM PerformanceMonitor.config.collection_log
                                     error_message
                                 FROM PerformanceMonitor.config.collection_log
                                 WHERE collection_status = 'ERROR'
+                                AND   collection_time >= @validation_start
                                 ORDER BY collection_time DESC;", connection))
                             {
+                                command.Parameters.AddWithValue("@validation_start", validationStart);
                                 using (var reader = await command.ExecuteReaderAsync().ConfigureAwait(false))
                                 {
                                     while (await reader.ReadAsync().ConfigureAwait(false))
@@ -844,8 +863,10 @@ SELECT TOP 5
                                     error_message
                                 FROM PerformanceMonitor.config.collection_log
                                 WHERE collection_status = 'SUCCESS'
+                                AND   collection_time >= @validation_start
                                 ORDER BY collection_time DESC;", connection))
                             {
+                                command.Parameters.AddWithValue("@validation_start", validationStart);
                                 using (var reader = await command.ExecuteReaderAsync().ConfigureAwait(false))
                                 {
                                     while (await reader.ReadAsync().ConfigureAwait(false))
diff --git a/InstallerGui/InstallerGui.csproj b/InstallerGui/InstallerGui.csproj
index 3ea9497..5a1fbd4 100644
--- a/InstallerGui/InstallerGui.csproj
+++ b/InstallerGui/InstallerGui.csproj
@@ -8,7 +8,10 @@
     <AssemblyName>PerformanceMonitorInstallerGui</AssemblyName>
     <RootNamespace>PerformanceMonitorInstallerGui</RootNamespace>
     <Product>SQL Server Performance Monitor Installer</Product>
-    <Version>2.0.0</Version>
+    <Version>2.1.0</Version>
+    <AssemblyVersion>2.1.0.0</AssemblyVersion>
+    <FileVersion>2.1.0.0</FileVersion>
+    <InformationalVersion>2.1.0</InformationalVersion>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <ApplicationIcon>EDD.ico</ApplicationIcon>
diff --git a/InstallerGui/Services/InstallationService.cs b/InstallerGui/Services/InstallationService.cs
index 512a6ab..2935702 100644
--- a/InstallerGui/Services/InstallationService.cs
+++ b/InstallerGui/Services/InstallationService.cs
@@ -647,6 +647,14 @@ public async Task<int> InstallDependenciesAsync(
             using var connection = new SqlConnection(connectionString);
             await connection.OpenAsync(cancellationToken).ConfigureAwait(false);
 
+            /*Capture timestamp before running so we only check errors from this run.
+              Use SYSDATETIME() (local) because collection_time is stored in server local time.*/
+            DateTime validationStart;
+            using (var command = new SqlCommand("SELECT SYSDATETIME();", connection))
+            {
+                validationStart = (DateTime)(await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false))!;
+            }
+
             /*Run master collector with @force_run_all*/
             progress?.Report(new InstallationProgress
             {
@@ -668,7 +676,7 @@ public async Task<int> InstallDependenciesAsync(
                 Status = "Success"
             });
 
-            /*Check results*/
+            /*Check results — only from this validation run, not historical errors*/
             int successCount = 0;
             int errorCount = 0;
 
@@ -676,8 +684,10 @@ public async Task<int> InstallDependenciesAsync(
                 SELECT
                     success_count = COUNT_BIG(DISTINCT CASE WHEN collection_status = 'SUCCESS' THEN collector_name END),
                     error_count = SUM(CASE WHEN collection_status = 'ERROR' THEN 1 ELSE 0 END)
-                FROM PerformanceMonitor.config.collection_log;", connection))
+                FROM PerformanceMonitor.config.collection_log
+                WHERE collection_time >= @validation_start;", connection))
             {
+                command.Parameters.AddWithValue("@validation_start", validationStart);
                 using var reader = await command.ExecuteReaderAsync(cancellationToken).ConfigureAwait(false);
                 if (await reader.ReadAsync(cancellationToken).ConfigureAwait(false))
                 {
@@ -699,7 +709,9 @@ public async Task<int> InstallDependenciesAsync(
                     SELECT collector_name, error_message
                     FROM PerformanceMonitor.config.collection_log
                     WHERE collection_status = 'ERROR'
+                    AND   collection_time >= @validation_start
                     ORDER BY collection_time DESC;", connection);
+                command.Parameters.AddWithValue("@validation_start", validationStart);
 
                 using var reader = await command.ExecuteReaderAsync(cancellationToken).ConfigureAwait(false);
                 while (await reader.ReadAsync(cancellationToken).ConfigureAwait(false))
diff --git a/Lite/App.xaml.cs b/Lite/App.xaml.cs
index b2b7c80..e775a91 100644
--- a/Lite/App.xaml.cs
+++ b/Lite/App.xaml.cs
@@ -8,6 +8,7 @@
 
 using System;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -18,6 +19,9 @@ namespace PerformanceMonitorLite;
 
 public partial class App : Application
 {
+    [DllImport("shell32.dll", SetLastError = true)]
+    private static extern void SetCurrentProcessExplicitAppUserModelID([MarshalAs(UnmanagedType.LPWStr)] string appId);
+
     private const string MutexName = "PerformanceMonitorLite_SingleInstance";
     private Mutex? _singleInstanceMutex;
     private bool _ownsMutex;
@@ -80,6 +84,12 @@ private static string GetDefaultCsvSeparator()
     /* System tray settings */
     public static bool MinimizeToTray { get; set; } = true;
 
+    /* Time display mode ("ServerTime", "LocalTime", "UTC") */
+    public static string TimeDisplayMode { get; set; } = "ServerTime";
+
+    /* Color theme ("Dark" or "Light") */
+    public static string ColorTheme { get; set; } = "Dark";
+
     /* Update check settings */
     public static bool CheckForUpdatesOnStartup { get; set; } = true;
 
@@ -130,6 +140,7 @@ public static void SaveSmtpPassword(string password)
 
     protected override void OnStartup(StartupEventArgs e)
     {
+        SetCurrentProcessExplicitAppUserModelID("DarlingData.PerformanceMonitor.Lite");
 
         // Check for existing instance
         _singleInstanceMutex = new Mutex(true, MutexName, out _ownsMutex);
@@ -164,6 +175,9 @@ protected override void OnStartup(StartupEventArgs e)
         LoadDefaultTimeRange();
         LoadAlertSettings();
 
+        // Apply saved color theme before the main window is shown
+        Helpers.ThemeManager.Apply(ColorTheme);
+
         // Initialize logging
         var logDirectory = Path.Combine(exeDirectory, "logs");
         AppLogger.Initialize(logDirectory);
@@ -250,6 +264,25 @@ public static void LoadAlertSettings()
             /* System tray settings */
             if (root.TryGetProperty("minimize_to_tray", out v)) MinimizeToTray = v.GetBoolean();
 
+            /* Time display mode */
+            if (root.TryGetProperty("time_display_mode", out v))
+            {
+                var t = v.GetString();
+                if (t == "ServerTime" || t == "LocalTime" || t == "UTC")
+                {
+                    TimeDisplayMode = t;
+                    if (Enum.TryParse<Helpers.TimeDisplayMode>(t, out var tdm))
+                        Services.ServerTimeHelper.CurrentDisplayMode = tdm;
+                }
+            }
+
+            /* Color theme */
+            if (root.TryGetProperty("color_theme", out v))
+            {
+                var t = v.GetString();
+                if (t == "Dark" || t == "Light" || t == "CoolBreeze") ColorTheme = t;
+            }
+
             /* Update check settings */
             if (root.TryGetProperty("check_for_updates_on_startup", out v)) CheckForUpdatesOnStartup = v.GetBoolean();
 
diff --git a/Lite/Controls/AlertsHistoryTab.xaml b/Lite/Controls/AlertsHistoryTab.xaml
index 8c1d7ac..2602362 100644
--- a/Lite/Controls/AlertsHistoryTab.xaml
+++ b/Lite/Controls/AlertsHistoryTab.xaml
@@ -7,10 +7,6 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click">
                     <MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
diff --git a/Lite/Controls/LoadingOverlay.xaml b/Lite/Controls/LoadingOverlay.xaml
index 86a900e..1772751 100644
--- a/Lite/Controls/LoadingOverlay.xaml
+++ b/Lite/Controls/LoadingOverlay.xaml
@@ -6,13 +6,6 @@
              mc:Ignorable="d"
              Visibility="Collapsed"
              d:DesignHeight="200" d:DesignWidth="400">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
     <Grid Background="{DynamicResource BackgroundBrush}">
         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
             <TextBlock x:Name="SpinnerText"
diff --git a/Lite/Controls/PlanViewerControl.xaml b/Lite/Controls/PlanViewerControl.xaml
index cb398e1..8a75257 100644
--- a/Lite/Controls/PlanViewerControl.xaml
+++ b/Lite/Controls/PlanViewerControl.xaml
@@ -1,13 +1,15 @@
 <UserControl x:Class="PerformanceMonitorLite.Controls.PlanViewerControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Background="{DynamicResource BackgroundBrush}">
+             Background="{DynamicResource BackgroundBrush}"
+             Focusable="True"
+             PreviewMouseDown="PlanViewerControl_PreviewMouseDown"
+             PreviewKeyDown="PlanViewerControl_PreviewKeyDown">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
@@ -41,44 +43,87 @@
             </DockPanel>
         </Border>
 
-        <!-- Missing Index Banner -->
-        <Border x:Name="MissingIndexBanner" Grid.Row="1" Padding="10,8"
-                Background="#3D2A0E" Visibility="Collapsed"
-                BorderBrush="#7A5A1E" BorderThickness="0,0,0,1">
-            <StackPanel>
-                <TextBlock Text="Missing Index Suggestions" FontWeight="SemiBold"
-                           Foreground="#FFB347" Margin="0,0,0,4"/>
-                <ItemsControl x:Name="MissingIndexList">
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel Margin="0,2">
-                                <TextBlock Foreground="#E4E6EB" FontSize="11" TextWrapping="Wrap">
-                                    <Run Text="{Binding Table, Mode=OneWay}" FontWeight="SemiBold"/>
-                                    <Run Text=" — Impact: "/>
-                                    <Run Text="{Binding Impact, StringFormat={}{0:F1}%, Mode=OneWay}" Foreground="#FFB347"/>
-                                </TextBlock>
-                                <TextBlock Text="{Binding CreateStatement, Mode=OneWay}" FontFamily="Consolas" FontSize="10"
-                                           Foreground="{DynamicResource ForegroundMutedBrush}" TextWrapping="Wrap"
-                                           Margin="12,2,0,0"/>
+        <!-- Insights Panel: Runtime Summary + Missing Indexes + Wait Stats (collapsible) -->
+        <Border x:Name="InsightsPanel" Grid.Row="1" Visibility="Collapsed"
+                Background="{DynamicResource BackgroundDarkBrush}"
+                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+            <Expander x:Name="InsightsExpander" IsExpanded="True"
+                      Foreground="{DynamicResource ForegroundBrush}"
+                      Background="Transparent"
+                      BorderThickness="0"
+                      Padding="0">
+                <Expander.Header>
+                    <TextBlock x:Name="InsightsHeader" Text="  Plan Insights"
+                               FontWeight="SemiBold"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                </Expander.Header>
+                <Grid MaxHeight="220">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" MinWidth="180"/>
+                        <ColumnDefinition Width="Auto" MinWidth="200"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <!-- Runtime Summary (left) -->
+                    <Border Grid.Column="0" Padding="10,4,10,8"
+                            Background="{DynamicResource BackgroundDarkBrush}"
+                            BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,1,0">
+                        <StackPanel>
+                            <TextBlock Text="Runtime Summary"
+                                       FontSize="13"
+                                       FontWeight="SemiBold"
+                                       Foreground="{DynamicResource ForegroundBrush}"
+                                       Margin="0,0,0,4"/>
+                            <StackPanel x:Name="RuntimeSummaryContent"/>
+                        </StackPanel>
+                    </Border>
+
+                    <!-- Missing Indexes (center) -->
+                    <Border Grid.Column="1" Padding="10,4,10,8"
+                            Background="#3D2A0E"
+                            BorderBrush="#7A5A1E" BorderThickness="0,0,1,0">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto"
+                                      HorizontalScrollBarVisibility="Disabled">
+                            <StackPanel>
+                                <TextBlock x:Name="MissingIndexHeader"
+                                           Text="Missing Index Suggestions"
+                                           FontSize="13"
+                                           FontWeight="SemiBold" Foreground="#FFB347"
+                                           Margin="0,0,0,6"/>
+                                <StackPanel x:Name="MissingIndexContent"/>
+                                <TextBlock x:Name="MissingIndexEmpty"
+                                           Text="No missing index suggestions"
+                                           FontSize="12" Visibility="Collapsed"
+                                           Foreground="{DynamicResource ForegroundBrush}"/>
                             </StackPanel>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
-            </StackPanel>
-        </Border>
+                        </ScrollViewer>
+                    </Border>
 
-        <!-- Warnings Banner -->
-        <Border x:Name="WarningsBanner" Grid.Row="2" Padding="10,6"
-                Background="#3D1A1A" Visibility="Collapsed"
-                BorderBrush="#7A2A2A" BorderThickness="0,0,0,1">
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="&#x26A0;" Foreground="#E57373" FontSize="14" VerticalAlignment="Center" Margin="0,0,8,0"/>
-                <TextBlock x:Name="WarningsSummaryText" Foreground="#E57373" VerticalAlignment="Center" FontSize="12"/>
-            </StackPanel>
+                    <!-- Wait Stats (right, fills remaining space) -->
+                    <Border Grid.Column="2" Padding="10,4,10,8"
+                            Background="#1A2A3D">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto"
+                                      HorizontalScrollBarVisibility="Disabled">
+                            <StackPanel>
+                                <TextBlock x:Name="WaitStatsHeader"
+                                           Text="Wait Stats"
+                                           FontSize="13"
+                                           FontWeight="SemiBold" Foreground="#4FA3FF"
+                                           Margin="0,0,0,6"/>
+                                <StackPanel x:Name="WaitStatsContent"/>
+                                <TextBlock x:Name="WaitStatsEmpty"
+                                           Text="No wait stats (estimated plan)"
+                                           FontSize="12" Visibility="Collapsed"
+                                           Foreground="{DynamicResource ForegroundBrush}"/>
+                            </StackPanel>
+                        </ScrollViewer>
+                    </Border>
+                </Grid>
+            </Expander>
         </Border>
 
         <!-- Query Text (collapsible) -->
-        <Expander Grid.Row="3" x:Name="QueryTextExpander" Header="  Query Text"
+        <Expander Grid.Row="2" x:Name="QueryTextExpander" Header="  Query Text"
                   IsExpanded="False" Visibility="Collapsed"
                   Foreground="{DynamicResource ForegroundBrush}"
                   Background="{DynamicResource BackgroundDarkBrush}"
@@ -93,7 +138,7 @@
         </Expander>
 
         <!-- Plan Canvas + Properties Panel -->
-        <Grid Grid.Row="4">
+        <Grid Grid.Row="3">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
@@ -105,8 +150,12 @@
                           HorizontalScrollBarVisibility="Auto"
                           VerticalScrollBarVisibility="Auto"
                           Background="{DynamicResource BackgroundBrush}"
-                          PreviewMouseWheel="PlanScrollViewer_PreviewMouseWheel">
-                <Canvas x:Name="PlanCanvas" ClipToBounds="False">
+                          PreviewMouseWheel="PlanScrollViewer_PreviewMouseWheel"
+                          PreviewMouseLeftButtonDown="PlanScrollViewer_PreviewMouseLeftButtonDown"
+                          PreviewMouseMove="PlanScrollViewer_PreviewMouseMove"
+                          PreviewMouseLeftButtonUp="PlanScrollViewer_PreviewMouseLeftButtonUp">
+                <Canvas x:Name="PlanCanvas" ClipToBounds="False"
+                        HorizontalAlignment="Left" VerticalAlignment="Top">
                     <Canvas.LayoutTransform>
                         <ScaleTransform x:Name="ZoomTransform" ScaleX="1" ScaleY="1"/>
                     </Canvas.LayoutTransform>
diff --git a/Lite/Controls/PlanViewerControl.xaml.cs b/Lite/Controls/PlanViewerControl.xaml.cs
index 9b17ad5..0603ba5 100644
--- a/Lite/Controls/PlanViewerControl.xaml.cs
+++ b/Lite/Controls/PlanViewerControl.xaml.cs
@@ -37,14 +37,21 @@ public partial class PlanViewerControl : UserControl
     private static readonly SolidColorBrush TooltipBgBrush = new(Color.FromRgb(0x1A, 0x1D, 0x23));
     private static readonly SolidColorBrush TooltipBorderBrush = new(Color.FromRgb(0x3A, 0x3D, 0x45));
     private static readonly SolidColorBrush TooltipFgBrush = new(Color.FromRgb(0xE4, 0xE6, 0xEB));
-    private static readonly SolidColorBrush MutedBrush = new(Color.FromRgb(0x6B, 0x72, 0x80));
+    private static readonly SolidColorBrush MutedBrush = new(Color.FromRgb(0xE4, 0xE6, 0xEB));
     private static readonly SolidColorBrush EdgeBrush = new(Color.FromRgb(0x6B, 0x72, 0x80));
     private static readonly SolidColorBrush SectionHeaderBrush = new(Color.FromRgb(0x4F, 0xA3, 0xFF));
     private static readonly SolidColorBrush PropSeparatorBrush = new(Color.FromRgb(0x2A, 0x2D, 0x35));
+    private static readonly SolidColorBrush OrangeBrush = new(Color.FromRgb(0xFF, 0xB3, 0x47));
 
     // Current property section for collapsible groups
     private StackPanel? _currentPropertySection;
 
+    // Canvas panning
+    private bool _isPanning;
+    private Point _panStart;
+    private double _panStartOffsetX;
+    private double _panStartOffsetY;
+
     public PlanViewerControl()
     {
         InitializeComponent();
@@ -121,8 +128,7 @@ public void Clear()
         _selectedNodeBorder = null;
         EmptyState.Visibility = Visibility.Visible;
         PlanScrollViewer.Visibility = Visibility.Collapsed;
-        MissingIndexBanner.Visibility = Visibility.Collapsed;
-        WarningsBanner.Visibility = Visibility.Collapsed;
+        InsightsPanel.Visibility = Visibility.Collapsed;
         StatementLabel.Visibility = Visibility.Collapsed;
         StatementSelector.Visibility = Visibility.Collapsed;
         CostText.Text = "";
@@ -135,6 +141,7 @@ private void RenderStatement(PlanStatement statement)
         _currentStatement = statement;
         PlanCanvas.Children.Clear();
         _selectedNodeBorder = null;
+        PlanScrollViewer.ScrollToHome();
 
         if (statement.RootNode == null) return;
 
@@ -148,11 +155,15 @@ private void RenderStatement(PlanStatement statement)
         RenderEdges(statement.RootNode);
 
         // Render nodes
-        RenderNodes(statement.RootNode);
+        var allWarnings = new List<PlanWarning>();
+        CollectWarnings(statement.RootNode, allWarnings);
+        RenderNodes(statement.RootNode, allWarnings.Count);
 
-        // Update banners
+        // Update insights panel
         ShowMissingIndexes(statement.MissingIndexes);
-        ShowWarnings(statement.RootNode);
+        ShowWaitStats(statement.WaitStats, statement.QueryTimeStats != null);
+        ShowRuntimeSummary(statement);
+        UpdateInsightsHeader();
 
         // Update cost text
         CostText.Text = $"Statement Cost: {statement.StatementSubTreeCost:F4}";
@@ -160,9 +171,9 @@ private void RenderStatement(PlanStatement statement)
 
     #region Node Rendering
 
-    private void RenderNodes(PlanNode node)
+    private void RenderNodes(PlanNode node, int totalWarningCount = -1)
     {
-        var visual = CreateNodeVisual(node);
+        var visual = CreateNodeVisual(node, totalWarningCount);
         Canvas.SetLeft(visual, node.X);
         Canvas.SetTop(visual, node.Y);
         PlanCanvas.Children.Add(visual);
@@ -171,7 +182,7 @@ private void RenderNodes(PlanNode node)
             RenderNodes(child);
     }
 
-    private Border CreateNodeVisual(PlanNode node)
+    private Border CreateNodeVisual(PlanNode node, int totalWarningCount = -1)
     {
         var isExpensive = node.IsExpensive;
 
@@ -365,6 +376,34 @@ private Border CreateNodeVisual(PlanNode node)
             });
         }
 
+        // Total warning count badge on root node
+        if (totalWarningCount > 0)
+        {
+            var badgeRow = new StackPanel
+            {
+                Orientation = Orientation.Horizontal,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Margin = new Thickness(0, 2, 0, 0)
+            };
+            badgeRow.Children.Add(new TextBlock
+            {
+                Text = "\u26A0",
+                FontSize = 13,
+                Foreground = OrangeBrush,
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(0, 0, 4, 0)
+            });
+            badgeRow.Children.Add(new TextBlock
+            {
+                Text = $"{totalWarningCount} warning{(totalWarningCount == 1 ? "" : "s")}",
+                FontSize = 12,
+                FontWeight = FontWeights.SemiBold,
+                Foreground = OrangeBrush,
+                VerticalAlignment = VerticalAlignment.Center
+            });
+            stack.Children.Add(badgeRow);
+        }
+
         border.Child = stack;
         return border;
     }
@@ -551,16 +590,28 @@ private void ShowPropertiesPanel(PlanNode node)
             AddPropertyRow("Storage", node.StorageType);
         if (node.IsAdaptive)
             AddPropertyRow("Adaptive", "True");
+        if (node.SpillOccurredDetail)
+            AddPropertyRow("Spill Occurred", "True");
 
         // === Object Section ===
         if (!string.IsNullOrEmpty(node.FullObjectName))
         {
             AddPropertySection("Object");
             AddPropertyRow("Full Name", node.FullObjectName, isCode: true);
+            if (!string.IsNullOrEmpty(node.ServerName))
+                AddPropertyRow("Server", node.ServerName);
             if (!string.IsNullOrEmpty(node.DatabaseName))
                 AddPropertyRow("Database", node.DatabaseName);
+            if (!string.IsNullOrEmpty(node.ObjectAlias))
+                AddPropertyRow("Alias", node.ObjectAlias);
             if (!string.IsNullOrEmpty(node.IndexName))
                 AddPropertyRow("Index", node.IndexName);
+            if (!string.IsNullOrEmpty(node.IndexKind))
+                AddPropertyRow("Index Kind", node.IndexKind);
+            if (node.FilteredIndex)
+                AddPropertyRow("Filtered Index", "True");
+            if (node.TableReferenceId > 0)
+                AddPropertyRow("Table Ref Id", $"{node.TableReferenceId}");
         }
 
         // === Operator Details Section ===
@@ -580,7 +631,9 @@ private void ShowPropertiesPanel(PlanNode node)
             || node.NLOptimized || node.WithOrderedPrefetch || node.WithUnorderedPrefetch
             || node.WithTies || node.Remoting || node.LocalParallelism
             || node.SpoolStack || node.DMLRequestSort
-            || !string.IsNullOrEmpty(node.OffsetExpression) || node.TopRows > 0;
+            || !string.IsNullOrEmpty(node.OffsetExpression) || node.TopRows > 0
+            || !string.IsNullOrEmpty(node.ConstantScanValues)
+            || !string.IsNullOrEmpty(node.UdxUsedColumns);
 
         if (hasOperatorDetails)
         {
@@ -640,6 +693,117 @@ private void ShowPropertiesPanel(PlanNode node)
                 AddPropertyRow("Outer Join Cols", node.OuterSideJoinColumns, isCode: true);
             if (node.ManyToMany)
                 AddPropertyRow("Many to Many", "True");
+            if (!string.IsNullOrEmpty(node.ConstantScanValues))
+                AddPropertyRow("Values", node.ConstantScanValues, isCode: true);
+            if (!string.IsNullOrEmpty(node.UdxUsedColumns))
+                AddPropertyRow("UDX Columns", node.UdxUsedColumns, isCode: true);
+            if (node.RowCount)
+                AddPropertyRow("Row Count", "True");
+            if (node.ForceSeekColumnCount > 0)
+                AddPropertyRow("ForceSeek Columns", $"{node.ForceSeekColumnCount}");
+            if (!string.IsNullOrEmpty(node.PartitionId))
+                AddPropertyRow("Partition Id", node.PartitionId, isCode: true);
+            if (node.IsStarJoin)
+                AddPropertyRow("Star Join Root", "True");
+            if (!string.IsNullOrEmpty(node.StarJoinOperationType))
+                AddPropertyRow("Star Join Type", node.StarJoinOperationType);
+            if (!string.IsNullOrEmpty(node.ProbeColumn))
+                AddPropertyRow("Probe Column", node.ProbeColumn, isCode: true);
+            if (node.InRow)
+                AddPropertyRow("In-Row", "True");
+            if (node.ComputeSequence)
+                AddPropertyRow("Compute Sequence", "True");
+            if (node.RollupHighestLevel > 0)
+                AddPropertyRow("Rollup Highest Level", $"{node.RollupHighestLevel}");
+            if (node.RollupLevels.Count > 0)
+                AddPropertyRow("Rollup Levels", string.Join(", ", node.RollupLevels));
+            if (!string.IsNullOrEmpty(node.TvfParameters))
+                AddPropertyRow("TVF Parameters", node.TvfParameters, isCode: true);
+            if (!string.IsNullOrEmpty(node.OriginalActionColumn))
+                AddPropertyRow("Original Action Col", node.OriginalActionColumn, isCode: true);
+            if (!string.IsNullOrEmpty(node.TieColumns))
+                AddPropertyRow("WITH TIES Columns", node.TieColumns, isCode: true);
+            if (!string.IsNullOrEmpty(node.UdxName))
+                AddPropertyRow("UDX Name", node.UdxName);
+            if (node.GroupExecuted)
+                AddPropertyRow("Group Executed", "True");
+            if (node.RemoteDataAccess)
+                AddPropertyRow("Remote Data Access", "True");
+            if (node.OptimizedHalloweenProtectionUsed)
+                AddPropertyRow("Halloween Protection", "True");
+            if (node.StatsCollectionId > 0)
+                AddPropertyRow("Stats Collection Id", $"{node.StatsCollectionId}");
+        }
+
+        // === Scalar UDFs ===
+        if (node.ScalarUdfs.Count > 0)
+        {
+            AddPropertySection("Scalar UDFs");
+            foreach (var udf in node.ScalarUdfs)
+            {
+                var udfDetail = udf.FunctionName;
+                if (udf.IsClrFunction)
+                {
+                    udfDetail += " (CLR)";
+                    if (!string.IsNullOrEmpty(udf.ClrAssembly))
+                        udfDetail += $"\n  Assembly: {udf.ClrAssembly}";
+                    if (!string.IsNullOrEmpty(udf.ClrClass))
+                        udfDetail += $"\n  Class: {udf.ClrClass}";
+                    if (!string.IsNullOrEmpty(udf.ClrMethod))
+                        udfDetail += $"\n  Method: {udf.ClrMethod}";
+                }
+                AddPropertyRow("UDF", udfDetail, isCode: true);
+            }
+        }
+
+        // === Named Parameters (IndexScan) ===
+        if (node.NamedParameters.Count > 0)
+        {
+            AddPropertySection("Named Parameters");
+            foreach (var np in node.NamedParameters)
+                AddPropertyRow(np.Name, np.ScalarString ?? "", isCode: true);
+        }
+
+        // === Per-Operator Indexed Views ===
+        if (node.OperatorIndexedViews.Count > 0)
+        {
+            AddPropertySection("Operator Indexed Views");
+            foreach (var iv in node.OperatorIndexedViews)
+                AddPropertyRow("View", iv, isCode: true);
+        }
+
+        // === Suggested Index (Eager Spool) ===
+        if (!string.IsNullOrEmpty(node.SuggestedIndex))
+        {
+            AddPropertySection("Suggested Index");
+            AddPropertyRow("CREATE INDEX", node.SuggestedIndex, isCode: true);
+        }
+
+        // === Remote Operator ===
+        if (!string.IsNullOrEmpty(node.RemoteDestination) || !string.IsNullOrEmpty(node.RemoteSource)
+            || !string.IsNullOrEmpty(node.RemoteObject) || !string.IsNullOrEmpty(node.RemoteQuery))
+        {
+            AddPropertySection("Remote Operator");
+            if (!string.IsNullOrEmpty(node.RemoteDestination))
+                AddPropertyRow("Destination", node.RemoteDestination);
+            if (!string.IsNullOrEmpty(node.RemoteSource))
+                AddPropertyRow("Source", node.RemoteSource);
+            if (!string.IsNullOrEmpty(node.RemoteObject))
+                AddPropertyRow("Object", node.RemoteObject, isCode: true);
+            if (!string.IsNullOrEmpty(node.RemoteQuery))
+                AddPropertyRow("Query", node.RemoteQuery, isCode: true);
+        }
+
+        // === Foreign Key References Section ===
+        if (node.ForeignKeyReferencesCount > 0 || node.NoMatchingIndexCount > 0 || node.PartialMatchingIndexCount > 0)
+        {
+            AddPropertySection("Foreign Key References");
+            if (node.ForeignKeyReferencesCount > 0)
+                AddPropertyRow("FK References", $"{node.ForeignKeyReferencesCount}");
+            if (node.NoMatchingIndexCount > 0)
+                AddPropertyRow("No Matching Index", $"{node.NoMatchingIndexCount}");
+            if (node.PartialMatchingIndexCount > 0)
+                AddPropertyRow("Partial Matching Index", $"{node.PartialMatchingIndexCount}");
         }
 
         // === Adaptive Join Section ===
@@ -669,6 +833,8 @@ private void ShowPropertiesPanel(PlanNode node)
         AddPropertyRow("Est. Rows All Execs", $"{node.EstimateRows * Math.Max(1, estExecs):N1}");
         if (node.EstimatedRowsRead > 0)
             AddPropertyRow("Est. Rows to Read", $"{node.EstimatedRowsRead:N1}");
+        if (node.EstimateRowsWithoutRowGoal > 0)
+            AddPropertyRow("Est. Rows (No Row Goal)", $"{node.EstimateRowsWithoutRowGoal:N1}");
         if (node.TableCardinality > 0)
             AddPropertyRow("Table Cardinality", $"{node.TableCardinality:N0}");
         AddPropertyRow("Avg Row Size", $"{node.EstimatedRowSize} B");
@@ -680,9 +846,20 @@ private void ShowPropertiesPanel(PlanNode node)
         {
             AddPropertySection("Actual Statistics");
             AddPropertyRow("Actual Rows", $"{node.ActualRows:N0}");
+            if (node.PerThreadStats.Count > 1)
+                foreach (var t in node.PerThreadStats)
+                    AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualRows:N0}", indent: true);
             if (node.ActualRowsRead > 0)
+            {
                 AddPropertyRow("Actual Rows Read", $"{node.ActualRowsRead:N0}");
+                if (node.PerThreadStats.Count > 1)
+                    foreach (var t in node.PerThreadStats.Where(t => t.ActualRowsRead > 0))
+                        AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualRowsRead:N0}", indent: true);
+            }
             AddPropertyRow("Actual Executions", $"{node.ActualExecutions:N0}");
+            if (node.PerThreadStats.Count > 1)
+                foreach (var t in node.PerThreadStats)
+                    AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualExecutions:N0}", indent: true);
             if (node.ActualRebinds > 0)
                 AddPropertyRow("Actual Rebinds", $"{node.ActualRebinds:N0}");
             if (node.ActualRewinds > 0)
@@ -698,17 +875,27 @@ private void ShowPropertiesPanel(PlanNode node)
 
             // Timing
             if (node.ActualElapsedMs > 0 || node.ActualCPUMs > 0
-                || node.UdfCpuTimeUs > 0 || node.UdfElapsedTimeUs > 0)
+                || node.UdfCpuTimeMs > 0 || node.UdfElapsedTimeMs > 0)
             {
                 AddPropertySection("Actual Timing");
                 if (node.ActualElapsedMs > 0)
+                {
                     AddPropertyRow("Elapsed Time", $"{node.ActualElapsedMs:N0} ms");
+                    if (node.PerThreadStats.Count > 1)
+                        foreach (var t in node.PerThreadStats.Where(t => t.ActualElapsedMs > 0))
+                            AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualElapsedMs:N0} ms", indent: true);
+                }
                 if (node.ActualCPUMs > 0)
+                {
                     AddPropertyRow("CPU Time", $"{node.ActualCPUMs:N0} ms");
-                if (node.UdfElapsedTimeUs > 0)
-                    AddPropertyRow("UDF Elapsed", $"{node.UdfElapsedTimeUs:N0} us");
-                if (node.UdfCpuTimeUs > 0)
-                    AddPropertyRow("UDF CPU", $"{node.UdfCpuTimeUs:N0} us");
+                    if (node.PerThreadStats.Count > 1)
+                        foreach (var t in node.PerThreadStats.Where(t => t.ActualCPUMs > 0))
+                            AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualCPUMs:N0} ms", indent: true);
+                }
+                if (node.UdfElapsedTimeMs > 0)
+                    AddPropertyRow("UDF Elapsed", $"{node.UdfElapsedTimeMs:N0} ms");
+                if (node.UdfCpuTimeMs > 0)
+                    AddPropertyRow("UDF CPU", $"{node.UdfCpuTimeMs:N0} ms");
             }
 
             // I/O
@@ -719,12 +906,30 @@ private void ShowPropertiesPanel(PlanNode node)
             {
                 AddPropertySection("Actual I/O");
                 AddPropertyRow("Logical Reads", $"{node.ActualLogicalReads:N0}");
+                if (node.PerThreadStats.Count > 1)
+                    foreach (var t in node.PerThreadStats.Where(t => t.ActualLogicalReads > 0))
+                        AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualLogicalReads:N0}", indent: true);
                 if (node.ActualPhysicalReads > 0)
+                {
                     AddPropertyRow("Physical Reads", $"{node.ActualPhysicalReads:N0}");
+                    if (node.PerThreadStats.Count > 1)
+                        foreach (var t in node.PerThreadStats.Where(t => t.ActualPhysicalReads > 0))
+                            AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualPhysicalReads:N0}", indent: true);
+                }
                 if (node.ActualScans > 0)
+                {
                     AddPropertyRow("Scans", $"{node.ActualScans:N0}");
+                    if (node.PerThreadStats.Count > 1)
+                        foreach (var t in node.PerThreadStats.Where(t => t.ActualScans > 0))
+                            AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualScans:N0}", indent: true);
+                }
                 if (node.ActualReadAheads > 0)
+                {
                     AddPropertyRow("Read-Ahead Reads", $"{node.ActualReadAheads:N0}");
+                    if (node.PerThreadStats.Count > 1)
+                        foreach (var t in node.PerThreadStats.Where(t => t.ActualReadAheads > 0))
+                            AddPropertyRow($"  Thread {t.ThreadId}", $"{t.ActualReadAheads:N0}", indent: true);
+                }
                 if (node.ActualSegmentReads > 0)
                     AddPropertyRow("Segment Reads", $"{node.ActualSegmentReads:N0}");
                 if (node.ActualSegmentSkips > 0)
@@ -751,7 +956,8 @@ private void ShowPropertiesPanel(PlanNode node)
             || !string.IsNullOrEmpty(node.HashKeysProbe) || !string.IsNullOrEmpty(node.HashKeysBuild)
             || !string.IsNullOrEmpty(node.BuildResidual) || !string.IsNullOrEmpty(node.ProbeResidual)
             || !string.IsNullOrEmpty(node.MergeResidual) || !string.IsNullOrEmpty(node.PassThru)
-            || !string.IsNullOrEmpty(node.SetPredicate);
+            || !string.IsNullOrEmpty(node.SetPredicate)
+            || node.GuessedSelectivity;
         if (hasPredicates)
         {
             AddPropertySection("Predicates");
@@ -773,6 +979,8 @@ private void ShowPropertiesPanel(PlanNode node)
                 AddPropertyRow("Pass Through", node.PassThru, isCode: true);
             if (!string.IsNullOrEmpty(node.SetPredicate))
                 AddPropertyRow("Set Predicate", node.SetPredicate, isCode: true);
+            if (node.GuessedSelectivity)
+                AddPropertyRow("Guessed Selectivity", "True (optimizer guessed, no statistics)");
         }
 
         // === Output Columns ===
@@ -784,12 +992,16 @@ private void ShowPropertiesPanel(PlanNode node)
 
         // === Memory ===
         if (node.MemoryGrantKB > 0 || node.DesiredMemoryKB > 0 || node.MaxUsedMemoryKB > 0
-            || node.MemoryFractionInput > 0 || node.MemoryFractionOutput > 0)
+            || node.MemoryFractionInput > 0 || node.MemoryFractionOutput > 0
+            || node.InputMemoryGrantKB > 0 || node.OutputMemoryGrantKB > 0 || node.UsedMemoryGrantKB > 0)
         {
             AddPropertySection("Memory");
             if (node.MemoryGrantKB > 0) AddPropertyRow("Granted", $"{node.MemoryGrantKB:N0} KB");
             if (node.DesiredMemoryKB > 0) AddPropertyRow("Desired", $"{node.DesiredMemoryKB:N0} KB");
             if (node.MaxUsedMemoryKB > 0) AddPropertyRow("Max Used", $"{node.MaxUsedMemoryKB:N0} KB");
+            if (node.InputMemoryGrantKB > 0) AddPropertyRow("Input Grant", $"{node.InputMemoryGrantKB:N0} KB");
+            if (node.OutputMemoryGrantKB > 0) AddPropertyRow("Output Grant", $"{node.OutputMemoryGrantKB:N0} KB");
+            if (node.UsedMemoryGrantKB > 0) AddPropertyRow("Used Grant", $"{node.UsedMemoryGrantKB:N0} KB");
             if (node.MemoryFractionInput > 0) AddPropertyRow("Fraction Input", $"{node.MemoryFractionInput:F4}");
             if (node.MemoryFractionOutput > 0) AddPropertyRow("Fraction Output", $"{node.MemoryFractionOutput:F4}");
         }
@@ -800,12 +1012,15 @@ private void ShowPropertiesPanel(PlanNode node)
             var s = _currentStatement;
 
             // === Statement Text ===
-            if (!string.IsNullOrEmpty(s.StatementText))
+            if (!string.IsNullOrEmpty(s.StatementText) || !string.IsNullOrEmpty(s.StmtUseDatabaseName))
             {
                 AddPropertySection("Statement");
-                AddPropertyRow("Text", s.StatementText, isCode: true);
+                if (!string.IsNullOrEmpty(s.StatementText))
+                    AddPropertyRow("Text", s.StatementText, isCode: true);
                 if (!string.IsNullOrEmpty(s.ParameterizedText) && s.ParameterizedText != s.StatementText)
                     AddPropertyRow("Parameterized", s.ParameterizedText, isCode: true);
+                if (!string.IsNullOrEmpty(s.StmtUseDatabaseName))
+                    AddPropertyRow("USE Database", s.StmtUseDatabaseName);
             }
 
             // === Cursor Info ===
@@ -860,6 +1075,8 @@ private void ShowPropertiesPanel(PlanNode node)
                 AddPropertyRow("Non-Parallel Reason", s.NonParallelPlanReason);
             if (s.MaxQueryMemoryKB > 0)
                 AddPropertyRow("Max Query Memory", $"{s.MaxQueryMemoryKB:N0} KB");
+            if (s.QueryPlanMemoryGrantKB > 0)
+                AddPropertyRow("QueryPlan Memory Grant", $"{s.QueryPlanMemoryGrantKB:N0} KB");
             AddPropertyRow("Compile Time", $"{s.CompileTimeMs:N0} ms");
             AddPropertyRow("Compile CPU", $"{s.CompileCPUMs:N0} ms");
             AddPropertyRow("Compile Memory", $"{s.CompileMemoryKB:N0} KB");
@@ -898,6 +1115,85 @@ private void ShowPropertiesPanel(PlanNode node)
                     AddPropertyRow("QS Hint Source", s.QueryStoreStatementHintSource);
             }
 
+            // === Feature Flags ===
+            if (s.ContainsInterleavedExecutionCandidates || s.ContainsInlineScalarTsqlUdfs
+                || s.ContainsLedgerTables || s.ExclusiveProfileTimeActive || s.QueryCompilationReplay > 0
+                || s.QueryVariantID > 0)
+            {
+                AddPropertySection("Feature Flags");
+                if (s.ContainsInterleavedExecutionCandidates)
+                    AddPropertyRow("Interleaved Execution", "True");
+                if (s.ContainsInlineScalarTsqlUdfs)
+                    AddPropertyRow("Inline Scalar UDFs", "True");
+                if (s.ContainsLedgerTables)
+                    AddPropertyRow("Ledger Tables", "True");
+                if (s.ExclusiveProfileTimeActive)
+                    AddPropertyRow("Exclusive Profile Time", "True");
+                if (s.QueryCompilationReplay > 0)
+                    AddPropertyRow("Compilation Replay", $"{s.QueryCompilationReplay}");
+                if (s.QueryVariantID > 0)
+                    AddPropertyRow("Query Variant ID", $"{s.QueryVariantID}");
+            }
+
+            // === PSP Dispatcher ===
+            if (s.Dispatcher != null)
+            {
+                AddPropertySection("PSP Dispatcher");
+                if (!string.IsNullOrEmpty(s.DispatcherPlanHandle))
+                    AddPropertyRow("Plan Handle", s.DispatcherPlanHandle, isCode: true);
+                foreach (var psp in s.Dispatcher.ParameterSensitivePredicates)
+                {
+                    var range = $"[{psp.LowBoundary:N0} — {psp.HighBoundary:N0}]";
+                    var predText = psp.PredicateText ?? "";
+                    AddPropertyRow("Predicate", $"{predText} {range}", isCode: true);
+                    foreach (var stat in psp.Statistics)
+                    {
+                        var statLabel = !string.IsNullOrEmpty(stat.TableName)
+                            ? $"  {stat.TableName}.{stat.StatisticsName}"
+                            : $"  {stat.StatisticsName}";
+                        AddPropertyRow(statLabel, $"Modified: {stat.ModificationCount:N0}, Sampled: {stat.SamplingPercent:F1}%", indent: true);
+                    }
+                }
+                foreach (var opt in s.Dispatcher.OptionalParameterPredicates)
+                {
+                    if (!string.IsNullOrEmpty(opt.PredicateText))
+                        AddPropertyRow("Optional Predicate", opt.PredicateText, isCode: true);
+                }
+            }
+
+            // === Cardinality Feedback ===
+            if (s.CardinalityFeedback.Count > 0)
+            {
+                AddPropertySection("Cardinality Feedback");
+                foreach (var cf in s.CardinalityFeedback)
+                    AddPropertyRow($"Node {cf.Key}", $"{cf.Value:N0}");
+            }
+
+            // === Optimization Replay ===
+            if (!string.IsNullOrEmpty(s.OptimizationReplayScript))
+            {
+                AddPropertySection("Optimization Replay");
+                AddPropertyRow("Script", s.OptimizationReplayScript, isCode: true);
+            }
+
+            // === Template Plan Guide ===
+            if (!string.IsNullOrEmpty(s.TemplatePlanGuideName))
+            {
+                AddPropertyRow("Template Plan Guide", s.TemplatePlanGuideName);
+                if (!string.IsNullOrEmpty(s.TemplatePlanGuideDB))
+                    AddPropertyRow("Template Guide DB", s.TemplatePlanGuideDB);
+            }
+
+            // === Handles ===
+            if (!string.IsNullOrEmpty(s.ParameterizedPlanHandle) || !string.IsNullOrEmpty(s.BatchSqlHandle))
+            {
+                AddPropertySection("Handles");
+                if (!string.IsNullOrEmpty(s.ParameterizedPlanHandle))
+                    AddPropertyRow("Parameterized Plan", s.ParameterizedPlanHandle, isCode: true);
+                if (!string.IsNullOrEmpty(s.BatchSqlHandle))
+                    AddPropertyRow("Batch SQL Handle", s.BatchSqlHandle, isCode: true);
+            }
+
             // === Set Options ===
             if (s.SetOptions != null)
             {
@@ -924,6 +1220,18 @@ private void ShowPropertiesPanel(PlanNode node)
                     AddPropertyRow("Max Compile Memory", $"{hw.MaxCompileMemory:N0} KB");
             }
 
+            // === Plan Version ===
+            if (_currentPlan != null && (!string.IsNullOrEmpty(_currentPlan.BuildVersion) || !string.IsNullOrEmpty(_currentPlan.Build)))
+            {
+                AddPropertySection("Plan Version");
+                if (!string.IsNullOrEmpty(_currentPlan.BuildVersion))
+                    AddPropertyRow("Build Version", _currentPlan.BuildVersion);
+                if (!string.IsNullOrEmpty(_currentPlan.Build))
+                    AddPropertyRow("Build", _currentPlan.Build);
+                if (_currentPlan.ClusteredMode)
+                    AddPropertyRow("Clustered Mode", "True");
+            }
+
             // === Optimizer Stats Usage ===
             if (s.StatsUsage.Count > 0)
             {
@@ -961,6 +1269,10 @@ private void ShowPropertiesPanel(PlanNode node)
                 AddPropertySection("Query Time Stats");
                 AddPropertyRow("CPU Time", $"{s.QueryTimeStats.CpuTimeMs:N0} ms");
                 AddPropertyRow("Elapsed Time", $"{s.QueryTimeStats.ElapsedTimeMs:N0} ms");
+                if (s.QueryUdfCpuTimeMs > 0)
+                    AddPropertyRow("UDF CPU Time", $"{s.QueryUdfCpuTimeMs:N0} ms");
+                if (s.QueryUdfElapsedTimeMs > 0)
+                    AddPropertyRow("UDF Elapsed Time", $"{s.QueryUdfElapsedTimeMs:N0} ms");
             }
 
             // === Thread Stats (actual plans) ===
@@ -969,13 +1281,22 @@ private void ShowPropertiesPanel(PlanNode node)
                 AddPropertySection("Thread Stats");
                 AddPropertyRow("Branches", $"{s.ThreadStats.Branches}");
                 AddPropertyRow("Used Threads", $"{s.ThreadStats.UsedThreads}");
+                var totalReserved = s.ThreadStats.Reservations.Sum(r => r.ReservedThreads);
+                if (totalReserved > 0)
+                {
+                    AddPropertyRow("Reserved Threads", $"{totalReserved}");
+                    if (totalReserved > s.ThreadStats.UsedThreads)
+                        AddPropertyRow("Inactive Threads", $"{totalReserved - s.ThreadStats.UsedThreads}");
+                }
+                foreach (var res in s.ThreadStats.Reservations)
+                    AddPropertyRow($"  Node {res.NodeId}", $"{res.ReservedThreads} reserved");
             }
 
             // === Wait Stats (actual plans) ===
             if (s.WaitStats.Count > 0)
             {
                 AddPropertySection("Wait Stats");
-                foreach (var w in s.WaitStats)
+                foreach (var w in s.WaitStats.OrderByDescending(w => w.WaitTimeMs))
                     AddPropertyRow(w.WaitType, $"{w.WaitTimeMs:N0} ms ({w.WaitCount:N0} waits)");
             }
 
@@ -1099,18 +1420,20 @@ private void AddPropertySection(string title)
         _currentPropertySection = contentPanel;
     }
 
-    private void AddPropertyRow(string label, string value, bool isCode = false)
+    private void AddPropertyRow(string label, string value, bool isCode = false, bool indent = false)
     {
         var grid = new Grid { Margin = new Thickness(10, 3, 10, 3) };
-        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(120) });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(140) });
         grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
 
         var labelBlock = new TextBlock
         {
             Text = label,
-            FontSize = 11,
+            FontSize = indent ? 10 : 11,
             Foreground = MutedBrush,
-            VerticalAlignment = VerticalAlignment.Top
+            VerticalAlignment = VerticalAlignment.Top,
+            TextWrapping = TextWrapping.Wrap,
+            Margin = indent ? new Thickness(16, 0, 0, 0) : new Thickness(0)
         };
         Grid.SetColumn(labelBlock, 0);
         grid.Children.Add(labelBlock);
@@ -1118,7 +1441,7 @@ private void AddPropertyRow(string label, string value, bool isCode = false)
         var valueBlock = new TextBlock
         {
             Text = value,
-            FontSize = 11,
+            FontSize = indent ? 10 : 11,
             Foreground = TooltipFgBrush,
             TextWrapping = TextWrapping.Wrap
         };
@@ -1362,47 +1685,303 @@ private static void AddTooltipRow(StackPanel parent, string label, string value,
 
     #endregion
 
-    #region Banners
+    #region Insights Panel
 
     private void ShowMissingIndexes(List<MissingIndex> indexes)
     {
+        MissingIndexContent.Children.Clear();
+
         if (indexes.Count > 0)
         {
-            MissingIndexList.ItemsSource = indexes;
-            MissingIndexBanner.Visibility = Visibility.Visible;
+            MissingIndexHeader.Text = $"  Missing Index Suggestions ({indexes.Count})";
+
+            foreach (var mi in indexes)
+            {
+                var itemPanel = new StackPanel { Margin = new Thickness(0, 4, 0, 0) };
+
+                var headerRow = new StackPanel { Orientation = Orientation.Horizontal };
+                headerRow.Children.Add(new TextBlock
+                {
+                    Text = mi.Table,
+                    FontWeight = FontWeights.SemiBold,
+                    Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB")),
+                    FontSize = 12
+                });
+                headerRow.Children.Add(new TextBlock
+                {
+                    Text = $" \u2014 Impact: ",
+                    Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB")),
+                    FontSize = 12
+                });
+                headerRow.Children.Add(new TextBlock
+                {
+                    Text = $"{mi.Impact:F1}%",
+                    Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FFB347")),
+                    FontSize = 12
+                });
+                itemPanel.Children.Add(headerRow);
+
+                if (!string.IsNullOrEmpty(mi.CreateStatement))
+                {
+                    itemPanel.Children.Add(new TextBox
+                    {
+                        Text = mi.CreateStatement,
+                        FontFamily = new FontFamily("Consolas"),
+                        FontSize = 11,
+                        Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB")),
+                        Background = Brushes.Transparent,
+                        BorderThickness = new Thickness(0),
+                        IsReadOnly = true,
+                        TextWrapping = TextWrapping.Wrap,
+                        Margin = new Thickness(12, 2, 0, 0)
+                    });
+                }
+
+                MissingIndexContent.Children.Add(itemPanel);
+            }
+
+            MissingIndexEmpty.Visibility = Visibility.Collapsed;
         }
         else
         {
-            MissingIndexBanner.Visibility = Visibility.Collapsed;
+            MissingIndexHeader.Text = "Missing Index Suggestions";
+            MissingIndexEmpty.Visibility = Visibility.Visible;
         }
     }
 
-    private void ShowWarnings(PlanNode root)
+    private static void CollectWarnings(PlanNode node, List<PlanWarning> warnings)
     {
-        var allWarnings = new List<PlanWarning>();
-        CollectWarnings(root, allWarnings);
+        warnings.AddRange(node.Warnings);
+        foreach (var child in node.Children)
+            CollectWarnings(child, warnings);
+    }
+
+    private void ShowWaitStats(List<WaitStatInfo> waits, bool isActualPlan)
+    {
+        WaitStatsContent.Children.Clear();
 
-        if (allWarnings.Count > 0)
+        if (waits.Count == 0)
         {
-            var criticalCount = allWarnings.Count(w => w.Severity == PlanWarningSeverity.Critical);
-            var warningCount = allWarnings.Count(w => w.Severity == PlanWarningSeverity.Warning);
-            var parts = new List<string>();
-            if (criticalCount > 0) parts.Add($"{criticalCount} critical");
-            if (warningCount > 0) parts.Add($"{warningCount} warning(s)");
-            WarningsSummaryText.Text = $"Plan has {string.Join(", ", parts)} — hover over nodes with \u26A0 for details";
-            WarningsBanner.Visibility = Visibility.Visible;
+            WaitStatsHeader.Text = "Wait Stats";
+            WaitStatsEmpty.Text = isActualPlan
+                ? "No wait stats recorded"
+                : "No wait stats (estimated plan)";
+            WaitStatsEmpty.Visibility = Visibility.Visible;
+            return;
         }
-        else
+
+        WaitStatsEmpty.Visibility = Visibility.Collapsed;
+
+        var sorted = waits.OrderByDescending(w => w.WaitTimeMs).ToList();
+        var maxWait = sorted[0].WaitTimeMs;
+        var totalWait = sorted.Sum(w => w.WaitTimeMs);
+
+        WaitStatsHeader.Text = $"  Wait Stats \u2014 {totalWait:N0}ms total";
+
+        var longestName = sorted.Max(w => w.WaitType.Length);
+        var nameColWidth = longestName * 6.5 + 10;
+
+        var maxBarWidth = 300;
+
+        var grid = new Grid();
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(nameColWidth) });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(maxBarWidth + 16) });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+
+        for (int i = 0; i < sorted.Count; i++)
+            grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+
+        for (int i = 0; i < sorted.Count; i++)
         {
-            WarningsBanner.Visibility = Visibility.Collapsed;
+            var w = sorted[i];
+            var barFraction = maxWait > 0 ? (double)w.WaitTimeMs / maxWait : 0;
+            var color = GetWaitCategoryColor(GetWaitCategory(w.WaitType));
+
+            var nameText = new TextBlock
+            {
+                Text = w.WaitType,
+                FontSize = 12,
+                Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB")),
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(0, 2, 10, 2)
+            };
+            Grid.SetRow(nameText, i);
+            Grid.SetColumn(nameText, 0);
+            grid.Children.Add(nameText);
+
+            var colorBar = new Border
+            {
+                Width = Math.Max(4, barFraction * maxBarWidth),
+                Height = 14,
+                Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString(color)),
+                CornerRadius = new CornerRadius(2),
+                HorizontalAlignment = HorizontalAlignment.Left,
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(0, 2, 8, 2)
+            };
+            Grid.SetRow(colorBar, i);
+            Grid.SetColumn(colorBar, 1);
+            grid.Children.Add(colorBar);
+
+            var durationText = new TextBlock
+            {
+                Text = $"{w.WaitTimeMs:N0}ms ({w.WaitCount:N0} waits)",
+                FontSize = 12,
+                Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB")),
+                VerticalAlignment = VerticalAlignment.Center,
+                Margin = new Thickness(0, 2, 0, 2)
+            };
+            Grid.SetRow(durationText, i);
+            Grid.SetColumn(durationText, 2);
+            grid.Children.Add(durationText);
         }
+
+        WaitStatsContent.Children.Add(grid);
     }
 
-    private static void CollectWarnings(PlanNode node, List<PlanWarning> warnings)
+    private static string GetWaitCategory(string waitType)
     {
-        warnings.AddRange(node.Warnings);
-        foreach (var child in node.Children)
-            CollectWarnings(child, warnings);
+        if (waitType.StartsWith("SOS_SCHEDULER_YIELD", StringComparison.Ordinal) ||
+            waitType.StartsWith("CXPACKET", StringComparison.Ordinal) ||
+            waitType.StartsWith("CXCONSUMER", StringComparison.Ordinal) ||
+            waitType.StartsWith("CXSYNC_PORT", StringComparison.Ordinal) ||
+            waitType.StartsWith("CXSYNC_CONSUMER", StringComparison.Ordinal))
+            return "CPU";
+
+        if (waitType.StartsWith("PAGEIOLATCH", StringComparison.Ordinal) ||
+            waitType.StartsWith("WRITELOG", StringComparison.Ordinal) ||
+            waitType.StartsWith("IO_COMPLETION", StringComparison.Ordinal) ||
+            waitType.StartsWith("ASYNC_IO_COMPLETION", StringComparison.Ordinal))
+            return "I/O";
+
+        if (waitType.StartsWith("LCK_M_", StringComparison.Ordinal))
+            return "Lock";
+
+        if (waitType == "RESOURCE_SEMAPHORE" || waitType == "CMEMTHREAD")
+            return "Memory";
+
+        if (waitType == "ASYNC_NETWORK_IO")
+            return "Network";
+
+        return "Other";
+    }
+
+    private static string GetWaitCategoryColor(string category)
+    {
+        return category switch
+        {
+            "CPU" => "#4FA3FF",
+            "I/O" => "#FFB347",
+            "Lock" => "#E57373",
+            "Memory" => "#9B59B6",
+            "Network" => "#2ECC71",
+            _ => "#6BB5FF"
+        };
+    }
+
+    private void ShowRuntimeSummary(PlanStatement statement)
+    {
+        RuntimeSummaryContent.Children.Clear();
+
+        var labelColor = "#E4E6EB";
+        var valueColor = "#E4E6EB";
+
+        var grid = new Grid();
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        int rowIndex = 0;
+
+        void AddRow(string label, string value)
+        {
+            grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
+
+            var labelText = new TextBlock
+            {
+                Text = label,
+                FontSize = 11,
+                Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(labelColor)),
+                HorizontalAlignment = HorizontalAlignment.Left,
+                Margin = new Thickness(0, 1, 8, 1)
+            };
+            Grid.SetRow(labelText, rowIndex);
+            Grid.SetColumn(labelText, 0);
+            grid.Children.Add(labelText);
+
+            var valueText = new TextBlock
+            {
+                Text = value,
+                FontSize = 11,
+                Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(valueColor)),
+                Margin = new Thickness(0, 1, 0, 1)
+            };
+            Grid.SetRow(valueText, rowIndex);
+            Grid.SetColumn(valueText, 1);
+            grid.Children.Add(valueText);
+
+            rowIndex++;
+        }
+
+        if (statement.QueryTimeStats != null)
+        {
+            AddRow("Elapsed", $"{statement.QueryTimeStats.ElapsedTimeMs:N0}ms");
+            AddRow("CPU", $"{statement.QueryTimeStats.CpuTimeMs:N0}ms");
+            if (statement.QueryUdfCpuTimeMs > 0)
+                AddRow("UDF CPU", $"{statement.QueryUdfCpuTimeMs:N0}ms");
+            if (statement.QueryUdfElapsedTimeMs > 0)
+                AddRow("UDF elapsed", $"{statement.QueryUdfElapsedTimeMs:N0}ms");
+        }
+
+        if (statement.MemoryGrant != null)
+        {
+            var mg = statement.MemoryGrant;
+            AddRow("Memory grant", $"{mg.GrantedMemoryKB:N0} KB granted, {mg.MaxUsedMemoryKB:N0} KB used");
+            if (mg.GrantWaitTimeMs > 0)
+                AddRow("Grant wait", $"{mg.GrantWaitTimeMs:N0}ms");
+        }
+
+        if (statement.DegreeOfParallelism > 0)
+            AddRow("DOP", statement.DegreeOfParallelism.ToString());
+        else if (statement.NonParallelPlanReason != null)
+            AddRow("Serial", statement.NonParallelPlanReason);
+
+        if (statement.ThreadStats != null)
+        {
+            var ts = statement.ThreadStats;
+            AddRow("Branches", ts.Branches.ToString());
+            var totalReserved = ts.Reservations.Sum(r => r.ReservedThreads);
+            if (totalReserved > 0)
+            {
+                var threadText = ts.UsedThreads == totalReserved
+                    ? $"{ts.UsedThreads} used ({totalReserved} reserved)"
+                    : $"{ts.UsedThreads} used of {totalReserved} reserved ({totalReserved - ts.UsedThreads} inactive)";
+                AddRow("Threads", threadText);
+            }
+            else
+            {
+                AddRow("Threads", $"{ts.UsedThreads} used");
+            }
+        }
+
+        if (statement.CardinalityEstimationModelVersion > 0)
+            AddRow("CE model", statement.CardinalityEstimationModelVersion.ToString());
+
+        if (statement.CompileTimeMs > 0)
+            AddRow("Compile time", $"{statement.CompileTimeMs:N0}ms");
+        if (statement.CachedPlanSizeKB > 0)
+            AddRow("Cached plan size", $"{statement.CachedPlanSizeKB:N0} KB");
+
+        if (!string.IsNullOrEmpty(statement.StatementOptmLevel))
+            AddRow("Optimization", statement.StatementOptmLevel);
+        if (!string.IsNullOrEmpty(statement.StatementOptmEarlyAbortReason))
+            AddRow("Early abort", statement.StatementOptmEarlyAbortReason);
+
+        RuntimeSummaryContent.Children.Add(grid);
+    }
+
+    private void UpdateInsightsHeader()
+    {
+        InsightsPanel.Visibility = Visibility.Visible;
+        InsightsHeader.Text = "  Plan Insights";
     }
 
     #endregion
@@ -1441,6 +2020,109 @@ private void PlanScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventAr
         }
     }
 
+    private void PlanViewerControl_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+    {
+        Focus();
+    }
+
+    private void PlanViewerControl_PreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (e.Key == Key.V && Keyboard.Modifiers == ModifierKeys.Control
+            && e.OriginalSource is not TextBox)
+        {
+            var text = Clipboard.GetText();
+            if (!string.IsNullOrWhiteSpace(text))
+            {
+                e.Handled = true;
+                try
+                {
+                    System.Xml.Linq.XDocument.Parse(text);
+                }
+                catch (System.Xml.XmlException ex)
+                {
+                    MessageBox.Show(
+                        $"The plan XML is not valid:\n\n{ex.Message}",
+                        "Invalid Plan XML",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Warning);
+                    return;
+                }
+                LoadPlan(text, "Pasted Plan");
+            }
+        }
+    }
+
+    #endregion
+
+    #region Canvas Panning
+
+    private void PlanScrollViewer_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        // Don't intercept scrollbar interactions
+        if (IsScrollBarAtPoint(e))
+            return;
+
+        // Don't pan if clicking on a node
+        if (IsNodeAtPoint(e))
+            return;
+
+        _isPanning = true;
+        _panStart = e.GetPosition(PlanScrollViewer);
+        _panStartOffsetX = PlanScrollViewer.HorizontalOffset;
+        _panStartOffsetY = PlanScrollViewer.VerticalOffset;
+        PlanScrollViewer.Cursor = Cursors.SizeAll;
+        PlanScrollViewer.CaptureMouse();
+        e.Handled = true;
+    }
+
+    private void PlanScrollViewer_PreviewMouseMove(object sender, MouseEventArgs e)
+    {
+        if (!_isPanning) return;
+
+        var current = e.GetPosition(PlanScrollViewer);
+        var dx = current.X - _panStart.X;
+        var dy = current.Y - _panStart.Y;
+
+        PlanScrollViewer.ScrollToHorizontalOffset(Math.Max(0, _panStartOffsetX - dx));
+        PlanScrollViewer.ScrollToVerticalOffset(Math.Max(0, _panStartOffsetY - dy));
+        e.Handled = true;
+    }
+
+    private void PlanScrollViewer_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+    {
+        if (!_isPanning) return;
+        _isPanning = false;
+        PlanScrollViewer.Cursor = Cursors.Arrow;
+        PlanScrollViewer.ReleaseMouseCapture();
+        e.Handled = true;
+    }
+
+    /// <summary>Check if the mouse event originated from a ScrollBar.</summary>
+    private static bool IsScrollBarAtPoint(MouseButtonEventArgs e)
+    {
+        var source = e.OriginalSource as DependencyObject;
+        while (source != null)
+        {
+            if (source is System.Windows.Controls.Primitives.ScrollBar)
+                return true;
+            source = VisualTreeHelper.GetParent(source);
+        }
+        return false;
+    }
+
+    /// <summary>Check if the mouse event originated from a node Border (has PlanNode in Tag).</summary>
+    private static bool IsNodeAtPoint(MouseButtonEventArgs e)
+    {
+        var source = e.OriginalSource as DependencyObject;
+        while (source != null)
+        {
+            if (source is Border b && b.Tag is PlanNode)
+                return true;
+            source = VisualTreeHelper.GetParent(source);
+        }
+        return false;
+    }
+
     #endregion
 
     #region Save & Statement Selection
diff --git a/Lite/Controls/ServerTab.xaml b/Lite/Controls/ServerTab.xaml
index 8ba12c3..7cd927f 100644
--- a/Lite/Controls/ServerTab.xaml
+++ b/Lite/Controls/ServerTab.xaml
@@ -1,14 +1,10 @@
-<UserControl x:Class="PerformanceMonitorLite.Controls.ServerTab"
+<UserControl x:Class="PerformanceMonitorLite.Controls.ServerTab"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
              xmlns:controls="clr-namespace:PerformanceMonitorLite.Controls">
     <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-
             <!-- Context Menu for DataGrid Copy -->
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click">
@@ -60,14 +56,14 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <Grid Background="{StaticResource BackgroundBrush}">
+    <Grid Background="{DynamicResource BackgroundBrush}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
         <!-- Header Bar -->
-        <Border Grid.Row="0" Background="{StaticResource BackgroundDarkBrush}" Padding="12,8">
+        <Border Grid.Row="0" Background="{DynamicResource BackgroundDarkBrush}" Padding="12,8">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
@@ -76,9 +72,9 @@
 
                 <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
                     <TextBlock x:Name="ServerNameText" Text="Server Name" FontSize="16" FontWeight="SemiBold"
-                               Foreground="{StaticResource ForegroundBrush}" Margin="0,0,16,0"/>
+                               Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,16,0"/>
                     <TextBlock x:Name="ConnectionStatusText" Text="Collecting..." FontSize="12"
-                               Foreground="{StaticResource ForegroundDimBrush}" VerticalAlignment="Center"/>
+                               Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center"/>
                 </StackPanel>
 
                 <StackPanel Grid.Column="1" Orientation="Horizontal">
@@ -98,7 +94,7 @@
                     <ComboBox x:Name="FromMinuteCombo" Width="52" Margin="2,0,0,0" Visibility="Collapsed"
                               SelectionChanged="CustomTimeCombo_Changed" ToolTip="Minute"/>
                     <TextBlock x:Name="ToLabel" Text="to" VerticalAlignment="Center" Margin="6,0" Visibility="Collapsed"
-                               Foreground="{StaticResource ForegroundBrush}"/>
+                               Foreground="{DynamicResource ForegroundBrush}"/>
                     <DatePicker x:Name="ToDatePicker" Width="120" Margin="0,0,0,0" Visibility="Collapsed"
                                 SelectedDateChanged="CustomDateRange_Changed" CalendarOpened="DatePicker_CalendarOpened"/>
                     <ComboBox x:Name="ToHourCombo" Width="70" Margin="2,0,0,0" Visibility="Collapsed"
@@ -122,7 +118,7 @@
         </Border>
 
         <!-- Main Tab Control -->
-        <TabControl Grid.Row="1" x:Name="MainTabControl" Background="{StaticResource BackgroundBrush}"
+        <TabControl Grid.Row="1" x:Name="MainTabControl" Background="{DynamicResource BackgroundBrush}"
                     BorderThickness="0" Padding="0">
 
             <!-- Wait Stats Tab -->
@@ -133,7 +129,7 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <Border Grid.Column="0" Background="{StaticResource BackgroundDarkBrush}" CornerRadius="4" Padding="8" Margin="0,0,4,0">
+                    <Border Grid.Column="0" Background="{DynamicResource BackgroundDarkBrush}" CornerRadius="4" Padding="8" Margin="0,0,4,0">
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto"/>
@@ -145,7 +141,7 @@
                             <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,0,0,4">
                                 <Button Content="Top Waits" Click="WaitTypeSelectAll_Click" Padding="6,2" Margin="0,0,4,0" FontSize="11"/>
                                 <Button Content="Clear All" Click="WaitTypeClearAll_Click" Padding="6,2" FontSize="11"/>
-                                <TextBlock x:Name="WaitTypeCountText" Text="0 / 30 selected" FontSize="10" Foreground="{StaticResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                                <TextBlock x:Name="WaitTypeCountText" Text="0 / 30 selected" FontSize="10" Foreground="{DynamicResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
                             </StackPanel>
                             <TextBox Grid.Row="2" x:Name="WaitTypeSearchBox" TextChanged="WaitTypeSearch_TextChanged"
                                      Margin="0,0,0,4" Padding="4,2"/>
@@ -154,7 +150,7 @@
                                     <DataTemplate>
                                         <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}"
                                                   Checked="WaitType_CheckChanged" Unchecked="WaitType_CheckChanged"
-                                                  Foreground="{StaticResource ForegroundBrush}" FontSize="11">
+                                                  Foreground="{DynamicResource ForegroundBrush}" FontSize="11">
                                             <TextBlock Text="{Binding DisplayName}"/>
                                         </CheckBox>
                                     </DataTemplate>
@@ -656,15 +652,28 @@
 
             <!-- Plan Viewer Tab -->
             <TabItem Header="Plan Viewer" x:Name="PlanViewerTabItem">
-                <Grid>
-                    <StackPanel x:Name="PlanEmptyState" HorizontalAlignment="Center"
-                                VerticalAlignment="Center">
-                        <TextBlock Text="No Plan Loaded" FontSize="20" FontWeight="Light"
-                                   Foreground="{DynamicResource ForegroundMutedBrush}" HorizontalAlignment="Center"/>
-                        <TextBlock Text="Right-click a query row and choose 'View Plan' or 'Get Actual Plan'"
-                                   FontSize="13" Foreground="{DynamicResource ForegroundMutedBrush}"
-                                   HorizontalAlignment="Center" Margin="0,8,0,0"/>
-                    </StackPanel>
+                <Grid Background="Transparent">
+                    <Grid x:Name="PlanEmptyState">
+                        <!-- Dashed drop-zone border fills the whole tab -->
+                        <Rectangle Margin="24"
+                                   Stroke="{DynamicResource ForegroundMutedBrush}"
+                                   StrokeThickness="1.5"
+                                   StrokeDashArray="6,4"
+                                   RadiusX="10" RadiusY="10"
+                                   Opacity="0.25"/>
+                        <!-- Centered content -->
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock Text="&#xE896;" FontFamily="Segoe MDL2 Assets" FontSize="52"
+                                       HorizontalAlignment="Center"
+                                       Foreground="{DynamicResource ForegroundMutedBrush}" Opacity="0.45"
+                                       Margin="0,0,0,12"/>
+                            <TextBlock Text="No Plan Loaded" FontSize="20" FontWeight="Light"
+                                       Foreground="{DynamicResource ForegroundMutedBrush}" HorizontalAlignment="Center"/>
+                            <TextBlock Text="Right-click a query row and choose 'View Plan' or 'Get Actual Plan'"
+                                       FontSize="13" Foreground="{DynamicResource ForegroundMutedBrush}"
+                                       HorizontalAlignment="Center" Margin="0,8,0,0"/>
+                        </StackPanel>
+                    </Grid>
                     <StackPanel x:Name="PlanLoadingState" HorizontalAlignment="Center"
                                 VerticalAlignment="Center" Visibility="Collapsed">
                         <ProgressBar IsIndeterminate="True" Width="200" Height="4" Margin="0,0,0,12"/>
@@ -698,46 +707,46 @@
                             </Grid.RowDefinitions>
 
                             <!-- Memory Summary Panel -->
-                            <Border Grid.Row="0" Background="{StaticResource BackgroundDarkBrush}" CornerRadius="4" Padding="12" Margin="0,0,0,8">
+                            <Border Grid.Row="0" Background="{DynamicResource BackgroundDarkBrush}" CornerRadius="4" Padding="12" Margin="0,0,0,8">
                                 <WrapPanel>
                                     <StackPanel Margin="0,0,24,0">
-                                        <TextBlock Text="Physical Memory" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock Text="Physical Memory" Foreground="{DynamicResource ForegroundDimBrush}" FontSize="11"/>
                                         <TextBlock x:Name="PhysicalMemoryText" Text="--" FontSize="18" FontWeight="SemiBold"/>
                                     </StackPanel>
                                     <StackPanel Margin="0,0,24,0">
-                                        <TextBlock Text="SQL Server Memory" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock Text="SQL Server Memory" Foreground="{DynamicResource ForegroundDimBrush}" FontSize="11"/>
                                         <TextBlock x:Name="TotalServerMemoryText" Text="--" FontSize="18" FontWeight="SemiBold"/>
                                     </StackPanel>
                                     <StackPanel Margin="0,0,24,0">
-                                        <TextBlock Text="Target Memory" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock Text="Target Memory" Foreground="{DynamicResource ForegroundDimBrush}" FontSize="11"/>
                                         <TextBlock x:Name="TargetServerMemoryText" Text="--" FontSize="18" FontWeight="SemiBold"/>
                                     </StackPanel>
                                     <StackPanel Margin="0,0,24,0">
-                                        <TextBlock Text="Buffer Pool" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock Text="Buffer Pool" Foreground="{DynamicResource ForegroundDimBrush}" FontSize="11"/>
                                         <TextBlock x:Name="BufferPoolText" Text="--" FontSize="18" FontWeight="SemiBold"/>
                                     </StackPanel>
                                     <StackPanel Margin="0,0,24,0">
-                                        <TextBlock Text="Plan Cache" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock Text="Plan Cache" Foreground="{DynamicResource ForegroundDimBrush}" FontSize="11"/>
                                         <TextBlock x:Name="PlanCacheText" Text="--" FontSize="18" FontWeight="SemiBold"/>
                                     </StackPanel>
                                     <StackPanel Margin="0,0,24,0">
-                                        <TextBlock Text="Available Physical" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock Text="Available Physical" Foreground="{DynamicResource ForegroundDimBrush}" FontSize="11"/>
                                         <TextBlock x:Name="AvailablePhysicalMemoryText" Text="--" FontSize="18" FontWeight="SemiBold"/>
                                     </StackPanel>
                                     <StackPanel Margin="0,0,24,0">
-                                        <TextBlock Text="Total Page File" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock Text="Total Page File" Foreground="{DynamicResource ForegroundDimBrush}" FontSize="11"/>
                                         <TextBlock x:Name="TotalPageFileText" Text="--" FontSize="18" FontWeight="SemiBold"/>
                                     </StackPanel>
                                     <StackPanel Margin="0,0,24,0">
-                                        <TextBlock Text="Available Page File" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock Text="Available Page File" Foreground="{DynamicResource ForegroundDimBrush}" FontSize="11"/>
                                         <TextBlock x:Name="AvailablePageFileText" Text="--" FontSize="18" FontWeight="SemiBold"/>
                                     </StackPanel>
                                     <StackPanel Margin="0,0,24,0">
-                                        <TextBlock Text="System Memory State" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock Text="System Memory State" Foreground="{DynamicResource ForegroundDimBrush}" FontSize="11"/>
                                         <TextBlock x:Name="MemoryStateText" Text="--" FontSize="18" FontWeight="SemiBold"/>
                                     </StackPanel>
                                     <StackPanel Margin="0,0,24,0">
-                                        <TextBlock Text="Memory Model" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock Text="Memory Model" Foreground="{DynamicResource ForegroundDimBrush}" FontSize="11"/>
                                         <TextBlock x:Name="SqlMemoryModelText" Text="--" FontSize="18" FontWeight="SemiBold"/>
                                     </StackPanel>
                                 </WrapPanel>
@@ -757,7 +766,7 @@
                             </Grid.ColumnDefinitions>
 
                             <!-- Clerk Type Picker -->
-                            <Border Grid.Column="0" Background="{StaticResource BackgroundDarkBrush}" CornerRadius="4" Padding="8" Margin="0,0,4,0">
+                            <Border Grid.Column="0" Background="{DynamicResource BackgroundDarkBrush}" CornerRadius="4" Padding="8" Margin="0,0,4,0">
                                 <Grid>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto"/>
@@ -769,7 +778,7 @@
                                     <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,0,0,4">
                                         <Button Content="Top Clerks" Click="MemoryClerkSelectTop_Click" Padding="6,2" Margin="0,0,4,0" FontSize="11"/>
                                         <Button Content="Clear All" Click="MemoryClerkClearAll_Click" Padding="6,2" FontSize="11"/>
-                                        <TextBlock x:Name="MemoryClerkCountText" Text="0 selected" FontSize="10" Foreground="{StaticResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                                        <TextBlock x:Name="MemoryClerkCountText" Text="0 selected" FontSize="10" Foreground="{DynamicResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
                                     </StackPanel>
                                     <TextBox Grid.Row="2" x:Name="MemoryClerkSearchBox" TextChanged="MemoryClerkSearch_TextChanged"
                                              Margin="0,0,0,4" Padding="4,2"/>
@@ -778,7 +787,7 @@
                                             <DataTemplate>
                                                 <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}"
                                                           Checked="MemoryClerk_CheckChanged" Unchecked="MemoryClerk_CheckChanged"
-                                                          Foreground="{StaticResource ForegroundBrush}" FontSize="11">
+                                                          Foreground="{DynamicResource ForegroundBrush}" FontSize="11">
                                                     <TextBlock Text="{Binding DisplayName}"/>
                                                 </CheckBox>
                                             </DataTemplate>
@@ -794,11 +803,11 @@
                                     <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
                                 <ScottPlot:WpfPlot Grid.Row="0" x:Name="MemoryClerksChart"/>
-                                <Border Grid.Row="1" Background="{StaticResource BackgroundDarkBrush}" CornerRadius="4" Padding="12,8" Margin="0,8,0,0">
+                                <Border Grid.Row="1" Background="{DynamicResource BackgroundDarkBrush}" CornerRadius="4" Padding="12,8" Margin="0,8,0,0">
                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                        <TextBlock Text="Non-BP Total:" FontWeight="SemiBold" Foreground="{StaticResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                                        <TextBlock Text="Non-BP Total:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
                                         <TextBlock x:Name="MemoryClerksTotalText" Text="--" VerticalAlignment="Center" Margin="0,0,20,0"/>
-                                        <TextBlock Text="Top Non-BP Clerk:" FontWeight="SemiBold" Foreground="{StaticResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                                        <TextBlock Text="Top Non-BP Clerk:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
                                         <TextBlock x:Name="MemoryClerksTopText" Text="--" VerticalAlignment="Center"/>
                                     </StackPanel>
                                 </Border>
@@ -1109,7 +1118,7 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <Border Grid.Column="0" Background="{StaticResource BackgroundDarkBrush}" CornerRadius="4" Padding="8" Margin="0,0,4,0">
+                    <Border Grid.Column="0" Background="{DynamicResource BackgroundDarkBrush}" CornerRadius="4" Padding="8" Margin="0,0,4,0">
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto"/>
@@ -1133,7 +1142,7 @@
                                     <DataTemplate>
                                         <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}"
                                                   Checked="PerfmonCounter_CheckChanged" Unchecked="PerfmonCounter_CheckChanged"
-                                                  Foreground="{StaticResource ForegroundBrush}" FontSize="11">
+                                                  Foreground="{DynamicResource ForegroundBrush}" FontSize="11">
                                             <TextBlock Text="{Binding DisplayName}"/>
                                         </CheckBox>
                                     </DataTemplate>
diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index ea70408..62a72dd 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -158,6 +158,31 @@ public ServerTab(ServerConnection server, DuckDbInitializer duckDb, CredentialSe
             grid.CopyingRowClipboardContent += Helpers.DataGridClipboardBehavior.FixHeaderCopy;
         }
 
+        /* Apply theme immediately so charts don't flash white before data loads */
+        ApplyTheme(WaitStatsChart);
+        ApplyTheme(QueryDurationTrendChart);
+        ApplyTheme(ProcDurationTrendChart);
+        ApplyTheme(QueryStoreDurationTrendChart);
+        ApplyTheme(ExecutionCountTrendChart);
+        ApplyTheme(CpuChart);
+        ApplyTheme(MemoryChart);
+        ApplyTheme(MemoryClerksChart);
+        ApplyTheme(MemoryGrantSizingChart);
+        ApplyTheme(MemoryGrantActivityChart);
+        ApplyTheme(FileIoReadChart);
+        ApplyTheme(FileIoWriteChart);
+        ApplyTheme(FileIoReadThroughputChart);
+        ApplyTheme(FileIoWriteThroughputChart);
+        ApplyTheme(TempDbChart);
+        ApplyTheme(TempDbFileIoChart);
+        ApplyTheme(LockWaitTrendChart);
+        ApplyTheme(BlockingTrendChart);
+        ApplyTheme(DeadlockTrendChart);
+        ApplyTheme(CurrentWaitsDurationChart);
+        ApplyTheme(CurrentWaitsBlockedChart);
+        ApplyTheme(PerfmonChart);
+        ApplyTheme(CollectorDurationChart);
+
         /* Chart hover tooltips */
         _waitStatsHover = new Helpers.ChartHoverHelper(WaitStatsChart, "ms/sec");
         _perfmonHover = new Helpers.ChartHoverHelper(PerfmonChart, "");
@@ -208,8 +233,31 @@ public ServerTab(ServerConnection server, DuckDbInitializer duckDb, CredentialSe
         Helpers.ContextMenuHelper.SetupChartContextMenu(PerfmonChart, "Perfmon_Counters");
         Helpers.ContextMenuHelper.SetupChartContextMenu(CollectorDurationChart, "Collector_Duration");
 
+        Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
+        Unloaded += (_, _) => Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
+
         /* Initial load is triggered by MainWindow.ConnectToServer calling RefreshData()
            after collectors finish - no Loaded handler needed */
+
+        KeyDown += ServerTab_KeyDown;
+        Focusable = true;
+    }
+
+    private void ServerTab_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+    {
+        if (e.Key == System.Windows.Input.Key.V &&
+            System.Windows.Input.Keyboard.Modifiers == System.Windows.Input.ModifierKeys.Control &&
+            e.OriginalSource is not System.Windows.Controls.TextBox &&
+            PlanViewerTabItem.IsSelected)
+        {
+            var xml = System.Windows.Clipboard.GetText();
+            if (!string.IsNullOrWhiteSpace(xml))
+            {
+                e.Handled = true;
+                OpenPlanTab(xml, "Pasted Plan");
+                PlanViewerTabItem.IsSelected = true;
+            }
+        }
     }
 
     private void InitializeTimeComboBoxes()
@@ -398,67 +446,82 @@ private void DatePicker_CalendarOpened(object sender, RoutedEventArgs e)
                 var popup = datePicker.Template.FindName("PART_Popup", datePicker) as System.Windows.Controls.Primitives.Popup;
                 if (popup?.Child is System.Windows.Controls.Calendar calendar)
                 {
-                    ApplyDarkThemeToCalendar(calendar);
+                    ApplyThemeToCalendar(calendar);
                 }
             }));
         }
     }
 
-    private void ApplyDarkThemeToCalendar(System.Windows.Controls.Calendar calendar)
+    private void ApplyThemeToCalendar(System.Windows.Controls.Calendar calendar)
     {
-        var darkBg = new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#111217")!);
-        var whiteFg = new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#E4E6EB")!);
-        var mutedFg = new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#6B7280")!);
+        SolidColorBrush primaryBg, fg, borderBrush;
 
-        calendar.Background = darkBg;
-        calendar.Foreground = whiteFg;
-        calendar.BorderBrush = new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#2a2d35")!);
+        if (Helpers.ThemeManager.CurrentTheme == "CoolBreeze")
+        {
+            primaryBg   = new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#EEF4FA")!);
+            fg          = new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#1A2A3A")!);
+            borderBrush = new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#A8BDD0")!);
+        }
+        else if (Helpers.ThemeManager.HasLightBackground)
+        {
+            primaryBg   = new SolidColorBrush(System.Windows.Media.Color.FromRgb(0xFF, 0xFF, 0xFF));
+            fg          = new SolidColorBrush(System.Windows.Media.Color.FromRgb(0x1A, 0x1D, 0x23));
+            borderBrush = new SolidColorBrush(System.Windows.Media.Color.FromRgb(0xDE, 0xE2, 0xE6));
+        }
+        else
+        {
+            primaryBg   = new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#111217")!);
+            fg          = new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#E4E6EB")!);
+            borderBrush = new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#2a2d35")!);
+        }
+
+        calendar.Background = primaryBg;
+        calendar.Foreground = fg;
+        calendar.BorderBrush = borderBrush;
 
-        ApplyDarkThemeRecursively(calendar, darkBg, whiteFg, mutedFg);
+        ApplyThemeRecursively(calendar, primaryBg, fg);
     }
 
-    private void ApplyDarkThemeRecursively(DependencyObject parent, Brush darkBg, Brush whiteFg, Brush mutedFg)
+    private void ApplyThemeRecursively(DependencyObject parent, Brush primaryBg, Brush fg)
     {
+        bool HasLightBackground = Helpers.ThemeManager.HasLightBackground;
         for (int i = 0; i < VisualTreeHelper.GetChildrenCount(parent); i++)
         {
             var child = VisualTreeHelper.GetChild(parent, i);
 
             if (child is System.Windows.Controls.Primitives.CalendarItem calendarItem)
             {
-                calendarItem.Background = darkBg;
-                calendarItem.Foreground = whiteFg;
+                calendarItem.Background = primaryBg;
+                calendarItem.Foreground = fg;
             }
             else if (child is System.Windows.Controls.Primitives.CalendarDayButton dayButton)
             {
                 dayButton.Background = Brushes.Transparent;
-                dayButton.Foreground = whiteFg;
+                dayButton.Foreground = fg;
             }
             else if (child is System.Windows.Controls.Primitives.CalendarButton calButton)
             {
                 calButton.Background = Brushes.Transparent;
-                calButton.Foreground = whiteFg;
+                calButton.Foreground = fg;
             }
             else if (child is Button button)
             {
                 button.Background = Brushes.Transparent;
-                button.Foreground = whiteFg;
+                button.Foreground = fg;
             }
             else if (child is TextBlock textBlock)
             {
-                textBlock.Foreground = whiteFg;
+                textBlock.Foreground = fg;
             }
-            else if (child is Border border)
+            else if (!HasLightBackground)
             {
-                if (border.Background is SolidColorBrush bg && bg.Color.R > 200 && bg.Color.G > 200 && bg.Color.B > 200)
-                    border.Background = darkBg;
-            }
-            else if (child is Grid grid)
-            {
-                if (grid.Background is SolidColorBrush gridBg && gridBg.Color.R > 200 && gridBg.Color.G > 200 && gridBg.Color.B > 200)
-                    grid.Background = darkBg;
+                if (child is Border border && border.Background is SolidColorBrush bg && bg.Color.R > 200 && bg.Color.G > 200 && bg.Color.B > 200)
+                    border.Background = primaryBg;
+                else if (child is Grid grid && grid.Background is SolidColorBrush gridBg && gridBg.Color.R > 200 && gridBg.Color.G > 200 && gridBg.Color.B > 200)
+                    grid.Background = primaryBg;
             }
 
-            ApplyDarkThemeRecursively(child, darkBg, whiteFg, mutedFg);
+            ApplyThemeRecursively(child, primaryBg, fg);
         }
     }
 
@@ -619,7 +682,8 @@ await System.Threading.Tasks.Task.WhenAll(
             await UpdateMemoryClerksChartFromPickerAsync();
             await UpdatePerfmonChartFromPickerAsync();
 
-            ConnectionStatusText.Text = $"{_server.ServerName} - Last refresh: {DateTime.Now:HH:mm:ss}";
+            var tz = ServerTimeHelper.GetTimezoneLabel(ServerTimeHelper.CurrentDisplayMode);
+            ConnectionStatusText.Text = $"{_server.ServerName} - Last refresh: {DateTime.Now:HH:mm:ss} ({tz})";
 
             /* Notify parent of alert counts for tab badge.
                Include the latest event timestamp so acknowledgement is only
@@ -697,7 +761,7 @@ private void UpdateCpuChart(List<CpuUtilizationRow> data)
     {
         ClearChart(CpuChart);
         _cpuHover?.Clear();
-        ApplyDarkTheme(CpuChart);
+        ApplyTheme(CpuChart);
 
         if (data.Count == 0) { CpuChart.Refresh(); return; }
 
@@ -728,7 +792,7 @@ private void UpdateMemoryChart(List<MemoryTrendPoint> data, List<MemoryTrendPoin
     {
         ClearChart(MemoryChart);
         _memoryHover?.Clear();
-        ApplyDarkTheme(MemoryChart);
+        ApplyTheme(MemoryChart);
 
         if (data.Count == 0) { MemoryChart.Refresh(); return; }
 
@@ -788,8 +852,8 @@ private void UpdateMemoryGrantCharts(List<MemoryGrantChartPoint> data)
         ClearChart(MemoryGrantActivityChart);
         _memoryGrantSizingHover?.Clear();
         _memoryGrantActivityHover?.Clear();
-        ApplyDarkTheme(MemoryGrantSizingChart);
-        ApplyDarkTheme(MemoryGrantActivityChart);
+        ApplyTheme(MemoryGrantSizingChart);
+        ApplyTheme(MemoryGrantActivityChart);
 
         if (data.Count == 0)
         {
@@ -876,7 +940,7 @@ private void UpdateTempDbChart(List<TempDbRow> data)
     {
         ClearChart(TempDbChart);
         _tempDbHover?.Clear();
-        ApplyDarkTheme(TempDbChart);
+        ApplyTheme(TempDbChart);
 
         if (data.Count == 0) { TempDbChart.Refresh(); return; }
 
@@ -915,7 +979,7 @@ private void UpdateTempDbFileIoChart(List<FileIoTrendPoint> data)
     {
         ClearChart(TempDbFileIoChart);
         _tempDbFileIoHover?.Clear();
-        ApplyDarkTheme(TempDbFileIoChart);
+        ApplyTheme(TempDbFileIoChart);
 
         if (data.Count == 0) { TempDbFileIoChart.Refresh(); return; }
 
@@ -960,8 +1024,8 @@ private void UpdateFileIoCharts(List<FileIoTrendPoint> data)
         ClearChart(FileIoWriteChart);
         _fileIoReadHover?.Clear();
         _fileIoWriteHover?.Clear();
-        ApplyDarkTheme(FileIoReadChart);
-        ApplyDarkTheme(FileIoWriteChart);
+        ApplyTheme(FileIoReadChart);
+        ApplyTheme(FileIoWriteChart);
 
         if (data.Count == 0) { FileIoReadChart.Refresh(); FileIoWriteChart.Refresh(); return; }
 
@@ -1051,8 +1115,8 @@ private void UpdateFileIoThroughputCharts(List<FileIoThroughputPoint> data)
         ClearChart(FileIoWriteThroughputChart);
         _fileIoReadThroughputHover?.Clear();
         _fileIoWriteThroughputHover?.Clear();
-        ApplyDarkTheme(FileIoReadThroughputChart);
-        ApplyDarkTheme(FileIoWriteThroughputChart);
+        ApplyTheme(FileIoReadThroughputChart);
+        ApplyTheme(FileIoWriteThroughputChart);
 
         if (data.Count == 0) { FileIoReadThroughputChart.Refresh(); FileIoWriteThroughputChart.Refresh(); return; }
 
@@ -1114,7 +1178,7 @@ private void UpdateFileIoThroughputCharts(List<FileIoThroughputPoint> data)
     private void UpdateLockWaitTrendChart(List<LockWaitTrendPoint> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
     {
         ClearChart(LockWaitTrendChart);
-        ApplyDarkTheme(LockWaitTrendChart);
+        ApplyTheme(LockWaitTrendChart);
 
         DateTime rangeStart, rangeEnd;
         if (fromDate.HasValue && toDate.HasValue)
@@ -1176,7 +1240,7 @@ private void UpdateLockWaitTrendChart(List<LockWaitTrendPoint> data, int hoursBa
     private void UpdateBlockingTrendChart(List<TrendPoint> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
     {
         ClearChart(BlockingTrendChart);
-        ApplyDarkTheme(BlockingTrendChart);
+        ApplyTheme(BlockingTrendChart);
 
         /* Calculate X-axis range based on selected time window */
         DateTime rangeStart, rangeEnd;
@@ -1255,7 +1319,7 @@ private void UpdateBlockingTrendChart(List<TrendPoint> data, int hoursBack, Date
     private void UpdateDeadlockTrendChart(List<TrendPoint> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
     {
         ClearChart(DeadlockTrendChart);
-        ApplyDarkTheme(DeadlockTrendChart);
+        ApplyTheme(DeadlockTrendChart);
 
         /* Calculate X-axis range based on selected time window */
         DateTime rangeStart, rangeEnd;
@@ -1336,7 +1400,7 @@ private void UpdateDeadlockTrendChart(List<TrendPoint> data, int hoursBack, Date
     private void UpdateCurrentWaitsDurationChart(List<WaitingTaskTrendPoint> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
     {
         ClearChart(CurrentWaitsDurationChart);
-        ApplyDarkTheme(CurrentWaitsDurationChart);
+        ApplyTheme(CurrentWaitsDurationChart);
 
         DateTime rangeStart, rangeEnd;
         if (fromDate.HasValue && toDate.HasValue)
@@ -1401,7 +1465,7 @@ private void UpdateCurrentWaitsDurationChart(List<WaitingTaskTrendPoint> data, i
     private void UpdateCurrentWaitsBlockedChart(List<BlockedSessionTrendPoint> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
     {
         ClearChart(CurrentWaitsBlockedChart);
-        ApplyDarkTheme(CurrentWaitsBlockedChart);
+        ApplyTheme(CurrentWaitsBlockedChart);
 
         DateTime rangeStart, rangeEnd;
         if (fromDate.HasValue && toDate.HasValue)
@@ -1468,7 +1532,7 @@ private void UpdateCurrentWaitsBlockedChart(List<BlockedSessionTrendPoint> data,
     private void UpdateQueryDurationTrendChart(List<QueryTrendPoint> data)
     {
         ClearChart(QueryDurationTrendChart);
-        ApplyDarkTheme(QueryDurationTrendChart);
+        ApplyTheme(QueryDurationTrendChart);
 
         if (data.Count == 0) { RefreshEmptyChart(QueryDurationTrendChart, "Query Duration", "Duration (ms/sec)"); return; }
 
@@ -1492,7 +1556,7 @@ private void UpdateQueryDurationTrendChart(List<QueryTrendPoint> data)
     private void UpdateProcDurationTrendChart(List<QueryTrendPoint> data)
     {
         ClearChart(ProcDurationTrendChart);
-        ApplyDarkTheme(ProcDurationTrendChart);
+        ApplyTheme(ProcDurationTrendChart);
 
         if (data.Count == 0) { RefreshEmptyChart(ProcDurationTrendChart, "Procedure Duration", "Duration (ms/sec)"); return; }
 
@@ -1516,7 +1580,7 @@ private void UpdateProcDurationTrendChart(List<QueryTrendPoint> data)
     private void UpdateQueryStoreDurationTrendChart(List<QueryTrendPoint> data)
     {
         ClearChart(QueryStoreDurationTrendChart);
-        ApplyDarkTheme(QueryStoreDurationTrendChart);
+        ApplyTheme(QueryStoreDurationTrendChart);
 
         if (data.Count == 0) { RefreshEmptyChart(QueryStoreDurationTrendChart, "Query Store Duration", "Duration (ms/sec)"); return; }
 
@@ -1540,7 +1604,7 @@ private void UpdateQueryStoreDurationTrendChart(List<QueryTrendPoint> data)
     private void UpdateExecutionCountTrendChart(List<QueryTrendPoint> data)
     {
         ClearChart(ExecutionCountTrendChart);
-        ApplyDarkTheme(ExecutionCountTrendChart);
+        ApplyTheme(ExecutionCountTrendChart);
 
         if (data.Count == 0) { RefreshEmptyChart(ExecutionCountTrendChart, "Executions", "Executions/sec"); return; }
 
@@ -1621,7 +1685,7 @@ private void UpdateWaitTypeCount()
         WaitTypeCountText.Text = $"{count} / 30 selected";
         WaitTypeCountText.Foreground = count >= 30
             ? new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#E57373")!)
-            : (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush");
+            : (System.Windows.Media.Brush)FindResource("ForegroundBrush");
     }
 
     private void ApplyWaitTypeFilter()
@@ -1678,7 +1742,7 @@ private async System.Threading.Tasks.Task UpdateWaitStatsChartFromPickerAsync()
             var selected = _waitTypeItems.Where(i => i.IsSelected).Take(20).ToList();
 
             ClearChart(WaitStatsChart);
-            ApplyDarkTheme(WaitStatsChart);
+            ApplyTheme(WaitStatsChart);
             _waitStatsHover?.Clear();
 
             if (selected.Count == 0) { WaitStatsChart.Refresh(); return; }
@@ -1825,7 +1889,7 @@ private async System.Threading.Tasks.Task UpdateMemoryClerksChartFromPickerAsync
             var selected = _memoryClerkItems.Where(i => i.IsSelected).Take(20).ToList();
 
             ClearChart(MemoryClerksChart);
-            ApplyDarkTheme(MemoryClerksChart);
+            ApplyTheme(MemoryClerksChart);
             _memoryClerksHover?.Clear();
 
             if (selected.Count == 0)
@@ -2042,7 +2106,7 @@ private async System.Threading.Tasks.Task UpdatePerfmonChartFromPickerAsync()
 
             ClearChart(PerfmonChart);
             _perfmonHover?.Clear();
-            ApplyDarkTheme(PerfmonChart);
+            ApplyTheme(PerfmonChart);
 
             if (selected.Count == 0) { PerfmonChart.Refresh(); return; }
 
@@ -2165,22 +2229,50 @@ private void ShowChartLegend(ScottPlot.WPF.WpfPlot chart)
 
     /// <summary>
     /// Applies the Darling Data dark theme to a ScottPlot chart.
-    /// Matches Dashboard TabHelpers.ApplyDarkModeToChart exactly.
+    /// Matches Dashboard TabHelpers.ApplyThemeToChart exactly.
     /// </summary>
-    private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
+    private static void ApplyTheme(ScottPlot.WPF.WpfPlot chart)
     {
-        var darkBackground = ScottPlot.Color.FromHex("#22252b");
-        var darkerBackground = ScottPlot.Color.FromHex("#111217");
-        var textColor = ScottPlot.Color.FromHex("#9DA5B4");
-        var gridColor = ScottPlot.Colors.White.WithAlpha(40);
+        ScottPlot.Color figureBackground, dataBackground, textColor, gridColor, legendBg, legendFg, legendOutline;
+
+        if (Helpers.ThemeManager.CurrentTheme == "CoolBreeze")
+        {
+            figureBackground = ScottPlot.Color.FromHex("#EEF4FA");
+            dataBackground   = ScottPlot.Color.FromHex("#DAE6F0");
+            textColor        = ScottPlot.Color.FromHex("#364D61");
+            gridColor        = ScottPlot.Color.FromHex("#A8BDD0").WithAlpha(120);
+            legendBg         = ScottPlot.Color.FromHex("#EEF4FA");
+            legendFg         = ScottPlot.Color.FromHex("#1A2A3A");
+            legendOutline    = ScottPlot.Color.FromHex("#A8BDD0");
+        }
+        else if (Helpers.ThemeManager.HasLightBackground)
+        {
+            figureBackground = ScottPlot.Color.FromHex("#FFFFFF");
+            dataBackground   = ScottPlot.Color.FromHex("#F5F7FA");
+            textColor        = ScottPlot.Color.FromHex("#4A5568");
+            gridColor        = ScottPlot.Colors.Black.WithAlpha(20);
+            legendBg         = ScottPlot.Color.FromHex("#FFFFFF");
+            legendFg         = ScottPlot.Color.FromHex("#1A1D23");
+            legendOutline    = ScottPlot.Color.FromHex("#DEE2E6");
+        }
+        else
+        {
+            figureBackground = ScottPlot.Color.FromHex("#22252b");
+            dataBackground   = ScottPlot.Color.FromHex("#111217");
+            textColor        = ScottPlot.Color.FromHex("#9DA5B4");
+            gridColor        = ScottPlot.Colors.White.WithAlpha(40);
+            legendBg         = ScottPlot.Color.FromHex("#22252b");
+            legendFg         = ScottPlot.Color.FromHex("#E4E6EB");
+            legendOutline    = ScottPlot.Color.FromHex("#2a2d35");
+        }
 
-        chart.Plot.FigureBackground.Color = darkBackground;
-        chart.Plot.DataBackground.Color = darkerBackground;
+        chart.Plot.FigureBackground.Color = figureBackground;
+        chart.Plot.DataBackground.Color = dataBackground;
         chart.Plot.Axes.Color(textColor);
         chart.Plot.Grid.MajorLineColor = gridColor;
-        chart.Plot.Legend.BackgroundColor = darkBackground;
-        chart.Plot.Legend.FontColor = ScottPlot.Color.FromHex("#E4E6EB");
-        chart.Plot.Legend.OutlineColor = ScottPlot.Color.FromHex("#2a2d35");
+        chart.Plot.Legend.BackgroundColor = legendBg;
+        chart.Plot.Legend.FontColor = legendFg;
+        chart.Plot.Legend.OutlineColor = legendOutline;
         chart.Plot.Legend.Alignment = ScottPlot.Alignment.LowerCenter;
         chart.Plot.Legend.Orientation = ScottPlot.Orientation.Horizontal;
         chart.Plot.Axes.Margins(bottom: 0); /* No bottom margin - SetChartYLimitsWithLegendPadding handles Y-axis */
@@ -2189,14 +2281,57 @@ private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
         chart.Plot.Axes.Left.TickLabelStyle.ForeColor = textColor;
         chart.Plot.Axes.Bottom.Label.ForeColor = textColor;
         chart.Plot.Axes.Left.Label.ForeColor = textColor;
+
+        // Set the WPF control Background to match so no white flash appears before ScottPlot's render loop fires
+        chart.Background = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(figureBackground.R, figureBackground.G, figureBackground.B));
+
+        // Ensure ScottPlot renders with the correct colors the very first time it gets pixel dimensions.
+        chart.Loaded -= HandleChartFirstLoaded;
+        if (!chart.IsLoaded)
+            chart.Loaded += HandleChartFirstLoaded;
+    }
+
+    private static void HandleChartFirstLoaded(object sender, RoutedEventArgs e)
+    {
+        var chart = (ScottPlot.WPF.WpfPlot)sender;
+        chart.Loaded -= HandleChartFirstLoaded;
+        chart.Refresh();
+    }
+
+    private void OnThemeChanged(string _)
+    {
+        foreach (var field in GetType().GetFields(
+            System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance))
+        {
+            if (field.GetValue(this) is ScottPlot.WPF.WpfPlot chart)
+            {
+                ApplyTheme(chart);
+                chart.Refresh();
+            }
+        }
+    }
+
+    private static IEnumerable<ScottPlot.WPF.WpfPlot> GetAllCharts(DependencyObject root)
+    {
+        foreach (var child in LogicalTreeHelper.GetChildren(root).OfType<DependencyObject>())
+        {
+            if (child is ScottPlot.WPF.WpfPlot plot)
+                yield return plot;
+            foreach (var nested in GetAllCharts(child))
+                yield return nested;
+        }
     }
 
     /// <summary>
-    /// Reapplies dark mode text colors and font sizes after DateTimeTicksBottom() resets them.
+    /// Reapplies theme-appropriate text colors and font sizes after DateTimeTicksBottom() resets them.
     /// </summary>
     private static void ReapplyAxisColors(ScottPlot.WPF.WpfPlot chart)
     {
-        var textColor = ScottPlot.Color.FromHex("#9DA5B4");
+        var textColor = Helpers.ThemeManager.CurrentTheme == "CoolBreeze"
+            ? ScottPlot.Color.FromHex("#364D61")
+            : Helpers.ThemeManager.HasLightBackground
+                ? ScottPlot.Color.FromHex("#4A5568")
+                : ScottPlot.Color.FromHex("#9DA5B4");
         chart.Plot.Axes.Bottom.TickLabelStyle.ForeColor = textColor;
         chart.Plot.Axes.Left.TickLabelStyle.ForeColor = textColor;
         chart.Plot.Axes.Bottom.Label.ForeColor = textColor;
@@ -2701,6 +2836,20 @@ private void HidePlanLoading()
 
     private void OpenPlanTab(string planXml, string label, string? queryText = null)
     {
+        try
+        {
+            System.Xml.Linq.XDocument.Parse(planXml);
+        }
+        catch (System.Xml.XmlException ex)
+        {
+            MessageBox.Show(
+                $"The plan XML is not valid:\n\n{ex.Message}",
+                "Invalid Plan XML",
+                MessageBoxButton.OK,
+                MessageBoxImage.Warning);
+            return;
+        }
+
         HidePlanLoading();
         var viewer = new PlanViewerControl();
         viewer.LoadPlan(planXml, label, queryText);
@@ -3103,7 +3252,7 @@ private static string CsvEscape(string value, string separator)
     private void UpdateCollectorDurationChart(List<CollectionLogRow> data)
     {
         ClearChart(CollectorDurationChart);
-        ApplyDarkTheme(CollectorDurationChart);
+        ApplyTheme(CollectorDurationChart);
 
         if (data.Count == 0) { CollectorDurationChart.Refresh(); return; }
 
@@ -3283,3 +3432,4 @@ bc.Binding is Binding b &&
         }
     }
 }
+
diff --git a/Lite/Helpers/ChartHoverHelper.cs b/Lite/Helpers/ChartHoverHelper.cs
index 71a8fbb..207f374 100644
--- a/Lite/Helpers/ChartHoverHelper.cs
+++ b/Lite/Helpers/ChartHoverHelper.cs
@@ -5,6 +5,7 @@
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
+using PerformanceMonitorLite.Services;
 
 namespace PerformanceMonitorLite.Helpers;
 
@@ -98,7 +99,7 @@ private void OnMouseMove(object sender, MouseEventArgs e)
 
         if (bestPoint.IsReal && bestDistance < 2500) // ~50px radius
         {
-            var time = DateTime.FromOADate(bestPoint.X);
+            var time = ServerTimeHelper.ConvertForDisplay(DateTime.FromOADate(bestPoint.X), ServerTimeHelper.CurrentDisplayMode);
             _text.Text = $"{bestLabel}\n{bestPoint.Y:N1} {_unit}\n{time:HH:mm:ss}";
             _popup.HorizontalOffset = pos.X + 15;
             _popup.VerticalOffset = pos.Y + 15;
diff --git a/Lite/Helpers/ThemeManager.cs b/Lite/Helpers/ThemeManager.cs
new file mode 100644
index 0000000..e1c2957
--- /dev/null
+++ b/Lite/Helpers/ThemeManager.cs
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Windows;
+
+namespace PerformanceMonitorLite.Helpers
+{
+    /// <summary>
+    /// Manages the application color theme (Dark / Light) by swapping the merged resource dictionary at runtime.
+    /// </summary>
+    public static class ThemeManager
+    {
+        /// <summary>The currently active theme name ("Dark" or "Light").</summary>
+        public static string CurrentTheme { get; private set; } = "Dark";
+
+        /// <summary>Returns true when the active theme uses a light background (Light or CoolBreeze).</summary>
+        public static bool HasLightBackground => CurrentTheme != "Dark";
+
+        /// <summary>Fired after the theme dictionary has been swapped.</summary>
+        public static event Action<string>? ThemeChanged;
+
+        /// <summary>
+        /// Applies the specified theme by replacing the top-level merged resource dictionary.
+        /// All DynamicResource bindings in XAML update automatically.
+        /// </summary>
+        public static void Apply(string theme)
+        {
+            CurrentTheme = theme;
+            var uri = theme switch
+            {
+                "Light"      => new Uri("pack://application:,,,/Themes/LightTheme.xaml"),
+                "CoolBreeze" => new Uri("pack://application:,,,/Themes/CoolBreezeTheme.xaml"),
+                _            => new Uri("pack://application:,,,/Themes/DarkTheme.xaml")
+            };
+
+            var dictionaries = Application.Current.Resources.MergedDictionaries;
+            dictionaries.Clear();
+            dictionaries.Add(new ResourceDictionary { Source = uri });
+
+            ThemeChanged?.Invoke(theme);
+        }
+    }
+}
diff --git a/Lite/Helpers/TimeDisplayMode.cs b/Lite/Helpers/TimeDisplayMode.cs
new file mode 100644
index 0000000..34291f6
--- /dev/null
+++ b/Lite/Helpers/TimeDisplayMode.cs
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+namespace PerformanceMonitorLite.Helpers
+{
+    public enum TimeDisplayMode
+    {
+        ServerTime,
+        LocalTime,
+        UTC
+    }
+}
diff --git a/Lite/MainWindow.xaml b/Lite/MainWindow.xaml
index 4db4f1b..d29fda0 100644
--- a/Lite/MainWindow.xaml
+++ b/Lite/MainWindow.xaml
@@ -11,9 +11,6 @@
         Background="{DynamicResource BackgroundBrush}">
     <Window.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
             <BooleanToVisibilityConverter x:Key="BoolToVisibility"/>
         </ResourceDictionary>
     </Window.Resources>
@@ -108,12 +105,15 @@
                                             <Style TargetType="Ellipse">
                                                 <Setter Property="Fill" Value="{DynamicResource ForegroundMutedBrush}"/>
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding IsOnline}" Value="True">
+                                                    <DataTrigger Binding="{Binding DotStatus}" Value="Online">
                                                         <Setter Property="Fill" Value="{DynamicResource SuccessBrush}"/>
                                                     </DataTrigger>
-                                                    <DataTrigger Binding="{Binding IsOnline}" Value="False">
+                                                    <DataTrigger Binding="{Binding DotStatus}" Value="Offline">
                                                         <Setter Property="Fill" Value="{DynamicResource ErrorBrush}"/>
                                                     </DataTrigger>
+                                                    <DataTrigger Binding="{Binding DotStatus}" Value="Warning">
+                                                        <Setter Property="Fill" Value="{DynamicResource WarningBrush}"/>
+                                                    </DataTrigger>
                                                 </Style.Triggers>
                                             </Style>
                                         </Ellipse.Style>
@@ -156,10 +156,18 @@
                 </ListView>
 
                 <!-- Sidebar Footer -->
-                <Border Grid.Row="2" Padding="12" Background="{DynamicResource BackgroundLightBrush}">
+                <Border Grid.Row="2" Padding="12" Background="{DynamicResource BackgroundLightBrush}"
+                        BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0">
                     <StackPanel>
                         <Button x:Name="AddServerButton" Content="+ Add Server" Click="AddServerButton_Click"/>
                         <Button x:Name="ManageServersButton" Content="Manage Servers" Click="ManageServersButton_Click" Margin="0,8,0,0"/>
+                        <Button Click="OpenPlanViewerButton_Click" Margin="0,8,0,0"
+                                ToolTip="Open or paste an execution plan (independent of any server)">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="&#x1F50D;" FontSize="12" VerticalAlignment="Center" Margin="0,0,6,0"/>
+                                <TextBlock Text="Open Plan Viewer" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </Button>
                         <Button x:Name="SettingsButton" Click="SettingsButton_Click" Margin="0,8,0,0">
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock Text="&#xE713;" FontFamily="Segoe MDL2 Assets" FontSize="12" VerticalAlignment="Center" Margin="0,0,6,0"/>
@@ -271,6 +279,24 @@
                     <TabItem Header="Alert History" x:Name="AlertsTab">
                         <controls:AlertsHistoryTab x:Name="AlertsHistoryContent"/>
                     </TabItem>
+                    <TabItem x:Name="MainWindowPlanViewerTab" Visibility="Collapsed">
+                        <TabItem.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="Plan Viewer" VerticalAlignment="Center" FontWeight="SemiBold"/>
+                                <Button Style="{DynamicResource TabCloseButton}"
+                                        Click="MainWindowPlanViewerClose_Click"
+                                        Margin="4,0,0,0"/>
+                            </StackPanel>
+                        </TabItem.Header>
+                        <Grid AllowDrop="True" PreviewDrop="MainWindowPlanViewer_Drop"
+                              PreviewDragOver="MainWindowPlanViewer_DragOver"
+                              Background="Transparent"
+                              Focusable="True" KeyDown="MainWindowPlanViewer_KeyDown">
+                            <TabControl x:Name="MainWindowPlanTabControl"
+                                        Background="Transparent"
+                                        BorderThickness="0"/>
+                        </Grid>
+                    </TabItem>
                 </TabControl>
             </Grid>
 
diff --git a/Lite/MainWindow.xaml.cs b/Lite/MainWindow.xaml.cs
index 0c8427d..2f537d2 100644
--- a/Lite/MainWindow.xaml.cs
+++ b/Lite/MainWindow.xaml.cs
@@ -35,6 +35,7 @@ public partial class MainWindow : Window
     private SystemTrayService? _trayService;
     private readonly Dictionary<string, TabItem> _openServerTabs = new();
     private readonly Dictionary<string, bool> _previousConnectionStates = new();
+    private readonly Dictionary<string, bool> _previousCollectorErrorStates = new();
     private readonly Dictionary<string, DateTime> _lastCpuAlert = new();
     private readonly Dictionary<string, DateTime> _lastBlockingAlert = new();
     private readonly Dictionary<string, DateTime> _lastDeadlockAlert = new();
@@ -255,6 +256,9 @@ private void RefreshServerList()
         foreach (var server in servers)
         {
             server.IsOnline = _serverManager.GetConnectionStatus(server.Id).IsOnline;
+            server.HasCollectorErrors = _collectorService != null
+                && server.IsOnline == true
+                && _collectorService.GetHealthSummary(server).ErroringCollectors > 0;
         }
         ServerListView.ItemsSource = servers;
 
@@ -380,6 +384,8 @@ private async Task RefreshOverviewAsync()
                         summary.ServerName = server.ServerName;
                         var connStatus = _serverManager.GetConnectionStatus(server.Id);
                         summary.IsOnline = connStatus.IsOnline;
+                        if (_collectorService != null && connStatus.IsOnline == true)
+                            summary.HasCollectorErrors = _collectorService.GetHealthSummary(server).ErroringCollectors > 0;
                         summaries.Add(summary);
                     }
                 }
@@ -898,6 +904,9 @@ private void CheckConnectionsAndNotify()
                 if (status?.IsOnline == null) continue;
 
                 bool isOnline = status.IsOnline == true;
+                bool hasErrors = _collectorService != null && isOnline
+                    && _collectorService.GetHealthSummary(server).ErroringCollectors > 0;
+                server.HasCollectorErrors = hasErrors;
 
                 if (_previousConnectionStates.TryGetValue(server.Id, out var wasOnline))
                 {
@@ -930,7 +939,11 @@ private void CheckConnectionsAndNotify()
                     needsRefresh = true;
                 }
 
+                if (_previousCollectorErrorStates.TryGetValue(server.Id, out var prevHasErrors) && prevHasErrors != hasErrors)
+                    needsRefresh = true;
+
                 _previousConnectionStates[server.Id] = isOnline;
+                _previousCollectorErrorStates[server.Id] = hasErrors;
             }
 
             if (needsRefresh)
@@ -1449,4 +1462,390 @@ private static string FormatDuration(long seconds)
             if (seconds < 3600) return $"{seconds / 60}m {seconds % 60}s";
             return $"{seconds / 3600}h {(seconds % 3600) / 60}m";
         }
+
+        private void OpenPlanViewerButton_Click(object sender, RoutedEventArgs e)
+        {
+            EnsurePlanTabControlInitialized();
+            EmptyStatePanel.Visibility = Visibility.Collapsed;
+            ServerTabControl.Visibility = Visibility.Visible;
+            MainWindowPlanViewerTab.Visibility = Visibility.Visible;
+            if (MainWindowPlanViewerTab.IsSelected)
+            {
+                // Already on Plan Viewer — just add a new empty sub-tab
+                AddNewEmptyPlanSubTab();
+            }
+            else
+            {
+                MainWindowPlanViewerTab.IsSelected = true;
+                AddNewEmptyPlanSubTab();
+            }
+            Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new Action(() => MainWindowPlanTabControl.Focus()));
+        }
+
+        private void MainWindowPlanViewerClose_Click(object sender, RoutedEventArgs e)
+        {
+            // Reset inner tab control so next open starts fresh
+            MainWindowPlanTabControl.Items.Clear();
+            _planTabControlInitialized = false;
+            MainWindowPlanViewerTab.Visibility = Visibility.Collapsed;
+            // Select first visible tab
+            foreach (TabItem item in ServerTabControl.Items)
+            {
+                if (item.Visibility == Visibility.Visible && item != MainWindowPlanViewerTab)
+                {
+                    item.IsSelected = true;
+                    break;
+                }
+            }
+        }
+
+        #region Main Window Plan Viewer
+
+        private const string LitePlanAddTabId = "__PLAN_ADD_TAB__";
+        private bool _planTabControlInitialized;
+
+        private void EnsurePlanTabControlInitialized()
+        {
+            if (_planTabControlInitialized) return;
+            _planTabControlInitialized = true;
+
+            // "+" tab at the end
+            var addTabHeader = new TextBlock
+            {
+                Text = "+",
+                FontSize = 14,
+                FontWeight = FontWeights.Bold,
+                VerticalAlignment = VerticalAlignment.Center,
+                ToolTip = "Open a new plan sub-tab"
+            };
+            var addTab = new TabItem
+            {
+                Header = addTabHeader,
+                Tag = LitePlanAddTabId,
+                Content = new Grid()
+            };
+            MainWindowPlanTabControl.Items.Add(addTab);
+
+            MainWindowPlanTabControl.SelectionChanged += (_, _) =>
+            {
+                if (MainWindowPlanTabControl.SelectedItem is TabItem { Tag: string t } && t == LitePlanAddTabId)
+                {
+                    var newSub = AddNewEmptyPlanSubTab();
+                    MainWindowPlanTabControl.SelectedItem = newSub;
+                }
+            };
+        }
+
+        /// <summary>
+        /// Adds a new empty "New Plan" sub-tab to the inner plan TabControl and selects it.
+        /// Returns the newly created sub-tab.
+        /// </summary>
+        private TabItem AddNewEmptyPlanSubTab()
+        {
+            EnsurePlanTabControlInitialized();
+
+            // --- Empty state layer ---
+            var emptyState = new Grid();
+            var dashedRect = new System.Windows.Shapes.Rectangle
+            {
+                Margin = new Thickness(24),
+                Stroke = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                StrokeThickness = 1.5,
+                StrokeDashArray = new System.Windows.Media.DoubleCollection { 6, 4 },
+                RadiusX = 10, RadiusY = 10,
+                Opacity = 0.25
+            };
+            var emptyStack = new StackPanel { HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center };
+            emptyStack.Children.Add(new TextBlock
+            {
+                Text = "\uE896",
+                FontFamily = new System.Windows.Media.FontFamily("Segoe MDL2 Assets"),
+                FontSize = 52,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                Opacity = 0.45,
+                Margin = new Thickness(0, 0, 0, 12)
+            });
+            emptyStack.Children.Add(new TextBlock
+            {
+                Text = "New Plan",
+                FontSize = 20,
+                FontWeight = FontWeights.Light,
+                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                HorizontalAlignment = HorizontalAlignment.Center
+            });
+            emptyStack.Children.Add(new TextBlock
+            {
+                Text = "Open or paste execution plan XML to render it",
+                FontSize = 13,
+                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Margin = new Thickness(0, 8, 0, 0)
+            });
+            var btnPanel = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Center, Margin = new Thickness(0, 20, 0, 0) };
+            var openBtn = new Button { Content = "Open .sqlplan File", Height = 28, Padding = new Thickness(12, 0, 12, 0), ToolTip = "Open a .sqlplan or .xml file from disk" };
+            var pasteBtn = new Button { Content = "Paste XML", Height = 28, Padding = new Thickness(12, 0, 12, 0), Margin = new Thickness(8, 0, 0, 0), ToolTip = "Paste execution plan XML to render it (or use Ctrl+V)" };
+            btnPanel.Children.Add(openBtn);
+            btnPanel.Children.Add(pasteBtn);
+            emptyStack.Children.Add(btnPanel);
+            emptyStack.Children.Add(new TextBlock
+            {
+                Text = "or drag & drop a .sqlplan file anywhere in this area",
+                FontSize = 11,
+                Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush"),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Margin = new Thickness(0, 12, 0, 0)
+            });
+            emptyState.Children.Add(dashedRect);
+            emptyState.Children.Add(emptyStack);
+
+            // --- Viewer layer (hidden until a plan is loaded) ---
+            var viewer = new Controls.PlanViewerControl
+            {
+                Visibility = Visibility.Collapsed
+            };
+
+            // Sub-tab content grid: index 0 = emptyState, index 1 = viewer
+            var subTabContent = new Grid();
+            subTabContent.Children.Add(emptyState);
+            subTabContent.Children.Add(viewer);
+
+            // --- Sub-tab header: label + close button ---
+            var initialLabel = GetUniqueSubTabLabel("New Plan");
+            var labelBlock = new TextBlock
+            {
+                Text = initialLabel,
+                VerticalAlignment = VerticalAlignment.Center,
+                ToolTip = initialLabel
+            };
+            var subCloseBtn = new Button { Style = (Style)FindResource("TabCloseButton") };
+            var subTabHeader = new StackPanel { Orientation = Orientation.Horizontal };
+            subTabHeader.Children.Add(labelBlock);
+            subTabHeader.Children.Add(subCloseBtn);
+
+            var subTab = new TabItem { Header = subTabHeader, Content = subTabContent };
+
+            subCloseBtn.Tag = subTab;
+            subCloseBtn.Click += (_, _) =>
+            {
+                MainWindowPlanTabControl.Items.Remove(subTab);
+                // If only the "+" tab remains, open a fresh empty sub-tab
+                if (MainWindowPlanTabControl.Items.Count == 1 &&
+                    MainWindowPlanTabControl.Items[0] is TabItem { Tag: string t2 } && t2 == LitePlanAddTabId)
+                {
+                    AddNewEmptyPlanSubTab();
+                }
+            };
+
+            // Wire per-sub-tab buttons
+            openBtn.Click += (_, _) =>
+            {
+                var dialog = new Microsoft.Win32.OpenFileDialog
+                {
+                    Filter = "SQL Plan Files (*.sqlplan)|*.sqlplan|XML Files (*.xml)|*.xml|All Files (*.*)|*.*",
+                    DefaultExt = ".sqlplan",
+                    Multiselect = true
+                };
+                if (dialog.ShowDialog() != true) return;
+                var isFirst = true;
+                foreach (var fileName in dialog.FileNames)
+                {
+                    try
+                    {
+                        var xml = System.IO.File.ReadAllText(fileName);
+                        var targetTab = isFirst ? subTab : AddNewEmptyPlanSubTab();
+                        LoadPlanIntoSubTab(targetTab, xml, System.IO.Path.GetFileName(fileName));
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show($"Failed to open file:\n\n{ex.Message}", "Error",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                    isFirst = false;
+                }
+            };
+
+            pasteBtn.Click += (_, _) =>
+            {
+                var xml = Clipboard.GetText();
+                if (!string.IsNullOrWhiteSpace(xml))
+                {
+                    LoadPlanIntoSubTab(subTab, xml, "Pasted Plan");
+                    return;
+                }
+                MessageBox.Show("The clipboard does not contain any text.", "Paste Plan XML",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            };
+
+            // Insert before "+" tab
+            var addTabIndex = -1;
+            for (var i = 0; i < MainWindowPlanTabControl.Items.Count; i++)
+            {
+                if (MainWindowPlanTabControl.Items[i] is TabItem { Tag: string t3 } && t3 == LitePlanAddTabId)
+                {
+                    addTabIndex = i;
+                    break;
+                }
+            }
+            if (addTabIndex >= 0)
+                MainWindowPlanTabControl.Items.Insert(addTabIndex, subTab);
+            else
+                MainWindowPlanTabControl.Items.Add(subTab);
+
+            MainWindowPlanTabControl.SelectedItem = subTab;
+            return subTab;
+        }
+
+        /// <summary>
+        /// Loads plan XML into an existing sub-tab (replacing whatever was there before).
+        /// </summary>
+        private void LoadPlanIntoSubTab(TabItem subTab, string planXml, string label, string? queryText = null)
+        {
+            try { System.Xml.Linq.XDocument.Parse(planXml); }
+            catch (System.Xml.XmlException ex)
+            {
+                MessageBox.Show(
+                    $"The plan XML is not valid:\n\n{ex.Message}",
+                    "Invalid Plan XML",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Warning);
+                return;
+            }
+
+            if (subTab.Content is not Grid subTabContent) return;
+            if (subTabContent.Children.Count < 2) return;
+
+            var emptyState = subTabContent.Children[0] as FrameworkElement;
+            var viewer = subTabContent.Children[1] as Controls.PlanViewerControl;
+            if (viewer == null) return;
+
+            viewer.LoadPlan(planXml, label, queryText);
+            emptyState!.Visibility = Visibility.Collapsed;
+            viewer.Visibility = Visibility.Visible;
+
+            var uniqueLabel = GetUniqueSubTabLabel(label);
+            if (subTab.Header is StackPanel headerPanel &&
+                headerPanel.Children[0] is TextBlock headerLabel)
+            {
+                headerLabel.Text = uniqueLabel.Length > 30 ? uniqueLabel[..30] + "\u2026" : uniqueLabel;
+                headerLabel.ToolTip = uniqueLabel;
+            }
+        }
+
+        /// <summary>
+        /// Returns a label that is unique among current inner plan sub-tab headers.
+        /// If <paramref name="baseLabel"/> is already taken, appends " (1)", " (2)", …
+        /// </summary>
+        private string GetUniqueSubTabLabel(string baseLabel)
+        {
+            var existing = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var item in MainWindowPlanTabControl.Items)
+            {
+                if (item is TabItem { Tag: string t } && t == LitePlanAddTabId) continue;
+                if (item is TabItem subTab &&
+                    subTab.Header is StackPanel sp &&
+                    sp.Children[0] is TextBlock tb)
+                    existing.Add(tb.ToolTip as string ?? tb.Text);
+            }
+            if (!existing.Contains(baseLabel)) return baseLabel;
+            var counter = 1;
+            string candidate;
+            do { candidate = $"{baseLabel} ({counter++})"; }
+            while (existing.Contains(candidate));
+            return candidate;
+        }
+
+        /// <summary>
+        /// Returns the currently active real plan sub-tab (skips the "+" tab).
+        /// </summary>
+        private TabItem? GetActivePlanSubTab()
+        {
+            if (MainWindowPlanTabControl.SelectedItem is TabItem { Tag: string t } && t == LitePlanAddTabId)
+                return null;
+            return MainWindowPlanTabControl.SelectedItem as TabItem;
+        }
+
+        private void MainWindowPlanViewer_DragOver(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            {
+                var files = e.Data.GetData(DataFormats.FileDrop) as string[];
+                if (files?.Any(IsPlanFile) == true)
+                {
+                    e.Effects = DragDropEffects.Copy;
+                    e.Handled = true;
+                    return;
+                }
+            }
+            e.Effects = DragDropEffects.None;
+            e.Handled = true;
+        }
+
+        private void MainWindowPlanViewer_Drop(object sender, DragEventArgs e)
+        {
+            if (!e.Data.GetDataPresent(DataFormats.FileDrop)) return;
+            var planFiles = (e.Data.GetData(DataFormats.FileDrop) as string[])
+                ?.Where(IsPlanFile).ToArray();
+            if (planFiles == null || planFiles.Length == 0) return;
+            LoadMainWindowPlanFromFileIntoActiveTab(planFiles[0]);
+            for (var i = 1; i < planFiles.Length; i++)
+            {
+                var newTab = AddNewEmptyPlanSubTab();
+                try
+                {
+                    var xml = System.IO.File.ReadAllText(planFiles[i]);
+                    LoadPlanIntoSubTab(newTab, xml, System.IO.Path.GetFileName(planFiles[i]));
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"Failed to load plan file:\n{ex.Message}", "Load Error",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+        }
+
+        private void MainWindowPlanViewer_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == System.Windows.Input.Key.V &&
+                System.Windows.Input.Keyboard.Modifiers == System.Windows.Input.ModifierKeys.Control &&
+                e.OriginalSource is not System.Windows.Controls.TextBox)
+            {
+                var xml = Clipboard.GetText();
+                if (!string.IsNullOrWhiteSpace(xml))
+                {
+                    e.Handled = true;
+                    LoadPlanIntoActivePlanSubTab(xml, "Pasted Plan");
+                }
+            }
+        }
+
+        private void LoadMainWindowPlanFromFileIntoActiveTab(string path)
+        {
+            try
+            {
+                var xml = System.IO.File.ReadAllText(path);
+                LoadPlanIntoActivePlanSubTab(xml, System.IO.Path.GetFileName(path));
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Failed to load plan file:\n{ex.Message}", "Load Error",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void LoadPlanIntoActivePlanSubTab(string planXml, string label)
+        {
+            var activeSubTab = GetActivePlanSubTab();
+            if (activeSubTab != null)
+                LoadPlanIntoSubTab(activeSubTab, planXml, label);
+        }
+
+        private static bool IsPlanFile(string path)
+        {
+            var ext = System.IO.Path.GetExtension(path);
+            return string.Equals(ext, ".sqlplan", StringComparison.OrdinalIgnoreCase)
+                || string.Equals(ext, ".xml", StringComparison.OrdinalIgnoreCase);
+        }
+
+        #endregion
     }
diff --git a/Lite/Models/PlanModels.cs b/Lite/Models/PlanModels.cs
index 2da98c8..a6e62f7 100644
--- a/Lite/Models/PlanModels.cs
+++ b/Lite/Models/PlanModels.cs
@@ -110,6 +110,12 @@ public class PlanStatement
     public bool ExclusiveProfileTimeActive { get; set; }
     public string? OptimizationReplayScript { get; set; }
 
+    // QueryPlan-level MemoryGrant attribute (unsignedLong)
+    public long QueryPlanMemoryGrantKB { get; set; }
+
+    // StmtUseDb: USE database statement
+    public string? StmtUseDatabaseName { get; set; }
+
     // XSD gap: BaseStmtInfoType
     public int QueryCompilationReplay { get; set; }
 
@@ -272,8 +278,11 @@ public class PlanNode
     public string? ActionColumn { get; set; }
     public long ActualSegmentReads { get; set; }
     public long ActualSegmentSkips { get; set; }
-    public long UdfCpuTimeUs { get; set; }
-    public long UdfElapsedTimeUs { get; set; }
+    public long UdfCpuTimeMs { get; set; }
+    public long UdfElapsedTimeMs { get; set; }
+    public long InputMemoryGrantKB { get; set; }
+    public long OutputMemoryGrantKB { get; set; }
+    public long UsedMemoryGrantKB { get; set; }
 
     // XSD gap: RelOp-level metadata
     public bool GroupExecuted { get; set; }
@@ -317,6 +326,26 @@ public class PlanNode
     public string? RemoteSource { get; set; }
     public string? RemoteObject { get; set; }
     public string? RemoteQuery { get; set; }
+
+    // GuessedSelectivity — optimizer guessed selectivity on predicates
+    public bool GuessedSelectivity { get; set; }
+
+    // ForeignKeyReferenceCheck attributes
+    public int ForeignKeyReferencesCount { get; set; }
+    public int NoMatchingIndexCount { get; set; }
+    public int PartialMatchingIndexCount { get; set; }
+
+    // ConstantScan Values (parsed rows as displayable string)
+    public string? ConstantScanValues { get; set; }
+
+    // SpillOccurred detail flag (node-level, from Warnings element)
+    public bool SpillOccurredDetail { get; set; }
+
+    // UDX UsedUDXColumns (column references for CLR aggregate operators)
+    public string? UdxUsedColumns { get; set; }
+
+    // Row Goal: the optimizer's estimate before TOP/EXISTS reduced it
+    public double EstimateRowsWithoutRowGoal { get; set; }
 }
 
 public class MissingIndex
diff --git a/Lite/Models/ServerConnection.cs b/Lite/Models/ServerConnection.cs
index 610b2b2..b9211de 100644
--- a/Lite/Models/ServerConnection.cs
+++ b/Lite/Models/ServerConnection.cs
@@ -88,6 +88,30 @@ public bool UseWindowsAuth
     [JsonIgnore]
     public bool? IsOnline { get; set; }
 
+    /// <summary>
+    /// Whether one or more collectors are currently failing for this server.
+    /// null = not yet determined; true = some collectors have consecutive errors; false = all healthy.
+    /// </summary>
+    [JsonIgnore]
+    public bool? HasCollectorErrors { get; set; }
+
+    /// <summary>
+    /// Computed dot status for the sidebar indicator. One of: "Unknown", "Online", "Warning", "Offline".
+    /// Drives the Ellipse fill via DataTrigger in MainWindow.xaml.
+    /// </summary>
+    [JsonIgnore]
+    public string DotStatus
+    {
+        get
+        {
+            if (IsOnline == true)
+                return HasCollectorErrors == true ? "Warning" : "Online";
+            if (IsOnline == false)
+                return "Offline";
+            return "Unknown"; // null — not yet checked
+        }
+    }
+
     /// <summary>
     /// Display-only property for showing status in UI.
     /// </summary>
diff --git a/Lite/PerformanceMonitorLite.csproj b/Lite/PerformanceMonitorLite.csproj
index c87dd8a..88ee7eb 100644
--- a/Lite/PerformanceMonitorLite.csproj
+++ b/Lite/PerformanceMonitorLite.csproj
@@ -7,7 +7,10 @@
     <AssemblyName>PerformanceMonitorLite</AssemblyName>
     <RootNamespace>PerformanceMonitorLite</RootNamespace>
     <Product>SQL Server Performance Monitor Lite</Product>
-    <Version>2.0.0</Version>
+    <Version>2.1.0</Version>
+    <AssemblyVersion>2.1.0.0</AssemblyVersion>
+    <FileVersion>2.1.0.0</FileVersion>
+    <InformationalVersion>2.1.0</InformationalVersion>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <Description>Lightweight SQL Server performance monitoring - no installation required on target servers</Description>
diff --git a/Lite/Services/DataGridFilterService.cs b/Lite/Services/DataGridFilterService.cs
index 38e07bc..409e13c 100644
--- a/Lite/Services/DataGridFilterService.cs
+++ b/Lite/Services/DataGridFilterService.cs
@@ -8,6 +8,7 @@
 
 using System;
 using System.Globalization;
+using System.Linq;
 using PerformanceMonitorLite.Models;
 
 namespace PerformanceMonitorLite.Services;
@@ -40,18 +41,27 @@ public static bool MatchesFilter(object item, ColumnFilterState filter)
         var stringValue = rawValue?.ToString() ?? string.Empty;
         var filterValue = filter.Value ?? string.Empty;
 
-        /* Handle comparison operators */
+        /* Split comma-separated values for text operators (e.g., "db1, db2") */
+        var terms = filterValue.Split(',')
+            .Select(t => t.Trim())
+            .Where(t => !string.IsNullOrEmpty(t))
+            .ToArray();
+
+        if (terms.Length == 0)
+            return true;
+
+        /* Text operators match ANY term, NotEquals excludes ALL terms */
         return filter.Operator switch
         {
-            FilterOperator.Contains => stringValue.Contains(filterValue, StringComparison.OrdinalIgnoreCase),
-            FilterOperator.Equals => CompareValues(rawValue, filterValue, (a, b) => a == b),
-            FilterOperator.NotEquals => CompareValues(rawValue, filterValue, (a, b) => a != b),
+            FilterOperator.Contains => terms.Any(t => stringValue.Contains(t, StringComparison.OrdinalIgnoreCase)),
+            FilterOperator.Equals => terms.Any(t => CompareValues(rawValue, t, (a, b) => a == b)),
+            FilterOperator.NotEquals => terms.All(t => CompareValues(rawValue, t, (a, b) => a != b)),
             FilterOperator.GreaterThan => CompareNumeric(rawValue, filterValue, (a, b) => a > b),
             FilterOperator.GreaterThanOrEqual => CompareNumeric(rawValue, filterValue, (a, b) => a >= b),
             FilterOperator.LessThan => CompareNumeric(rawValue, filterValue, (a, b) => a < b),
             FilterOperator.LessThanOrEqual => CompareNumeric(rawValue, filterValue, (a, b) => a <= b),
-            FilterOperator.StartsWith => stringValue.StartsWith(filterValue, StringComparison.OrdinalIgnoreCase),
-            FilterOperator.EndsWith => stringValue.EndsWith(filterValue, StringComparison.OrdinalIgnoreCase),
+            FilterOperator.StartsWith => terms.Any(t => stringValue.StartsWith(t, StringComparison.OrdinalIgnoreCase)),
+            FilterOperator.EndsWith => terms.Any(t => stringValue.EndsWith(t, StringComparison.OrdinalIgnoreCase)),
             _ => true
         };
     }
diff --git a/Lite/Services/LocalDataService.Blocking.cs b/Lite/Services/LocalDataService.Blocking.cs
index 4ef859f..99ba8e1 100644
--- a/Lite/Services/LocalDataService.Blocking.cs
+++ b/Lite/Services/LocalDataService.Blocking.cs
@@ -52,11 +52,36 @@ public static DateTime ToLocalTime(DateTime serverTime)
         return utcTime.ToLocalTime();
     }
 
+    /// <summary>
+    /// The current display mode preference. Read from App settings at startup.
+    /// </summary>
+    public static Helpers.TimeDisplayMode CurrentDisplayMode { get; set; } = Helpers.TimeDisplayMode.ServerTime;
+
+    /// <summary>
+    /// Converts a server DateTime for display based on the selected display mode.
+    /// </summary>
+    public static DateTime ConvertForDisplay(DateTime serverTime, Helpers.TimeDisplayMode mode) => mode switch
+    {
+        Helpers.TimeDisplayMode.LocalTime => ToLocalTime(serverTime),
+        Helpers.TimeDisplayMode.UTC => serverTime.AddMinutes(-_utcOffsetMinutes),
+        _ => serverTime
+    };
+
+    /// <summary>
+    /// Returns a short timezone label for the current display mode.
+    /// </summary>
+    public static string GetTimezoneLabel(Helpers.TimeDisplayMode mode) => mode switch
+    {
+        Helpers.TimeDisplayMode.LocalTime => TimeZoneInfo.Local.StandardName,
+        Helpers.TimeDisplayMode.UTC => "UTC",
+        _ => $"UTC{(_utcOffsetMinutes >= 0 ? "+" : "")}{_utcOffsetMinutes / 60}:{Math.Abs(_utcOffsetMinutes % 60):D2}"
+    };
+
     public static string FormatServerTime(DateTime utcTime, string format = "yyyy-MM-dd HH:mm:ss")
-        => utcTime.AddMinutes(_utcOffsetMinutes).ToString(format);
+        => ConvertForDisplay(utcTime.AddMinutes(_utcOffsetMinutes), CurrentDisplayMode).ToString(format);
 
     public static string FormatServerTime(DateTime? utcTime, string format = "yyyy-MM-dd HH:mm:ss")
-        => utcTime.HasValue ? utcTime.Value.AddMinutes(_utcOffsetMinutes).ToString(format) : "";
+        => utcTime.HasValue ? ConvertForDisplay(utcTime.Value.AddMinutes(_utcOffsetMinutes), CurrentDisplayMode).ToString(format) : "";
 }
 
 public partial class LocalDataService
diff --git a/Lite/Services/LocalDataService.Overview.cs b/Lite/Services/LocalDataService.Overview.cs
index b86f6c4..eee8a89 100644
--- a/Lite/Services/LocalDataService.Overview.cs
+++ b/Lite/Services/LocalDataService.Overview.cs
@@ -126,6 +126,8 @@ public class ServerSummaryItem
     public string ServerName { get; set; } = "";
     public int ServerId { get; set; }
     public bool? IsOnline { get; set; }
+    /// <summary>True when the server is reachable but one or more collectors have consecutive errors.</summary>
+    public bool HasCollectorErrors { get; set; }
     public double? CpuPercent { get; set; }
     public double? MemoryMb { get; set; }
     public int BlockingCount { get; set; }
@@ -139,8 +141,20 @@ public class ServerSummaryItem
     public string LastCollectionDisplay => LastCollectionTime.HasValue ? ServerTimeHelper.FormatServerTime(LastCollectionTime, "HH:mm:ss") : "Never";
 
     /* Connection status */
-    public string StatusDisplay => IsOnline switch { true => "Online", false => "Offline", _ => "Unknown" };
-    public SolidColorBrush StatusBrush => MakeBrush(IsOnline switch { true => "#81C784", false => "#E57373", _ => "#888888" });
+    public string StatusDisplay => IsOnline switch
+    {
+        true when HasCollectorErrors => "Warning",
+        true => "Online",
+        false => "Offline",
+        _ => "Unknown"
+    };
+    public SolidColorBrush StatusBrush => MakeBrush(IsOnline switch
+    {
+        true when HasCollectorErrors => "#FFD54F",  // amber — connected but collectors failing
+        true => "#81C784",
+        false => "#E57373",
+        _ => "#888888"
+    });
     public bool IsOffline => IsOnline == false;
 
     /* Color coding */
@@ -152,6 +166,7 @@ public class ServerSummaryItem
         DeadlockCount > 0 ? "#E57373" :
         BlockingCount > 0 ? "#FFB74D" :
         CpuPercent >= 80 ? "#FFB74D" :
+        HasCollectorErrors ? "#FFD54F" :   // amber border when collectors are failing
         "#2a2d35");
 
     private static SolidColorBrush MakeBrush(string hex)
diff --git a/Lite/Services/LocalDataService.WaitStats.cs b/Lite/Services/LocalDataService.WaitStats.cs
index f7f1a31..e18b4f5 100644
--- a/Lite/Services/LocalDataService.WaitStats.cs
+++ b/Lite/Services/LocalDataService.WaitStats.cs
@@ -202,26 +202,40 @@ public async Task<List<LongRunningQueryInfo>> GetLongRunningQueriesAsync(int ser
 
         var thresholdMs = (long)thresholdMinutes * 60 * 1000;
 
-        command.CommandText = @"
-SELECT
-    session_id,
-    database_name,
-    SUBSTRING(query_text, 1, 300) AS query_text,
-    total_elapsed_time_ms / 1000 AS elapsed_seconds,
-    cpu_time_ms,
-    reads,
-    writes,
-    wait_type,
-    blocking_session_id
-FROM v_query_snapshots
-WHERE server_id = $1
-AND collection_time = (SELECT MAX(collection_time) FROM v_query_snapshots WHERE server_id = $1)
-AND session_id > 50
-AND total_elapsed_time_ms >= $2
-AND query_text NOT LIKE '%waitfor delay%'
-AND query_text NOT LIKE '%waitfor receive%'
-ORDER BY total_elapsed_time_ms DESC
-LIMIT 5";
+        // Exclude internal SP_SERVER_DIAGNOSTICS queries by default, as they often run long and aren't actionable.
+        string spServerDiagnosticsFilter = "AND r.wait_type NOT LIKE N'%SP_SERVER_DIAGNOSTICS%'";
+
+        // Exclude WAITFOR queries by default, as they can run indefinitely and may not indicate a problem.
+        string waitForFilter = "AND r.wait_type NOT IN (N'WAITFOR', N'BROKER_RECEIVE_WAITFOR')";
+
+        // Exclude backup waits if specified, as they can run long and aren't typically actionable in this context.
+        string backupsFilter = "AND r.wait_type NOT IN (N'BACKUPTHREAD', N'BACKUPIO')";
+
+        // Exclude miscellaneous wait type that aren't typically actionable
+        string miscWaitsFilter = "AND r.wait_type NOT IN (N'XE_LIVE_TARGET_TVF')";
+
+        command.CommandText = @$"
+                SELECT
+                    r.session_id,
+                    r.database_name,
+                    SUBSTRING(r.query_text, 1, 300) AS query_text,
+                    r.total_elapsed_time_ms / 1000 AS elapsed_seconds,
+                    r.cpu_time_ms,
+                    r.reads,
+                    r.writes,
+                    r.wait_type,
+                    r.blocking_session_id
+                FROM v_query_snapshots AS r
+                WHERE r.server_id = $1
+                    AND r.collection_time = (SELECT MAX(vqs.collection_time) FROM v_query_snapshots AS vqs WHERE vqs.server_id = $1)
+                    AND r.session_id > 50
+                    {spServerDiagnosticsFilter}
+                    {waitForFilter}
+                    {backupsFilter}
+                    {miscWaitsFilter}
+                    AND r.total_elapsed_time_ms >= $2
+                ORDER BY r.total_elapsed_time_ms DESC
+                LIMIT 5;";
 
         command.Parameters.Add(new DuckDBParameter { Value = serverId });
         command.Parameters.Add(new DuckDBParameter { Value = thresholdMs });
diff --git a/Lite/Services/PlanAnalyzer.cs b/Lite/Services/PlanAnalyzer.cs
index 603cc83..8031874 100644
--- a/Lite/Services/PlanAnalyzer.cs
+++ b/Lite/Services/PlanAnalyzer.cs
@@ -1,219 +1,1246 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using PerformanceMonitorLite.Models;
-
-namespace PerformanceMonitorLite.Services;
-
-/// <summary>
-/// Post-parse analysis pass that walks a parsed plan tree and adds warnings
-/// for common performance anti-patterns. Called after ShowPlanParser.Parse().
-/// </summary>
-public static class PlanAnalyzer
-{
-    public static void Analyze(ParsedPlan plan)
-    {
-        foreach (var batch in plan.Batches)
-        {
-            foreach (var stmt in batch.Statements)
-            {
-                AnalyzeStatement(stmt);
-
-                if (stmt.RootNode != null)
-                    AnalyzeNodeTree(stmt.RootNode);
-            }
-        }
-    }
-
-    private static void AnalyzeStatement(PlanStatement stmt)
-    {
-        // Rule 3: Serial plan with reason
-        if (!string.IsNullOrEmpty(stmt.NonParallelPlanReason))
-        {
-            var reason = stmt.NonParallelPlanReason switch
-            {
-                "MaxDOPSetToOne" => "MAXDOP is set to 1",
-                "EstimatedDOPIsOne" => "Estimated DOP is 1",
-                "NoParallelPlansInDesktopOrExpressEdition" => "Express/Desktop edition does not support parallelism",
-                "CouldNotGenerateValidParallelPlan" => "Optimizer could not generate a valid parallel plan",
-                "QueryHintNoParallelSet" => "OPTION (MAXDOP 1) hint forces serial execution",
-                _ => stmt.NonParallelPlanReason
-            };
-
-            stmt.PlanWarnings.Add(new PlanWarning
-            {
-                WarningType = "Serial Plan",
-                Message = $"Query forced to run serially: {reason}",
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
-
-        // Rule 9: Memory grant issues (statement-level)
-        if (stmt.MemoryGrant != null)
-        {
-            var grant = stmt.MemoryGrant;
-
-            // Excessive grant — granted far more than actually used
-            if (grant.GrantedMemoryKB > 0 && grant.MaxUsedMemoryKB > 0)
-            {
-                var wasteRatio = (double)grant.GrantedMemoryKB / grant.MaxUsedMemoryKB;
-                if (wasteRatio >= 10 && grant.GrantedMemoryKB > 1024)
-                {
-                    stmt.PlanWarnings.Add(new PlanWarning
-                    {
-                        WarningType = "Excessive Memory Grant",
-                        Message = $"Granted {grant.GrantedMemoryKB:N0} KB but only used {grant.MaxUsedMemoryKB:N0} KB ({wasteRatio:F0}x overestimate). Wasted memory blocks other queries.",
-                        Severity = PlanWarningSeverity.Warning
-                    });
-                }
-            }
-
-            // Grant wait — query had to wait for memory
-            if (grant.GrantWaitTimeMs > 0)
-            {
-                stmt.PlanWarnings.Add(new PlanWarning
-                {
-                    WarningType = "Memory Grant Wait",
-                    Message = $"Query waited {grant.GrantWaitTimeMs:N0}ms for a memory grant. Server may be under memory pressure.",
-                    Severity = grant.GrantWaitTimeMs >= 5000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
-                });
-            }
-        }
-    }
-
-    private static void AnalyzeNodeTree(PlanNode node)
-    {
-        AnalyzeNode(node);
-
-        foreach (var child in node.Children)
-            AnalyzeNodeTree(child);
-    }
-
-    private static void AnalyzeNode(PlanNode node)
-    {
-        // Rule 1: Filter operators — rows survived the tree just to be discarded
-        if (node.PhysicalOp == "Filter" && !string.IsNullOrEmpty(node.Predicate))
-        {
-            node.Warnings.Add(new PlanWarning
-            {
-                WarningType = "Filter Operator",
-                Message = $"Filter discards rows late in the plan. Predicate: {Truncate(node.Predicate, 200)}",
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
-
-        // Rule 2: Eager Index Spools — optimizer building temporary indexes on the fly
-        if (node.LogicalOp == "Eager Spool" &&
-            node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase))
-        {
-            var message = "Optimizer is building a temporary index at runtime. A permanent index may help.";
-            if (!string.IsNullOrEmpty(node.SuggestedIndex))
-                message += $"\n\nSuggested index:\n{node.SuggestedIndex}";
-
-            node.Warnings.Add(new PlanWarning
-            {
-                WarningType = "Eager Index Spool",
-                Message = message,
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
-
-        // Rule 4: UDF timing — any node spending time in UDFs (actual plans)
-        if (node.UdfCpuTimeUs > 0 || node.UdfElapsedTimeUs > 0)
-        {
-            var cpuMs = node.UdfCpuTimeUs / 1000.0;
-            var elapsedMs = node.UdfElapsedTimeUs / 1000.0;
-            node.Warnings.Add(new PlanWarning
-            {
-                WarningType = "UDF Execution",
-                Message = $"Scalar UDF executing on this operator. UDF elapsed: {elapsedMs:F1}ms, UDF CPU: {cpuMs:F1}ms",
-                Severity = elapsedMs >= 1000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
-            });
-        }
-
-        // Rule 5: Large estimate vs actual row gaps (actual plans only)
-        if (node.HasActualStats && node.EstimateRows > 0)
-        {
-            var ratio = node.ActualRows / node.EstimateRows;
-            if (ratio >= 10.0 || ratio <= 0.1)
-            {
-                var direction = ratio >= 10.0 ? "underestimated" : "overestimated";
-                var factor = ratio >= 10.0 ? ratio : 1.0 / ratio;
-                node.Warnings.Add(new PlanWarning
-                {
-                    WarningType = "Row Estimate Mismatch",
-                    Message = $"Estimated {node.EstimateRows:N0} rows, actual {node.ActualRows:N0} ({factor:F0}x {direction}). May cause poor plan choices.",
-                    Severity = factor >= 100 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
-                });
-            }
-        }
-
-        // Rule 6: Scalar UDF references (works on estimated plans too)
-        foreach (var udf in node.ScalarUdfs)
-        {
-            var type = udf.IsClrFunction ? "CLR" : "T-SQL";
-            node.Warnings.Add(new PlanWarning
-            {
-                WarningType = "Scalar UDF",
-                Message = $"Scalar {type} UDF reference: {udf.FunctionName}. Scalar UDFs execute row-by-row and prevent parallelism.",
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
-
-        // Rule 7: Spill detection — promote severity for large spills
-        foreach (var w in node.Warnings.ToList())
-        {
-            if (w.SpillDetails != null && w.SpillDetails.WritesToTempDb > 1000)
-                w.Severity = PlanWarningSeverity.Critical;
-        }
-
-        // Rule 8: Parallel thread skew (actual plans with per-thread stats)
-        if (node.PerThreadStats.Count > 1)
-        {
-            var totalRows = node.PerThreadStats.Sum(t => t.ActualRows);
-            if (totalRows > 0)
-            {
-                var maxThread = node.PerThreadStats.OrderByDescending(t => t.ActualRows).First();
-                var skewRatio = (double)maxThread.ActualRows / totalRows;
-                if (skewRatio >= 0.9 && node.PerThreadStats.Count >= 4)
-                {
-                    node.Warnings.Add(new PlanWarning
-                    {
-                        WarningType = "Parallel Skew",
-                        Message = $"Thread {maxThread.ThreadId} processed {skewRatio:P0} of rows ({maxThread.ActualRows:N0}/{totalRows:N0}). Work is heavily skewed to one thread.",
-                        Severity = PlanWarningSeverity.Warning
-                    });
-                }
-            }
-        }
-
-        // Rule 10: Key Lookup with residual predicate
-        if (node.Lookup && !string.IsNullOrEmpty(node.Predicate))
-        {
-            node.Warnings.Add(new PlanWarning
-            {
-                WarningType = "Key Lookup",
-                Message = $"Key Lookup with residual predicate. A covering index may eliminate this lookup. Predicate: {Truncate(node.Predicate, 200)}",
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
-
-        // Rule 11: Scan with residual predicate (not spools)
-        if (node.PhysicalOp.Contains("Scan", StringComparison.OrdinalIgnoreCase) &&
-            !node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase) &&
-            !string.IsNullOrEmpty(node.Predicate))
-        {
-            node.Warnings.Add(new PlanWarning
-            {
-                WarningType = "Scan With Predicate",
-                Message = $"Scan filtering rows with a residual predicate. An index on the predicate columns may help. Predicate: {Truncate(node.Predicate, 200)}",
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
-    }
-
-    private static string Truncate(string value, int maxLength)
-    {
-        return value.Length <= maxLength ? value : value[..maxLength] + "...";
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using PerformanceMonitorLite.Models;
+
+namespace PerformanceMonitorLite.Services;
+
+/// <summary>
+/// Post-parse analysis pass that walks a parsed plan tree and adds warnings
+/// for common performance anti-patterns. Called after ShowPlanParser.Parse().
+/// </summary>
+public static class PlanAnalyzer
+{
+    private static readonly Regex FunctionInPredicateRegex = new(
+        @"\b(CONVERT_IMPLICIT|CONVERT|CAST|isnull|coalesce|datepart|datediff|dateadd|year|month|day|upper|lower|ltrim|rtrim|trim|substring|left|right|charindex|replace|len|datalength|abs|floor|ceiling|round|reverse|stuff|format)\s*\(",
+        RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+    private static readonly Regex LeadingWildcardLikeRegex = new(
+        @"\blike\b[^'""]*?N?'%",
+        RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+    private static readonly Regex CaseInPredicateRegex = new(
+        @"\bCASE\s+(WHEN\b|$)",
+        RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+    // Matches CTE definitions: WITH name AS ( or , name AS (
+    private static readonly Regex CteDefinitionRegex = new(
+        @"(?:\bWITH\s+|\,\s*)(\w+)\s+AS\s*\(",
+        RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+    public static void Analyze(ParsedPlan plan)
+    {
+        foreach (var batch in plan.Batches)
+        {
+            foreach (var stmt in batch.Statements)
+            {
+                AnalyzeStatement(stmt);
+
+                if (stmt.RootNode != null)
+                    AnalyzeNodeTree(stmt.RootNode, stmt);
+            }
+        }
+    }
+
+    private static void AnalyzeStatement(PlanStatement stmt)
+    {
+        // Rule 3: Serial plan with reason
+        if (!string.IsNullOrEmpty(stmt.NonParallelPlanReason))
+        {
+            var reason = stmt.NonParallelPlanReason switch
+            {
+                "MaxDOPSetToOne" => "MAXDOP is set to 1",
+                "EstimatedDOPIsOne" => "Estimated DOP is 1 (the plan's estimated cost was below the cost threshold for parallelism)",
+                "NoParallelPlansInDesktopOrExpressEdition" => "Express/Desktop edition does not support parallelism",
+                "CouldNotGenerateValidParallelPlan" => "Optimizer could not generate a valid parallel plan. Common causes: scalar UDFs, inserts into table variables, certain system functions, or OPTION (MAXDOP 1) hints",
+                "QueryHintNoParallelSet" => "OPTION (MAXDOP 1) hint forces serial execution",
+                _ => stmt.NonParallelPlanReason
+            };
+
+            stmt.PlanWarnings.Add(new PlanWarning
+            {
+                WarningType = "Serial Plan",
+                Message = $"Query running serially: {reason}.",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 9: Memory grant issues (statement-level)
+        if (stmt.MemoryGrant != null)
+        {
+            var grant = stmt.MemoryGrant;
+
+            // Excessive grant — granted far more than actually used
+            if (grant.GrantedMemoryKB > 0 && grant.MaxUsedMemoryKB > 0)
+            {
+                var wasteRatio = (double)grant.GrantedMemoryKB / grant.MaxUsedMemoryKB;
+                if (wasteRatio >= 10 && grant.GrantedMemoryKB >= 1048576)
+                {
+                    var grantMB = grant.GrantedMemoryKB / 1024.0;
+                    var usedMB = grant.MaxUsedMemoryKB / 1024.0;
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Excessive Memory Grant",
+                        Message = $"Granted {grantMB:N0} MB but only used {usedMB:N0} MB ({wasteRatio:F0}x overestimate). The unused memory is reserved and unavailable to other queries.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+
+            // Grant wait — query had to wait for memory
+            if (grant.GrantWaitTimeMs > 0)
+            {
+                stmt.PlanWarnings.Add(new PlanWarning
+                {
+                    WarningType = "Memory Grant Wait",
+                    Message = $"Query waited {grant.GrantWaitTimeMs:N0}ms for a memory grant before it could start running. Other queries were using all available workspace memory.",
+                    Severity = grant.GrantWaitTimeMs >= 5000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+                });
+            }
+
+            // Large memory grant with sort/hash guidance
+            if (grant.GrantedMemoryKB >= 1048576 && stmt.RootNode != null)
+            {
+                var consumers = new List<string>();
+                FindMemoryConsumers(stmt.RootNode, consumers);
+
+                var grantMB = grant.GrantedMemoryKB / 1024.0;
+                var guidance = consumers.Count > 0
+                    ? $" Memory consumers: {string.Join(", ", consumers)}. Check whether these operators are processing more rows than necessary."
+                    : "";
+
+                stmt.PlanWarnings.Add(new PlanWarning
+                {
+                    WarningType = "Large Memory Grant",
+                    Message = $"Query granted {grantMB:F0} MB of memory.{guidance}",
+                    Severity = grantMB >= 4096 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+                });
+            }
+        }
+
+        // Rule 18: Compile memory exceeded (early abort)
+        if (stmt.StatementOptmEarlyAbortReason == "MemoryLimitExceeded")
+        {
+            stmt.PlanWarnings.Add(new PlanWarning
+            {
+                WarningType = "Compile Memory Exceeded",
+                Message = "Optimization was aborted early because the compile memory limit was exceeded. The plan is likely suboptimal. Simplify the query by breaking it into smaller steps using #temp tables.",
+                Severity = PlanWarningSeverity.Critical
+            });
+        }
+
+        // Rule 19: High compile CPU
+        if (stmt.CompileCPUMs >= 1000)
+        {
+            stmt.PlanWarnings.Add(new PlanWarning
+            {
+                WarningType = "High Compile CPU",
+                Message = $"Query took {stmt.CompileCPUMs:N0}ms of CPU just to compile a plan (before any data was read). Simplify the query by breaking it into smaller steps using #temp tables.",
+                Severity = stmt.CompileCPUMs >= 5000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 4 (statement-level): UDF execution timing from QueryTimeStats
+        // Some plans report UDF timing only at the statement level, not per-node.
+        if (stmt.QueryUdfCpuTimeMs > 0 || stmt.QueryUdfElapsedTimeMs > 0)
+        {
+            stmt.PlanWarnings.Add(new PlanWarning
+            {
+                WarningType = "UDF Execution",
+                Message = $"Scalar UDF cost in this statement: {stmt.QueryUdfElapsedTimeMs:N0}ms elapsed, {stmt.QueryUdfCpuTimeMs:N0}ms CPU. Scalar UDFs run once per row and prevent parallelism. Rewrite as an inline table-valued function, or dump results to a #temp table and apply the UDF only to the final result set.",
+                Severity = stmt.QueryUdfElapsedTimeMs >= 1000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 20: Local variables without RECOMPILE
+        // Parameters with no CompiledValue are likely local variables — the optimizer
+        // cannot sniff their values and uses density-based ("unknown") estimates.
+        if (stmt.Parameters.Count > 0)
+        {
+            var unsnifffedParams = stmt.Parameters
+                .Where(p => string.IsNullOrEmpty(p.CompiledValue))
+                .ToList();
+
+            if (unsnifffedParams.Count > 0)
+            {
+                var hasRecompile = stmt.StatementText.Contains("RECOMPILE", StringComparison.OrdinalIgnoreCase);
+                if (!hasRecompile)
+                {
+                    var names = string.Join(", ", unsnifffedParams.Select(p => p.Name));
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Local Variables",
+                        Message = $"Local variables detected: {names}. SQL Server cannot sniff local variable values at compile time, so it uses average density estimates instead of your actual values. Test with OPTION (RECOMPILE) to see if the plan improves. For a permanent fix, use dynamic SQL or a stored procedure to pass the values as parameters instead of local variables.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+        }
+
+        // Rule 21: CTE referenced multiple times
+        if (!string.IsNullOrEmpty(stmt.StatementText))
+        {
+            DetectMultiReferenceCte(stmt);
+        }
+
+        // Rule 27: OPTIMIZE FOR UNKNOWN in statement text
+        if (!string.IsNullOrEmpty(stmt.StatementText) &&
+            Regex.IsMatch(stmt.StatementText, @"OPTIMIZE\s+FOR\s+UNKNOWN", RegexOptions.IgnoreCase))
+        {
+            stmt.PlanWarnings.Add(new PlanWarning
+            {
+                WarningType = "Optimize For Unknown",
+                Message = "OPTIMIZE FOR UNKNOWN uses average density estimates instead of sniffed parameter values. This can help when parameter sniffing causes plan instability, but may produce suboptimal plans for skewed data distributions.",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 25: Ineffective parallelism — parallel plan where CPU ≈ elapsed
+        if (stmt.DegreeOfParallelism > 1 && stmt.QueryTimeStats != null)
+        {
+            var cpu = stmt.QueryTimeStats.CpuTimeMs;
+            var elapsed = stmt.QueryTimeStats.ElapsedTimeMs;
+
+            if (elapsed >= 1000 && cpu > 0)
+            {
+                var ratio = (double)cpu / elapsed;
+                if (ratio <= 1.3)
+                {
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Ineffective Parallelism",
+                        Message = $"Parallel plan (DOP {stmt.DegreeOfParallelism}) but CPU time ({cpu:N0}ms) is nearly equal to elapsed time ({elapsed:N0}ms). " +
+                                  $"The work ran essentially serially despite the overhead of parallelism. " +
+                                  $"Look for parallel thread skew, blocking exchanges, or serial zones in the plan that prevent effective parallel execution.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+        }
+
+        // Rule 30: Missing index quality evaluation
+        {
+            // Detect duplicate suggestions for the same table
+            var tableSuggestionCount = stmt.MissingIndexes
+                .GroupBy(mi => $"{mi.Schema}.{mi.Table}", StringComparer.OrdinalIgnoreCase)
+                .Where(g => g.Count() > 1)
+                .ToDictionary(g => g.Key, g => g.Count(), StringComparer.OrdinalIgnoreCase);
+
+            foreach (var mi in stmt.MissingIndexes)
+            {
+                var keyCount = mi.EqualityColumns.Count + mi.InequalityColumns.Count;
+                var includeCount = mi.IncludeColumns.Count;
+                var tableKey = $"{mi.Schema}.{mi.Table}";
+
+                // Low-impact suggestion (< 25% improvement)
+                if (mi.Impact < 25)
+                {
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Low Impact Index",
+                        Message = $"Missing index suggestion for {mi.Table} has only {mi.Impact:F0}% estimated impact. Low-impact indexes add maintenance overhead (insert/update/delete cost) that may not justify the modest query improvement.",
+                        Severity = PlanWarningSeverity.Info
+                    });
+                }
+
+                // Wide INCLUDE columns (> 5)
+                if (includeCount > 5)
+                {
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Wide Index Suggestion",
+                        Message = $"Missing index suggestion for {mi.Table} has {includeCount} INCLUDE columns. This is a \"kitchen sink\" index — SQL Server suggests covering every column the query touches, but the resulting index would be very wide and expensive to maintain. Evaluate which columns are actually needed, or consider a narrower index with fewer includes.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+                // Wide key columns (> 4)
+                else if (keyCount > 4)
+                {
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Wide Index Suggestion",
+                        Message = $"Missing index suggestion for {mi.Table} has {keyCount} key columns ({mi.EqualityColumns.Count} equality + {mi.InequalityColumns.Count} inequality). Wide key columns increase index size and maintenance cost. Evaluate whether all key columns are needed for seek predicates.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+
+                // Multiple suggestions for same table
+                if (tableSuggestionCount.TryGetValue(tableKey, out var count))
+                {
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Duplicate Index Suggestions",
+                        Message = $"{count} missing index suggestions target {mi.Table}. Multiple suggestions for the same table often overlap — consolidate into fewer, broader indexes rather than creating all of them.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                    // Only warn once per table
+                    tableSuggestionCount.Remove(tableKey);
+                }
+            }
+        }
+    }
+
+    private static void AnalyzeNodeTree(PlanNode node, PlanStatement stmt)
+    {
+        AnalyzeNode(node, stmt);
+
+        foreach (var child in node.Children)
+            AnalyzeNodeTree(child, stmt);
+    }
+
+    private static void AnalyzeNode(PlanNode node, PlanStatement stmt)
+    {
+        // Rule 1: Filter operators — rows survived the tree just to be discarded
+        // Quantify the impact by summing child subtree cost (reads, CPU, time).
+        if (node.PhysicalOp == "Filter" && !string.IsNullOrEmpty(node.Predicate))
+        {
+            var impact = QuantifyFilterImpact(node);
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Filter Operator",
+                Message = $"Filter operator discarding rows late in the plan.{impact} Predicate: {Truncate(node.Predicate, 200)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 2: Eager Index Spools — optimizer building temporary indexes on the fly
+        if (node.LogicalOp == "Eager Spool" &&
+            node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase))
+        {
+            var message = "SQL Server is building a temporary index in TempDB at runtime because no suitable permanent index exists. This is expensive — it builds the index from scratch on every execution. Create a permanent index on the underlying table to eliminate this operator entirely.";
+            if (!string.IsNullOrEmpty(node.SuggestedIndex))
+                message += $"\n\nCreate this index:\n{node.SuggestedIndex}";
+
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Eager Index Spool",
+                Message = message,
+                Severity = PlanWarningSeverity.Critical
+            });
+        }
+
+        // Rule 4: UDF timing — any node spending time in UDFs (actual plans)
+        if (node.UdfCpuTimeMs > 0 || node.UdfElapsedTimeMs > 0)
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "UDF Execution",
+                Message = $"Scalar UDF executing on this operator ({node.UdfElapsedTimeMs:N0}ms elapsed, {node.UdfCpuTimeMs:N0}ms CPU). Scalar UDFs run once per row and prevent parallelism. Rewrite as an inline table-valued function, or dump the query results to a #temp table first and apply the UDF only to the final result set.",
+                Severity = node.UdfElapsedTimeMs >= 1000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 5: Large estimate vs actual row gaps (actual plans only)
+        // Only warn when the bad estimate actually causes observable harm:
+        // - The node itself spilled (Sort/Hash with bad memory grant)
+        // - A parent join may have chosen the wrong strategy
+        // - Root nodes with no parent to harm are skipped
+        // - Nodes whose only parents are Parallelism/Top/Sort (no spill) are skipped
+        if (node.HasActualStats && node.EstimateRows > 0)
+        {
+            if (node.ActualRows == 0)
+            {
+                // Zero rows is always worth noting — resources were allocated for nothing
+                if (node.EstimateRows >= 100)
+                {
+                    node.Warnings.Add(new PlanWarning
+                    {
+                        WarningType = "Row Estimate Mismatch",
+                        Message = $"Estimated {node.EstimateRows:N0} rows but actual 0 rows returned. SQL Server allocated resources for rows that never materialized.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+            else
+            {
+                // Compare per-execution actuals to estimates (SQL Server estimates are per-execution)
+                var executions = node.ActualExecutions > 0 ? node.ActualExecutions : 1;
+                var actualPerExec = (double)node.ActualRows / executions;
+                var ratio = actualPerExec / node.EstimateRows;
+                if (ratio >= 10.0 || ratio <= 0.1)
+                {
+                    var harm = AssessEstimateHarm(node, ratio);
+                    if (harm != null)
+                    {
+                        var direction = ratio >= 10.0 ? "underestimated" : "overestimated";
+                        var factor = ratio >= 10.0 ? ratio : 1.0 / ratio;
+                        var actualDisplay = executions > 1
+                            ? $"actual {actualPerExec:N0}/exec ({node.ActualRows:N0} total across {executions:N0} executions)"
+                            : $"actual {node.ActualRows:N0}";
+                        node.Warnings.Add(new PlanWarning
+                        {
+                            WarningType = "Row Estimate Mismatch",
+                            Message = $"Estimated {node.EstimateRows:N0} rows, {actualDisplay} ({factor:F0}x {direction}). {harm}",
+                            Severity = factor >= 100 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+                        });
+                    }
+                }
+            }
+        }
+
+        // Rule 6: Scalar UDF references (works on estimated plans too)
+        foreach (var udf in node.ScalarUdfs)
+        {
+            var type = udf.IsClrFunction ? "CLR" : "T-SQL";
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Scalar UDF",
+                Message = $"Scalar {type} UDF: {udf.FunctionName}. Scalar UDFs run once per row and prevent parallelism. Rewrite as an inline table-valued function, or dump results to a #temp table and apply the UDF only to the final result set.",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 7: Spill detection — calculate operator time and set severity
+        // based on what percentage of statement elapsed time the spill accounts for.
+        // Exchange spills on Parallelism operators get special handling since their
+        // timing is unreliable but the write count tells the story.
+        foreach (var w in node.Warnings.ToList())
+        {
+            if (w.SpillDetails == null)
+                continue;
+
+            var isExchangeSpill = w.SpillDetails.SpillType == "Exchange";
+
+            if (isExchangeSpill)
+            {
+                // Exchange spills: severity based on write count since timing is unreliable
+                var writes = w.SpillDetails.WritesToTempDb;
+                if (writes >= 1_000_000)
+                    w.Severity = PlanWarningSeverity.Critical;
+                else if (writes >= 10_000)
+                    w.Severity = PlanWarningSeverity.Warning;
+
+                // Surface Parallelism operator time when available (actual plans)
+                if (node.ActualElapsedMs > 0)
+                {
+                    var operatorMs = GetParallelismOperatorElapsedMs(node);
+                    var stmtMs = stmt.QueryTimeStats?.ElapsedTimeMs ?? 0;
+                    if (stmtMs > 0 && operatorMs > 0)
+                    {
+                        var pct = (double)operatorMs / stmtMs;
+                        w.Message += $" Operator time: {operatorMs:N0}ms ({pct:P0} of statement).";
+                    }
+                }
+            }
+            else if (node.ActualElapsedMs > 0)
+            {
+                // Sort/Hash spills: severity based on operator time percentage
+                var operatorMs = GetOperatorOwnElapsedMs(node);
+                var stmtMs = stmt.QueryTimeStats?.ElapsedTimeMs ?? 0;
+
+                if (stmtMs > 0)
+                {
+                    var pct = (double)operatorMs / stmtMs;
+                    w.Message += $" Operator time: {operatorMs:N0}ms ({pct:P0} of statement).";
+
+                    if (pct >= 0.5)
+                        w.Severity = PlanWarningSeverity.Critical;
+                    else if (pct >= 0.1)
+                        w.Severity = PlanWarningSeverity.Warning;
+                }
+            }
+        }
+
+        // Rule 8: Parallel thread skew (actual plans with per-thread stats)
+        // Only warn when there are enough rows to meaningfully distribute across threads
+        if (node.PerThreadStats.Count > 1)
+        {
+            var totalRows = node.PerThreadStats.Sum(t => t.ActualRows);
+            var minRowsForSkew = node.PerThreadStats.Count * 1000;
+            if (totalRows >= minRowsForSkew)
+            {
+                var maxThread = node.PerThreadStats.OrderByDescending(t => t.ActualRows).First();
+                var skewRatio = (double)maxThread.ActualRows / totalRows;
+                var skewThreshold = node.PerThreadStats.Count == 2 ? 0.75 : 0.50;
+                if (skewRatio >= skewThreshold)
+                {
+                    node.Warnings.Add(new PlanWarning
+                    {
+                        WarningType = "Parallel Skew",
+                        Message = $"Thread {maxThread.ThreadId} processed {skewRatio:P0} of rows ({maxThread.ActualRows:N0}/{totalRows:N0}). Work is heavily skewed to one thread, so parallelism isn't helping much.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+        }
+
+        // Rule 10: Key Lookup / RID Lookup with residual predicate
+        // Check RID Lookup first — it's more specific (PhysicalOp) and also has Lookup=true
+        if (node.PhysicalOp == "RID Lookup")
+        {
+            var message = "RID Lookup — this table is a heap (no clustered index). SQL Server found rows via a nonclustered index but had to follow row identifiers back to unordered heap pages. Heap lookups are more expensive than key lookups because pages are not sorted and may have forwarding pointers. Add a clustered index to the table.";
+            if (!string.IsNullOrEmpty(node.Predicate))
+                message += $" Predicate: {Truncate(node.Predicate, 200)}";
+
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "RID Lookup",
+                Message = message,
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+        else if (node.Lookup && !string.IsNullOrEmpty(node.Predicate))
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Key Lookup",
+                Message = $"Key Lookup — SQL Server found rows via a nonclustered index but had to go back to the clustered index for additional columns. Alter the nonclustered index to add the predicate column as a key column or as an INCLUDE column. Predicate: {Truncate(node.Predicate, 200)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 12: Non-SARGable predicate on scan
+        var nonSargableReason = DetectNonSargablePredicate(node);
+        if (nonSargableReason != null)
+        {
+            var nonSargableAdvice = nonSargableReason switch
+            {
+                "Implicit conversion (CONVERT_IMPLICIT)" =>
+                    "Implicit conversion (CONVERT_IMPLICIT) prevents an index seek. Match the parameter or variable data type to the column data type.",
+                "ISNULL/COALESCE wrapping column" =>
+                    "ISNULL/COALESCE wrapping a column prevents an index seek. Rewrite the predicate to avoid wrapping the column, e.g. use \"WHERE col = @val OR col IS NULL\" instead of \"WHERE ISNULL(col, '') = @val\".",
+                "Leading wildcard LIKE pattern" =>
+                    "Leading wildcard LIKE prevents an index seek — SQL Server must scan every row. If substring search performance is critical, consider a full-text index or a trigram-based approach.",
+                "CASE expression in predicate" =>
+                    "CASE expression in a predicate prevents an index seek. Rewrite using separate WHERE clauses combined with OR, or split into multiple queries.",
+                _ when nonSargableReason.StartsWith("Function call") =>
+                    $"{nonSargableReason} prevents an index seek. Remove the function from the column side — apply it to the parameter instead, or create a computed column with the expression and index that.",
+                _ =>
+                    $"{nonSargableReason} prevents an index seek, forcing a scan."
+            };
+
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Non-SARGable Predicate",
+                Message = $"{nonSargableAdvice} Predicate: {Truncate(node.Predicate!, 200)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 11: Scan with residual predicate (skip if non-SARGable already flagged)
+        // A PROBE() alone is just a bitmap filter — not a real residual predicate.
+        if (nonSargableReason == null && IsRowstoreScan(node) && !string.IsNullOrEmpty(node.Predicate) &&
+            !IsProbeOnly(node.Predicate))
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Scan With Predicate",
+                Message = $"Scan with residual predicate — SQL Server is reading every row and filtering after the fact. Create an index on the predicate columns. Predicate: {Truncate(node.Predicate, 200)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 13: Mismatched data types (GetRangeWithMismatchedTypes / GetRangeThroughConvert)
+        if (node.PhysicalOp == "Compute Scalar" && !string.IsNullOrEmpty(node.DefinedValues))
+        {
+            var hasMismatch = node.DefinedValues.Contains("GetRangeWithMismatchedTypes", StringComparison.OrdinalIgnoreCase);
+            var hasConvert = node.DefinedValues.Contains("GetRangeThroughConvert", StringComparison.OrdinalIgnoreCase);
+
+            if (hasMismatch || hasConvert)
+            {
+                var reason = hasMismatch
+                    ? "Mismatched data types between the column and the parameter/literal. SQL Server is converting every row to compare, preventing index seeks. Match your data types — don't pass nvarchar to a varchar column, or int to a bigint column."
+                    : "CONVERT/CAST wrapping a column in the predicate. SQL Server is converting every row to compare, preventing index seeks. Match your data types — convert the parameter/literal instead of the column.";
+
+                node.Warnings.Add(new PlanWarning
+                {
+                    WarningType = "Data Type Mismatch",
+                    Message = reason,
+                    Severity = PlanWarningSeverity.Warning
+                });
+            }
+        }
+
+        // Rule 14: Lazy Table Spool unfavorable rebind/rewind ratio
+        // Rebinds = cache misses (child re-executes), rewinds = cache hits (reuse cached result)
+        if (node.LogicalOp == "Lazy Spool")
+        {
+            var rebinds = node.HasActualStats ? (double)node.ActualRebinds : node.EstimateRebinds;
+            var rewinds = node.HasActualStats ? (double)node.ActualRewinds : node.EstimateRewinds;
+            var source = node.HasActualStats ? "actual" : "estimated";
+
+            if (rebinds > 100 && rewinds < rebinds * 5)
+            {
+                var severity = rewinds < rebinds
+                    ? PlanWarningSeverity.Critical
+                    : PlanWarningSeverity.Warning;
+
+                var ratio = rewinds > 0
+                    ? $"{rewinds / rebinds:F1}x rewinds (cache hits) per rebind (cache miss)"
+                    : "no rewinds (cache hits) at all";
+
+                node.Warnings.Add(new PlanWarning
+                {
+                    WarningType = "Lazy Spool Ineffective",
+                    Message = $"Lazy spool has low cache hit ratio ({source}): {rebinds:N0} rebinds (cache misses), {rewinds:N0} rewinds (cache hits) — {ratio}. The spool is caching results but rarely reusing them, adding overhead for no benefit.",
+                    Severity = severity
+                });
+            }
+        }
+
+        // Rule 15: Join OR clause
+        // Pattern: Nested Loops → Merge Interval → TopN Sort → [Compute Scalar] → Concatenation → [Compute Scalar] → 2+ Constant Scans
+        if (node.PhysicalOp == "Concatenation")
+        {
+            var constantScanBranches = node.Children
+                .Count(c => c.PhysicalOp == "Constant Scan" ||
+                            (c.PhysicalOp == "Compute Scalar" &&
+                             c.Children.Any(gc => gc.PhysicalOp == "Constant Scan")));
+
+            if (constantScanBranches >= 2 && IsOrExpansionChain(node))
+            {
+                node.Warnings.Add(new PlanWarning
+                {
+                    WarningType = "Join OR Clause",
+                    Message = $"OR in a join predicate. SQL Server rewrote the OR as {constantScanBranches} separate lookups, each evaluated independently — this multiplies the work on the inner side. Rewrite as separate queries joined with UNION ALL. For example, change \"FROM a JOIN b ON a.x = b.x OR a.y = b.y\" to \"FROM a JOIN b ON a.x = b.x UNION ALL FROM a JOIN b ON a.y = b.y\".",
+                    Severity = PlanWarningSeverity.Warning
+                });
+            }
+        }
+
+        // Rule 16: Nested Loops high inner-side execution count
+        // Deep analysis: combine execution count + outer estimate mismatch + inner cost
+        if (node.PhysicalOp == "Nested Loops" &&
+            node.LogicalOp.Contains("Join", StringComparison.OrdinalIgnoreCase) &&
+            !node.IsAdaptive &&
+            node.Children.Count >= 2)
+        {
+            var outerChild = node.Children[0];
+            var innerChild = node.Children[1];
+
+            if (innerChild.HasActualStats && innerChild.ActualExecutions > 100000)
+            {
+                var dop = stmt.DegreeOfParallelism > 0 ? stmt.DegreeOfParallelism : 1;
+                var details = new List<string>();
+
+                // Core fact
+                details.Add($"Nested Loops inner side executed {innerChild.ActualExecutions:N0} times (DOP {dop}).");
+
+                // Outer side estimate mismatch — explains WHY the optimizer chose NL
+                if (outerChild.HasActualStats && outerChild.EstimateRows > 0)
+                {
+                    var outerExecs = outerChild.ActualExecutions > 0 ? outerChild.ActualExecutions : 1;
+                    var outerActualPerExec = (double)outerChild.ActualRows / outerExecs;
+                    var outerRatio = outerActualPerExec / outerChild.EstimateRows;
+                    if (outerRatio >= 10.0)
+                    {
+                        details.Add($"Outer side: estimated {outerChild.EstimateRows:N0} rows, actual {outerActualPerExec:N0} ({outerRatio:F0}x underestimate). The optimizer chose Nested Loops expecting far fewer iterations.");
+                    }
+                }
+
+                // Inner side cost — reads and time spent doing the repeated work
+                long innerReads = SumSubtreeReads(innerChild);
+                if (innerReads > 0)
+                    details.Add($"Inner side total: {innerReads:N0} logical reads.");
+
+                if (innerChild.ActualElapsedMs > 0)
+                {
+                    var stmtMs = stmt.QueryTimeStats?.ElapsedTimeMs ?? 0;
+                    if (stmtMs > 0)
+                    {
+                        var pct = (double)innerChild.ActualElapsedMs / stmtMs * 100;
+                        details.Add($"Inner side time: {innerChild.ActualElapsedMs:N0}ms ({pct:N0}% of statement).");
+                    }
+                    else
+                    {
+                        details.Add($"Inner side time: {innerChild.ActualElapsedMs:N0}ms.");
+                    }
+                }
+
+                // Cause/recommendation
+                var hasParams = stmt.Parameters.Count > 0;
+                if (hasParams)
+                    details.Add("This may be caused by parameter sniffing — the optimizer chose Nested Loops based on a sniffed value that produced far fewer outer rows.");
+                else
+                    details.Add("Consider whether a hash or merge join would be more appropriate for this row count.");
+
+                node.Warnings.Add(new PlanWarning
+                {
+                    WarningType = "Nested Loops High Executions",
+                    Message = string.Join(" ", details),
+                    Severity = innerChild.ActualExecutions > 1000000
+                        ? PlanWarningSeverity.Critical
+                        : PlanWarningSeverity.Warning
+                });
+            }
+            // Estimated plans: the optimizer knew the row count and chose Nested Loops
+            // deliberately — don't second-guess it without actual execution data.
+        }
+
+        // Rule 17: Many-to-many Merge Join
+        // In actual plans, the Merge Join operator reports logical reads when the worktable is used.
+        // When ActualLogicalReads is 0, the worktable wasn't hit and the warning is noise.
+        if (node.ManyToMany && node.PhysicalOp.Contains("Merge", StringComparison.OrdinalIgnoreCase) &&
+            (!node.HasActualStats || node.ActualLogicalReads > 0))
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Many-to-Many Merge Join",
+                Message = node.HasActualStats
+                    ? $"Many-to-many Merge Join — SQL Server created a worktable in TempDB ({node.ActualLogicalReads:N0} logical reads) because both sides have duplicate values in the join columns."
+                    : "Many-to-many Merge Join — SQL Server will create a worktable in TempDB because both sides have duplicate values in the join columns.",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 22: Table variables (Object name starts with @)
+        if (!string.IsNullOrEmpty(node.ObjectName) &&
+            node.ObjectName.StartsWith("@"))
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Table Variable",
+                Message = "Table variable detected. Table variables lack column-level statistics, which causes bad row estimates, join choices, and memory grant decisions. Replace with a #temp table.",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 23: Table-valued functions
+        if (node.LogicalOp == "Table-valued function")
+        {
+            var funcName = node.ObjectName ?? node.PhysicalOp;
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Table-Valued Function",
+                Message = $"Table-valued function: {funcName}. Multi-statement TVFs have no statistics — SQL Server guesses 1 row (pre-2017) or 100 rows (2017+) regardless of actual size. Rewrite as an inline table-valued function if possible, or dump the function results into a #temp table and join to that instead.",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 24: Top above a scan on the inner side of Nested Loops
+        // This pattern means the scan executes once per outer row, and the Top
+        // limits each iteration — but with no supporting index the scan is a
+        // linear search repeated potentially millions of times.
+        if (node.PhysicalOp == "Nested Loops" && node.Children.Count >= 2)
+        {
+            var inner = node.Children[1];
+
+            // Walk through pass-through operators to find Top
+            while (inner.PhysicalOp == "Compute Scalar" && inner.Children.Count > 0)
+                inner = inner.Children[0];
+
+            if (inner.PhysicalOp == "Top" && inner.Children.Count > 0)
+            {
+                // Walk through pass-through operators below the Top to find the scan
+                var scanCandidate = inner.Children[0];
+                while (scanCandidate.PhysicalOp == "Compute Scalar" && scanCandidate.Children.Count > 0)
+                    scanCandidate = scanCandidate.Children[0];
+
+                if (IsScanOperator(scanCandidate))
+                {
+                    var predInfo = !string.IsNullOrEmpty(scanCandidate.Predicate)
+                        ? " The scan has a residual predicate, so it may read many rows before the Top is satisfied."
+                        : "";
+                    inner.Warnings.Add(new PlanWarning
+                    {
+                        WarningType = "Top Above Scan",
+                        Message = $"Top operator reads from {scanCandidate.PhysicalOp} (Node {scanCandidate.NodeId}) on the inner side of Nested Loops (Node {node.NodeId}).{predInfo} Create an index on the predicate columns to convert the scan into a seek.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+        }
+
+        // Rule 26: Row Goal (informational) — optimizer reduced estimate due to TOP/EXISTS/IN
+        if (node.EstimateRowsWithoutRowGoal > 0 && node.EstimateRows > 0 &&
+            node.EstimateRowsWithoutRowGoal > node.EstimateRows)
+        {
+            var reduction = node.EstimateRowsWithoutRowGoal / node.EstimateRows;
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Row Goal",
+                Message = $"Row goal active: estimate reduced from {node.EstimateRowsWithoutRowGoal:N0} to {node.EstimateRows:N0} ({reduction:N0}x reduction) due to TOP, EXISTS, IN, or FAST hint. The optimizer chose this plan shape expecting to stop reading early. If the query reads all rows anyway, the plan choice may be suboptimal.",
+                Severity = PlanWarningSeverity.Info
+            });
+        }
+
+        // Rule 28: Row Count Spool — NOT IN with nullable column
+        // Pattern: Row Count Spool with high rewinds, child scan has IS NULL predicate,
+        // and statement text contains NOT IN
+        if (node.PhysicalOp == "Row Count Spool")
+        {
+            var rewinds = node.HasActualStats ? (double)node.ActualRewinds : node.EstimateRewinds;
+            if (rewinds > 10000 && HasNotInPattern(node, stmt))
+            {
+                node.Warnings.Add(new PlanWarning
+                {
+                    WarningType = "NOT IN with Nullable Column",
+                    Message = $"Row Count Spool with {rewinds:N0} rewinds. This pattern occurs when NOT IN is used with a nullable column — SQL Server cannot use an efficient Anti Semi Join because it must check for NULL values on every outer row. Rewrite as NOT EXISTS, or add WHERE column IS NOT NULL to the subquery.",
+                    Severity = rewinds > 1_000_000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+                });
+            }
+        }
+
+        // Rule 29: Enhance implicit conversion warnings — Seek Plan is more severe
+        foreach (var w in node.Warnings.ToList())
+        {
+            if (w.WarningType == "Implicit Conversion" && w.Message.StartsWith("Seek Plan", StringComparison.Ordinal))
+            {
+                w.Severity = PlanWarningSeverity.Critical;
+                w.Message = $"Implicit conversion prevented an index seek, forcing a scan instead. Fix the data type mismatch: ensure the parameter or variable type matches the column type exactly. {w.Message}";
+            }
+        }
+    }
+
+    /// <summary>
+    /// Detects the NOT IN with nullable column pattern: statement has NOT IN,
+    /// and a nearby Nested Loops Anti Semi Join has an IS NULL residual predicate.
+    /// Checks ancestors and their children (siblings of ancestors) since the IS NULL
+    /// predicate may be on a sibling Anti Semi Join rather than a direct parent.
+    /// </summary>
+    private static bool HasNotInPattern(PlanNode spoolNode, PlanStatement stmt)
+    {
+        // Check statement text for NOT IN
+        if (string.IsNullOrEmpty(stmt.StatementText) ||
+            !Regex.IsMatch(stmt.StatementText, @"\bNOT\s+IN\b", RegexOptions.IgnoreCase))
+            return false;
+
+        // Walk up the tree checking ancestors and their children
+        var parent = spoolNode.Parent;
+        while (parent != null)
+        {
+            if (IsAntiSemiJoinWithIsNull(parent))
+                return true;
+
+            // Check siblings: the IS NULL predicate may be on a sibling Anti Semi Join
+            // (e.g. outer NL Anti Semi Join has two children: inner NL Anti Semi Join + Row Count Spool)
+            foreach (var sibling in parent.Children)
+            {
+                if (sibling != spoolNode && IsAntiSemiJoinWithIsNull(sibling))
+                    return true;
+            }
+
+            parent = parent.Parent;
+        }
+
+        return false;
+    }
+
+    private static bool IsAntiSemiJoinWithIsNull(PlanNode node) =>
+        node.PhysicalOp == "Nested Loops" &&
+        node.LogicalOp.Contains("Anti Semi", StringComparison.OrdinalIgnoreCase) &&
+        !string.IsNullOrEmpty(node.Predicate) &&
+        node.Predicate.Contains("IS NULL", StringComparison.OrdinalIgnoreCase);
+
+    /// <summary>
+    /// Returns true for rowstore scan operators (Index Scan, Clustered Index Scan,
+    /// Table Scan). Excludes columnstore scans, spools, and constant scans.
+    /// </summary>
+    private static bool IsRowstoreScan(PlanNode node)
+    {
+        return node.PhysicalOp.Contains("Scan", StringComparison.OrdinalIgnoreCase) &&
+               !node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase) &&
+               !node.PhysicalOp.Contains("Constant", StringComparison.OrdinalIgnoreCase) &&
+               !node.PhysicalOp.Contains("Columnstore", StringComparison.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// Returns true when the predicate contains ONLY PROBE() bitmap filter(s)
+    /// with no real residual predicate. PROBE alone is a bitmap filter pushed
+    /// down from a hash join — not interesting by itself. If a real predicate
+    /// exists alongside PROBE (e.g. "[col]=(1) AND PROBE(...)"), returns false.
+    /// </summary>
+    private static bool IsProbeOnly(string predicate)
+    {
+        // Strip all PROBE(...) expressions — PROBE args can contain nested parens
+        var stripped = Regex.Replace(predicate, @"PROBE\s*\([^()]*(?:\([^()]*\)[^()]*)*\)", "",
+            RegexOptions.IgnoreCase).Trim();
+
+        // Remove leftover AND/OR connectors and whitespace
+        stripped = Regex.Replace(stripped, @"\b(AND|OR)\b", "", RegexOptions.IgnoreCase).Trim();
+
+        // If nothing meaningful remains, it was PROBE-only
+        return stripped.Length == 0;
+    }
+
+    /// <summary>
+    /// Returns true for any scan operator including columnstore.
+    /// Excludes spools and constant scans.
+    /// </summary>
+    private static bool IsScanOperator(PlanNode node)
+    {
+        return node.PhysicalOp.Contains("Scan", StringComparison.OrdinalIgnoreCase) &&
+               !node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase) &&
+               !node.PhysicalOp.Contains("Constant", StringComparison.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// Detects non-SARGable patterns in scan predicates.
+    /// Returns a description of the issue, or null if the predicate is fine.
+    /// </summary>
+    private static string? DetectNonSargablePredicate(PlanNode node)
+    {
+        if (string.IsNullOrEmpty(node.Predicate))
+            return null;
+
+        // Only check rowstore scan operators — columnstore is designed to be scanned
+        if (!IsRowstoreScan(node))
+            return null;
+
+        var predicate = node.Predicate;
+
+        // CASE expression in predicate — check first because CASE bodies
+        // often contain CONVERT_IMPLICIT that isn't the root cause
+        if (CaseInPredicateRegex.IsMatch(predicate))
+            return "CASE expression in predicate";
+
+        // CONVERT_IMPLICIT — most common non-SARGable pattern
+        if (predicate.Contains("CONVERT_IMPLICIT", StringComparison.OrdinalIgnoreCase))
+            return "Implicit conversion (CONVERT_IMPLICIT)";
+
+        // ISNULL / COALESCE wrapping column
+        if (Regex.IsMatch(predicate, @"\b(isnull|coalesce)\s*\(", RegexOptions.IgnoreCase))
+            return "ISNULL/COALESCE wrapping column";
+
+        // Common function calls on columns
+        var funcMatch = FunctionInPredicateRegex.Match(predicate);
+        if (funcMatch.Success)
+        {
+            var funcName = funcMatch.Groups[1].Value.ToUpperInvariant();
+            if (funcName != "CONVERT_IMPLICIT")
+                return $"Function call ({funcName}) on column";
+        }
+
+        // Leading wildcard LIKE
+        if (LeadingWildcardLikeRegex.IsMatch(predicate))
+            return "Leading wildcard LIKE pattern";
+
+        return null;
+    }
+
+    /// <summary>
+    /// Detects CTEs that are referenced more than once in the statement text.
+    /// Each reference re-executes the CTE since SQL Server does not materialize them.
+    /// </summary>
+    private static void DetectMultiReferenceCte(PlanStatement stmt)
+    {
+        var text = stmt.StatementText;
+        var cteMatches = CteDefinitionRegex.Matches(text);
+        if (cteMatches.Count == 0)
+            return;
+
+        foreach (Match match in cteMatches)
+        {
+            var cteName = match.Groups[1].Value;
+            if (string.IsNullOrEmpty(cteName))
+                continue;
+
+            // Count references as FROM/JOIN targets after the CTE definition
+            var refPattern = new Regex(
+                $@"\b(FROM|JOIN)\s+{Regex.Escape(cteName)}\b",
+                RegexOptions.IgnoreCase);
+            var refCount = refPattern.Matches(text).Count;
+
+            if (refCount > 1)
+            {
+                stmt.PlanWarnings.Add(new PlanWarning
+                {
+                    WarningType = "CTE Multiple References",
+                    Message = $"CTE \"{cteName}\" is referenced {refCount} times. SQL Server re-executes the entire CTE each time — it does not materialize the results. Materialize into a #temp table instead.",
+                    Severity = PlanWarningSeverity.Warning
+                });
+            }
+        }
+    }
+
+    /// <summary>
+    /// Verifies the OR expansion chain walking up from a Concatenation node:
+    /// Nested Loops → Merge Interval → TopN Sort → [Compute Scalar] → Concatenation
+    /// </summary>
+    private static bool IsOrExpansionChain(PlanNode concatenationNode)
+    {
+        // Walk up, skipping Compute Scalar
+        var parent = concatenationNode.Parent;
+        while (parent != null && parent.PhysicalOp == "Compute Scalar")
+            parent = parent.Parent;
+
+        // Expect TopN Sort
+        if (parent == null || parent.LogicalOp != "TopN Sort")
+            return false;
+
+        // Walk up to Merge Interval
+        parent = parent.Parent;
+        if (parent == null || parent.PhysicalOp != "Merge Interval")
+            return false;
+
+        // Walk up to Nested Loops
+        parent = parent.Parent;
+        if (parent == null || parent.PhysicalOp != "Nested Loops")
+            return false;
+
+        return true;
+    }
+
+    /// <summary>
+    /// Finds Sort and Hash Match operators in the tree that consume memory.
+    /// </summary>
+    private static void FindMemoryConsumers(PlanNode node, List<string> consumers)
+    {
+        if (node.PhysicalOp.Contains("Sort", StringComparison.OrdinalIgnoreCase) &&
+            !node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase))
+        {
+            var rows = node.HasActualStats
+                ? $"{node.ActualRows:N0} actual rows"
+                : $"{node.EstimateRows:N0} estimated rows";
+            consumers.Add($"Sort (Node {node.NodeId}, {rows})");
+        }
+        else if (node.PhysicalOp.Contains("Hash", StringComparison.OrdinalIgnoreCase))
+        {
+            var rows = node.HasActualStats
+                ? $"{node.ActualRows:N0} actual rows"
+                : $"{node.EstimateRows:N0} estimated rows";
+            consumers.Add($"Hash Match (Node {node.NodeId}, {rows})");
+        }
+
+        foreach (var child in node.Children)
+            FindMemoryConsumers(child, consumers);
+    }
+
+    /// <summary>
+    /// Calculates an operator's own elapsed time by subtracting child time.
+    /// In batch mode, operator times are self-contained (exclusive).
+    /// In row mode, times are cumulative (include all children below).
+    /// For parallel plans, we calculate self-time per-thread then take the max,
+    /// avoiding cross-thread subtraction errors.
+    /// Exchange operators accumulate downstream wait time (e.g. from spilling
+    /// children) so their self-time is unreliable — see sql.kiwi/2021/03.
+    /// </summary>
+    private static long GetOperatorOwnElapsedMs(PlanNode node)
+    {
+        if (node.ActualExecutionMode == "Batch")
+            return node.ActualElapsedMs;
+
+        // Parallel plan with per-thread data: calculate self-time per thread
+        if (node.PerThreadStats.Count > 1)
+            return GetPerThreadOwnElapsed(node);
+
+        // Serial row mode: subtract all direct children's elapsed time
+        return GetSerialOwnElapsed(node);
+    }
+
+    /// <summary>
+    /// Per-thread self-time calculation for parallel row mode operators.
+    /// For each thread: self = parent_elapsed[t] - sum(children_elapsed[t]).
+    /// Returns max across threads.
+    /// </summary>
+    private static long GetPerThreadOwnElapsed(PlanNode node)
+    {
+        // Build lookup: threadId -> parent elapsed for this node
+        var parentByThread = new Dictionary<int, long>();
+        foreach (var ts in node.PerThreadStats)
+            parentByThread[ts.ThreadId] = ts.ActualElapsedMs;
+
+        // Build lookup: threadId -> sum of all direct children's elapsed
+        var childSumByThread = new Dictionary<int, long>();
+        foreach (var child in node.Children)
+        {
+            var childNode = child;
+
+            // Exchange operators have unreliable times — look through to their child
+            if (child.PhysicalOp == "Parallelism" && child.Children.Count > 0)
+                childNode = child.Children.OrderByDescending(c => c.ActualElapsedMs).First();
+
+            foreach (var ts in childNode.PerThreadStats)
+            {
+                childSumByThread.TryGetValue(ts.ThreadId, out var existing);
+                childSumByThread[ts.ThreadId] = existing + ts.ActualElapsedMs;
+            }
+        }
+
+        // Self-time per thread = parent - children, take max across threads
+        var maxSelf = 0L;
+        foreach (var (threadId, parentMs) in parentByThread)
+        {
+            childSumByThread.TryGetValue(threadId, out var childMs);
+            var self = Math.Max(0, parentMs - childMs);
+            if (self > maxSelf) maxSelf = self;
+        }
+
+        return maxSelf;
+    }
+
+    /// <summary>
+    /// Serial row mode self-time: subtract all direct children's elapsed.
+    /// Exchange children are skipped through to their real child.
+    /// </summary>
+    private static long GetSerialOwnElapsed(PlanNode node)
+    {
+        var totalChildElapsed = 0L;
+        foreach (var child in node.Children)
+        {
+            var childElapsed = child.ActualElapsedMs;
+
+            // Exchange operators have unreliable times — skip to their child
+            if (child.PhysicalOp == "Parallelism" && child.Children.Count > 0)
+                childElapsed = child.Children.Max(c => c.ActualElapsedMs);
+
+            totalChildElapsed += childElapsed;
+        }
+
+        return Math.Max(0, node.ActualElapsedMs - totalChildElapsed);
+    }
+
+    /// <summary>
+    /// Calculates a Parallelism (exchange) operator's own elapsed time.
+    /// Exchange times are unreliable — they accumulate wait time caused by
+    /// downstream operators (e.g. spilling sorts). This returns a best-effort
+    /// value but callers should treat it with caution.
+    /// </summary>
+    private static long GetParallelismOperatorElapsedMs(PlanNode node)
+    {
+        if (node.Children.Count == 0)
+            return node.ActualElapsedMs;
+
+        if (node.PerThreadStats.Count > 1)
+            return GetPerThreadOwnElapsed(node);
+
+        var maxChildElapsed = node.Children.Max(c => c.ActualElapsedMs);
+        return Math.Max(0, node.ActualElapsedMs - maxChildElapsed);
+    }
+
+    /// <summary>
+    /// Quantifies the cost of work below a Filter operator by summing child subtree metrics.
+    /// </summary>
+    private static string QuantifyFilterImpact(PlanNode filterNode)
+    {
+        if (filterNode.Children.Count == 0)
+            return "";
+
+        var parts = new List<string>();
+
+        // Rows input vs output — how many rows did the filter discard?
+        var inputRows = filterNode.Children.Sum(c => c.ActualRows);
+        if (filterNode.HasActualStats && inputRows > 0 && filterNode.ActualRows < inputRows)
+        {
+            var discarded = inputRows - filterNode.ActualRows;
+            var pct = (double)discarded / inputRows * 100;
+            parts.Add($"{discarded:N0} of {inputRows:N0} rows discarded ({pct:N0}%)");
+        }
+
+        // Logical reads across the entire child subtree
+        long totalReads = 0;
+        foreach (var child in filterNode.Children)
+            totalReads += SumSubtreeReads(child);
+        if (totalReads > 0)
+            parts.Add($"{totalReads:N0} logical reads below");
+
+        // Elapsed time: use the direct child's time (cumulative in row mode, includes its children)
+        var childElapsed = filterNode.Children.Max(c => c.ActualElapsedMs);
+        if (childElapsed > 0)
+            parts.Add($"{childElapsed:N0}ms elapsed below");
+
+        if (parts.Count == 0)
+            return "";
+
+        return $" Subtree cost to produce filtered rows: {string.Join(", ", parts)}.";
+    }
+
+    private static long SumSubtreeReads(PlanNode node)
+    {
+        long reads = node.ActualLogicalReads;
+        foreach (var child in node.Children)
+            reads += SumSubtreeReads(child);
+        return reads;
+    }
+
+    /// <summary>
+    /// Determines whether a row estimate mismatch actually caused observable harm.
+    /// Returns a description of the harm, or null if the bad estimate is benign.
+    /// </summary>
+    private static string? AssessEstimateHarm(PlanNode node, double ratio)
+    {
+        // Root node: no parent to harm.
+        // The synthetic statement root (SELECT/INSERT/etc.) has NodeId == -1.
+        if (node.Parent == null || node.Parent.NodeId == -1)
+            return null;
+
+        // The node itself has a spill — bad estimate caused bad memory grant
+        if (HasSpillWarning(node))
+        {
+            return ratio >= 10.0
+                ? "The underestimate likely caused an insufficient memory grant, leading to a spill to TempDB."
+                : "The overestimate may have caused an excessive memory grant, wasting workspace memory.";
+        }
+
+        // Sort/Hash that did NOT spill — estimate was wrong but no observable harm
+        if ((node.PhysicalOp.Contains("Sort", StringComparison.OrdinalIgnoreCase) ||
+             node.PhysicalOp.Contains("Hash", StringComparison.OrdinalIgnoreCase)) &&
+            !HasSpillWarning(node))
+        {
+            return null;
+        }
+
+        // The node is a join — bad estimate means wrong join type or excessive work
+        // Adaptive joins (2017+) switch strategy at runtime, so the estimate didn't lock in a bad choice.
+        if (node.LogicalOp.Contains("Join", StringComparison.OrdinalIgnoreCase) && !node.IsAdaptive)
+        {
+            return ratio >= 10.0
+                ? "The underestimate may have caused the optimizer to choose a suboptimal join strategy."
+                : "The overestimate may have caused the optimizer to choose a suboptimal join strategy.";
+        }
+
+        // Walk up to check if a parent was harmed by this bad estimate
+        var ancestor = node.Parent;
+        while (ancestor != null)
+        {
+            // Transparent operators — skip through
+            if (ancestor.PhysicalOp == "Parallelism" ||
+                ancestor.PhysicalOp == "Compute Scalar" ||
+                ancestor.PhysicalOp == "Segment" ||
+                ancestor.PhysicalOp == "Sequence Project" ||
+                ancestor.PhysicalOp == "Top" ||
+                ancestor.PhysicalOp == "Filter")
+            {
+                ancestor = ancestor.Parent;
+                continue;
+            }
+
+            // Parent join — bad row count from below caused wrong join choice
+            // Adaptive joins handle this at runtime, so skip them.
+            if (ancestor.LogicalOp.Contains("Join", StringComparison.OrdinalIgnoreCase))
+            {
+                if (ancestor.IsAdaptive)
+                    return null; // Adaptive join self-corrects — no harm
+
+                return ratio >= 10.0
+                    ? $"The underestimate may have caused the optimizer to choose {ancestor.PhysicalOp} when a different join type would be more efficient."
+                    : $"The overestimate may have caused the optimizer to choose {ancestor.PhysicalOp} when a different join type would be more efficient.";
+            }
+
+            // Parent Sort/Hash that spilled — downstream bad estimate caused the spill
+            if (HasSpillWarning(ancestor))
+            {
+                return ratio >= 10.0
+                    ? $"The underestimate contributed to {ancestor.PhysicalOp} (Node {ancestor.NodeId}) spilling to TempDB."
+                    : $"The overestimate contributed to {ancestor.PhysicalOp} (Node {ancestor.NodeId}) receiving an excessive memory grant.";
+            }
+
+            // Parent Sort/Hash with no spill — benign
+            if (ancestor.PhysicalOp.Contains("Sort", StringComparison.OrdinalIgnoreCase) ||
+                ancestor.PhysicalOp.Contains("Hash", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            // Any other operator — stop walking
+            break;
+        }
+
+        // Default: the estimate is off but we can't identify specific harm
+        return null;
+    }
+
+    /// <summary>
+    /// Checks if a node has any spill-related warnings (Sort/Hash/Exchange spills).
+    /// </summary>
+    private static bool HasSpillWarning(PlanNode node)
+    {
+        return node.Warnings.Any(w => w.SpillDetails != null);
+    }
+
+    private static string Truncate(string value, int maxLength)
+    {
+        return value.Length <= maxLength ? value : value[..maxLength] + "...";
+    }
+}
diff --git a/Lite/Services/RemoteCollectorService.FileIo.cs b/Lite/Services/RemoteCollectorService.FileIo.cs
index f743862..0039422 100644
--- a/Lite/Services/RemoteCollectorService.FileIo.cs
+++ b/Lite/Services/RemoteCollectorService.FileIo.cs
@@ -59,7 +59,7 @@ LEFT JOIN sys.database_files AS df
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
 SELECT
-    database_name = DB_NAME(vfs.database_id),
+    database_name = ISNULL(d.name, N'Unknown'),
     file_name = mf.name,
     file_type = mf.type_desc,
     physical_name = mf.physical_name,
@@ -78,6 +78,8 @@ FROM sys.dm_io_virtual_file_stats(NULL, NULL) AS vfs
 LEFT JOIN sys.master_files AS mf
   ON  mf.database_id = vfs.database_id
   AND mf.file_id = vfs.file_id
+LEFT JOIN sys.databases AS d
+  ON  d.database_id = vfs.database_id
 WHERE (vfs.database_id > 4 OR vfs.database_id = 2)
 AND   vfs.database_id < 32761
 AND   vfs.database_id <> ISNULL(DB_ID(N'PerformanceMonitor'), 0)
diff --git a/Lite/Services/RemoteCollectorService.ProcedureStats.cs b/Lite/Services/RemoteCollectorService.ProcedureStats.cs
index a450323..349e251 100644
--- a/Lite/Services/RemoteCollectorService.ProcedureStats.cs
+++ b/Lite/Services/RemoteCollectorService.ProcedureStats.cs
@@ -76,9 +76,10 @@ CROSS APPLY
     FROM sys.dm_exec_plan_attributes(s.plan_handle) AS pa
     WHERE pa.attribute = N''dbid''
 ) AS pa
-LEFT JOIN sys.databases AS d
+INNER JOIN sys.databases AS d
   ON pa.dbid = d.database_id
-WHERE pa.dbid NOT IN (1, 3, 4, 32761, 32767, ISNULL(DB_ID(N''PerformanceMonitor''), 0))
+WHERE d.state = 0
+AND   pa.dbid NOT IN (1, 3, 4, 32761, 32767, ISNULL(DB_ID(N''PerformanceMonitor''), 0))
 AND   s.last_execution_time >= DATEADD(MINUTE, -10, GETDATE())
 
 UNION ALL
@@ -130,9 +131,10 @@ CROSS APPLY
     FROM sys.dm_exec_plan_attributes(s.plan_handle) AS pa
     WHERE pa.attribute = N''dbid''
 ) AS pa
-LEFT JOIN sys.databases AS d
+INNER JOIN sys.databases AS d
   ON pa.dbid = d.database_id
-WHERE pa.dbid NOT IN (1, 3, 4, 32761, 32767, ISNULL(DB_ID(N''PerformanceMonitor''), 0))
+WHERE d.state = 0
+AND   pa.dbid NOT IN (1, 3, 4, 32761, 32767, ISNULL(DB_ID(N''PerformanceMonitor''), 0))
 AND   s.last_execution_time >= DATEADD(MINUTE, -10, GETDATE())
 
 UNION ALL
@@ -171,9 +173,10 @@ CROSS APPLY
     FROM sys.dm_exec_plan_attributes(s.plan_handle) AS pa
     WHERE pa.attribute = N''dbid''
 ) AS pa
-LEFT JOIN sys.databases AS d
+INNER JOIN sys.databases AS d
   ON pa.dbid = d.database_id
-WHERE pa.dbid NOT IN (1, 3, 4, 32761, 32767, ISNULL(DB_ID(N''PerformanceMonitor''), 0))
+WHERE d.state = 0
+AND   pa.dbid NOT IN (1, 3, 4, 32761, 32767, ISNULL(DB_ID(N''PerformanceMonitor''), 0))
 AND   s.last_execution_time >= DATEADD(MINUTE, -10, GETDATE())
 ) AS combined
 ORDER BY total_elapsed_time DESC
diff --git a/Lite/Services/RemoteCollectorService.QuerySnapshots.cs b/Lite/Services/RemoteCollectorService.QuerySnapshots.cs
index 9fc2b2a..b85500c 100644
--- a/Lite/Services/RemoteCollectorService.QuerySnapshots.cs
+++ b/Lite/Services/RemoteCollectorService.QuerySnapshots.cs
@@ -25,7 +25,7 @@ public partial class RemoteCollectorService
 
 SELECT /* PerformanceMonitorLite */
     der.session_id,
-    database_name = DB_NAME(der.database_id),
+    database_name = d.name,
     elapsed_time_formatted =
         CASE
             WHEN der.total_elapsed_time < 0
@@ -72,6 +72,8 @@ JOIN sys.dm_exec_sessions AS des
     ON des.session_id = der.session_id
 OUTER APPLY sys.dm_exec_sql_text(COALESCE(der.sql_handle, der.plan_handle)) AS dest
 OUTER APPLY sys.dm_exec_text_query_plan(der.plan_handle, der.statement_start_offset, der.statement_end_offset) AS deqp
+LEFT JOIN sys.databases AS d
+  ON d.database_id = der.database_id
 {1}
 WHERE der.session_id <> @@SPID
 AND   der.session_id >= 50
diff --git a/Lite/Services/RemoteCollectorService.QueryStore.cs b/Lite/Services/RemoteCollectorService.QueryStore.cs
index 737dd7f..d466c47 100644
--- a/Lite/Services/RemoteCollectorService.QueryStore.cs
+++ b/Lite/Services/RemoteCollectorService.QueryStore.cs
@@ -44,10 +44,18 @@ DECLARE db_check CURSOR LOCAL FAST_FORWARD FOR
     SELECT /* PerformanceMonitorLite */
         d.name
     FROM sys.databases AS d
+    LEFT JOIN sys.dm_hadr_database_replica_states AS drs
+        ON d.database_id = drs.database_id
+        AND drs.is_local = 1
     WHERE d.database_id > 4
     AND   d.database_id < 32761
     AND   d.state_desc = N'ONLINE'
     AND   d.name <> N'PerformanceMonitor'
+    AND
+    (
+        drs.database_id IS NULL          /*not in any AG*/
+        OR drs.is_primary_replica = 1    /*primary replica*/
+    )
     OPTION(RECOMPILE);
 
 OPEN db_check;
diff --git a/Lite/Services/RemoteCollectorService.ServerConfig.cs b/Lite/Services/RemoteCollectorService.ServerConfig.cs
index 9adad48..4e32c6b 100644
--- a/Lite/Services/RemoteCollectorService.ServerConfig.cs
+++ b/Lite/Services/RemoteCollectorService.ServerConfig.cs
@@ -332,10 +332,18 @@ private async Task<int> CollectDatabaseScopedConfigAsync(ServerConnection server
 SELECT
     d.name
 FROM sys.databases AS d
+LEFT JOIN sys.dm_hadr_database_replica_states AS drs
+    ON d.database_id = drs.database_id
+    AND drs.is_local = 1
 WHERE (d.database_id > 4 OR d.database_id = 2)
 AND   d.database_id < 32761
 AND   d.name <> N'PerformanceMonitor'
 AND   d.state_desc = N'ONLINE'
+AND
+(
+    drs.database_id IS NULL          /*not in any AG*/
+    OR drs.is_primary_replica = 1    /*primary replica*/
+)
 ORDER BY d.name
 OPTION(RECOMPILE);";
 
diff --git a/Lite/Services/RemoteCollectorService.WaitingTasks.cs b/Lite/Services/RemoteCollectorService.WaitingTasks.cs
index e3b31f7..d68fc1e 100644
--- a/Lite/Services/RemoteCollectorService.WaitingTasks.cs
+++ b/Lite/Services/RemoteCollectorService.WaitingTasks.cs
@@ -32,10 +32,12 @@ private async Task<int> CollectWaitingTasksAsync(ServerConnection server, Cancel
     wait_type = wt.wait_type,
     wait_duration_ms = wt.wait_duration_ms,
     blocking_session_id = wt.blocking_session_id,
-    database_name = DB_NAME(er.database_id)
+    database_name = d.name
 FROM sys.dm_os_waiting_tasks AS wt
 LEFT JOIN sys.dm_exec_requests AS er
   ON er.session_id = wt.session_id
+LEFT JOIN sys.databases AS d
+  ON d.database_id = er.database_id
 WHERE wt.session_id >= 50
 AND   wt.session_id <> @@SPID
 AND   wt.wait_type IS NOT NULL
diff --git a/Lite/Services/RemoteCollectorService.cs b/Lite/Services/RemoteCollectorService.cs
index 10eb30c..fc9fe77 100644
--- a/Lite/Services/RemoteCollectorService.cs
+++ b/Lite/Services/RemoteCollectorService.cs
@@ -126,6 +126,12 @@ public RemoteCollectorService(
     /// </summary>
     public Task CheckpointAsync() => _duckDb.CheckpointAsync();
 
+    /// <summary>
+    /// Gets a summary of collector health for a specific server connection.
+    /// </summary>
+    public CollectorHealthSummary GetHealthSummary(ServerConnection server)
+        => GetHealthSummary(GetServerId(server));
+
     /// <summary>
     /// Gets a summary of collector health. When serverId is provided, filters to that server only.
     /// </summary>
diff --git a/Lite/Services/ServerManager.cs b/Lite/Services/ServerManager.cs
index a007c2b..bc738a2 100644
--- a/Lite/Services/ServerManager.cs
+++ b/Lite/Services/ServerManager.cs
@@ -330,50 +330,52 @@ public async Task<ServerConnectionStatus> CheckConnectionAsync(string serverId,
             using var connection = new SqlConnection(builder.ConnectionString);
             await connection.OpenAsync();
 
-            // Query server start time, version, and UTC offset to verify connectivity
-            using var command = new SqlCommand(@"
-                SELECT
-                    sqlserver_start_time,
-                    @@VERSION AS sql_version,
-                    CONVERT(integer, SERVERPROPERTY('ProductMajorVersion')) AS major_version,
-                    DATEDIFF(MINUTE, GETUTCDATE(), GETDATE()) AS utc_offset_minutes,
-                    CONVERT(integer, SERVERPROPERTY('EngineEdition')) AS engine_edition,
-                    CASE WHEN DB_ID('rdsadmin') IS NOT NULL THEN 1 ELSE 0 END AS is_aws_rds
-                FROM sys.dm_os_sys_info", connection);
-            command.CommandTimeout = ConnectionCheckTimeoutSeconds;
-
-            using var reader = await command.ExecuteReaderAsync();
-            if (await reader.ReadAsync())
+            // Connection succeeded — server is reachable regardless of DMV permissions below.
+            status.IsOnline = true;
+            status.ErrorMessage = null;
+            status.UserCancelledMfa = false; // Clear cancellation flag on successful connection
+
+            // Query server metadata (version, start time, UTC offset).
+            // Wrapped in its own try/catch: a permissions failure on sys.dm_os_sys_info
+            // must NOT flip IsOnline back to false — the login itself worked.
+            try
             {
-                status.IsOnline = true;
-                status.ErrorMessage = null;
-                status.UserCancelledMfa = false; // Clear cancellation flag on successful connection
-
-                if (!reader.IsDBNull(0))
-                {
-                    status.ServerStartTime = reader.GetDateTime(0);
-                }
-                if (!reader.IsDBNull(1))
-                {
-                    status.SqlServerVersion = reader.GetString(1);
-                }
-                if (!reader.IsDBNull(2))
-                {
-                    status.SqlMajorVersion = Convert.ToInt32(reader.GetValue(2));
-                }
-                if (!reader.IsDBNull(3))
-                {
-                    status.UtcOffsetMinutes = Convert.ToInt32(reader.GetValue(3));
-                }
-                if (!reader.IsDBNull(4))
+                using var command = new SqlCommand(@"
+                    SELECT
+                        sqlserver_start_time,
+                        @@VERSION AS sql_version,
+                        CONVERT(integer, SERVERPROPERTY('ProductMajorVersion')) AS major_version,
+                        DATEDIFF(MINUTE, GETUTCDATE(), GETDATE()) AS utc_offset_minutes,
+                        CONVERT(integer, SERVERPROPERTY('EngineEdition')) AS engine_edition,
+                        CASE WHEN DB_ID('rdsadmin') IS NOT NULL THEN 1 ELSE 0 END AS is_aws_rds
+                    FROM sys.dm_os_sys_info", connection);
+                command.CommandTimeout = ConnectionCheckTimeoutSeconds;
+
+                using var reader = await command.ExecuteReaderAsync();
+                if (await reader.ReadAsync())
                 {
-                    status.SqlEngineEdition = Convert.ToInt32(reader.GetValue(4));
-                }
-                if (!reader.IsDBNull(5))
-                {
-                    status.IsAwsRds = Convert.ToInt32(reader.GetValue(5)) == 1;
+                    if (!reader.IsDBNull(0))
+                        status.ServerStartTime = reader.GetDateTime(0);
+                    if (!reader.IsDBNull(1))
+                        status.SqlServerVersion = reader.GetString(1);
+                    if (!reader.IsDBNull(2))
+                        status.SqlMajorVersion = Convert.ToInt32(reader.GetValue(2));
+                    if (!reader.IsDBNull(3))
+                        status.UtcOffsetMinutes = Convert.ToInt32(reader.GetValue(3));
+                    if (!reader.IsDBNull(4))
+                        status.SqlEngineEdition = Convert.ToInt32(reader.GetValue(4));
+                    if (!reader.IsDBNull(5))
+                        status.IsAwsRds = Convert.ToInt32(reader.GetValue(5)) == 1;
                 }
             }
+            catch (SqlException metaEx)
+            {
+                // Metadata query failed (e.g. no VIEW SERVER STATE permission) but the
+                // server IS reachable — keep IsOnline = true, just record the warning.
+                status.ErrorMessage = $"Connected, but metadata query failed: {metaEx.Message}";
+                _logger?.LogWarning("Metadata query failed for server '{DisplayName}' (server is still online): {Message}",
+                    server.DisplayName, metaEx.Message);
+            }
 
             _logger?.LogDebug("Connectivity check passed for server '{DisplayName}'", server.DisplayName);
         }
diff --git a/Lite/Services/ShowPlanParser.cs b/Lite/Services/ShowPlanParser.cs
index 7cea60e..11c0f9e 100644
--- a/Lite/Services/ShowPlanParser.cs
+++ b/Lite/Services/ShowPlanParser.cs
@@ -1,1602 +1,1718 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Xml.Linq;
-using PerformanceMonitorLite.Models;
-
-namespace PerformanceMonitorLite.Services;
-
-public static class ShowPlanParser
-{
-    private static readonly XNamespace Ns = "http://schemas.microsoft.com/sqlserver/2004/07/showplan";
-
-    public static ParsedPlan Parse(string xml)
-    {
-        var plan = new ParsedPlan { RawXml = xml };
-
-        XDocument doc;
-        try
-        {
-            doc = XDocument.Parse(xml);
-        }
-        catch
-        {
-            return plan;
-        }
-
-        var root = doc.Root;
-        if (root == null) return plan;
-
-        plan.BuildVersion = root.Attribute("Version")?.Value;
-        plan.Build = root.Attribute("Build")?.Value;
-        plan.ClusteredMode = root.Attribute("ClusteredMode")?.Value is "true" or "1";
-
-        // Standard path: ShowPlanXML → BatchSequence → Batch → Statements
-        var batches = root.Descendants(Ns + "Batch");
-        foreach (var batchEl in batches)
-        {
-            var batch = new PlanBatch();
-            var statementsEl = batchEl.Element(Ns + "Statements");
-            if (statementsEl != null)
-            {
-                foreach (var stmtEl in statementsEl.Elements())
-                {
-                    var stmts = ParseStatementAndChildren(stmtEl);
-                    batch.Statements.AddRange(stmts);
-                }
-            }
-            if (batch.Statements.Count > 0)
-                plan.Batches.Add(batch);
-        }
-
-        // Fallback: some plan XML has StmtSimple directly under QueryPlan
-        if (plan.Batches.Count == 0)
-        {
-            var batch = new PlanBatch();
-            foreach (var stmtEl in root.Descendants(Ns + "StmtSimple"))
-            {
-                var stmt = ParseStatement(stmtEl);
-                if (stmt != null)
-                    batch.Statements.Add(stmt);
-            }
-            if (batch.Statements.Count > 0)
-                plan.Batches.Add(batch);
-        }
-
-        ComputeOperatorCosts(plan);
-        return plan;
-    }
-
-    /// <summary>
-    /// Handles StmtSimple, StmtCond (IF/ELSE), and StmtCursor recursively.
-    /// Returns a flat list of all parseable statements found.
-    /// </summary>
-    private static List<PlanStatement> ParseStatementAndChildren(XElement stmtEl)
-    {
-        var results = new List<PlanStatement>();
-        var localName = stmtEl.Name.LocalName;
-
-        if (localName == "StmtCond")
-        {
-            // IF/ELSE blocks — recurse into Condition, Then, Else
-            var condEl = stmtEl.Element(Ns + "Condition");
-            if (condEl != null)
-            {
-                foreach (var child in condEl.Elements())
-                    results.AddRange(ParseStatementAndChildren(child));
-            }
-
-            var thenStmts = stmtEl.Element(Ns + "Then")?.Element(Ns + "Statements");
-            if (thenStmts != null)
-            {
-                foreach (var child in thenStmts.Elements())
-                    results.AddRange(ParseStatementAndChildren(child));
-            }
-
-            var elseStmts = stmtEl.Element(Ns + "Else")?.Element(Ns + "Statements");
-            if (elseStmts != null)
-            {
-                foreach (var child in elseStmts.Elements())
-                    results.AddRange(ParseStatementAndChildren(child));
-            }
-        }
-        else if (localName == "StmtCursor")
-        {
-            // Cursor plans — parse each Operation's QueryPlan
-            var cursorPlanEl = stmtEl.Element(Ns + "CursorPlan");
-            if (cursorPlanEl != null)
-            {
-                var cursorName = cursorPlanEl.Attribute("CursorName")?.Value;
-                var cursorActualType = cursorPlanEl.Attribute("CursorActualType")?.Value;
-                var cursorRequestedType = cursorPlanEl.Attribute("CursorRequestedType")?.Value;
-                var cursorConcurrency = cursorPlanEl.Attribute("CursorConcurrency")?.Value;
-                var cursorForwardOnly = cursorPlanEl.Attribute("ForwardOnly")?.Value is "true" or "1";
-
-                foreach (var opEl in cursorPlanEl.Elements(Ns + "Operation"))
-                {
-                    var opType = opEl.Attribute("OperationType")?.Value ?? "CursorOp";
-                    var qpEl = opEl.Element(Ns + "QueryPlan");
-                    if (qpEl == null) continue;
-
-                    // Build a synthetic StmtSimple-like wrapper for ParseStatement
-                    var relOpEl = qpEl.Element(Ns + "RelOp");
-                    if (relOpEl == null) continue;
-
-                    var stmt = ParseQueryPlanAsStatement(stmtEl, qpEl, relOpEl);
-                    if (stmt != null)
-                    {
-                        // Override statement text with cursor context
-                        if (string.IsNullOrEmpty(stmt.StatementText))
-                            stmt.StatementText = $"Cursor: {cursorName} ({opType})";
-                        stmt.CursorName = cursorName;
-                        stmt.CursorActualType = cursorActualType;
-                        stmt.CursorRequestedType = cursorRequestedType;
-                        stmt.CursorConcurrency = cursorConcurrency;
-                        stmt.CursorForwardOnly = cursorForwardOnly;
-                        results.Add(stmt);
-                    }
-                }
-            }
-        }
-        else
-        {
-            // StmtSimple or any other statement type
-            var stmt = ParseStatement(stmtEl);
-            if (stmt != null)
-                results.Add(stmt);
-        }
-
-        return results;
-    }
-
-    private static PlanStatement? ParseStatement(XElement stmtEl)
-    {
-        var stmt = new PlanStatement
-        {
-            StatementText = stmtEl.Attribute("StatementText")?.Value ?? "",
-            StatementType = stmtEl.Attribute("StatementType")?.Value ?? "",
-            StatementSubTreeCost = ParseDouble(stmtEl.Attribute("StatementSubTreeCost")?.Value),
-            StatementEstRows = ParseDouble(stmtEl.Attribute("StatementEstRows")?.Value)
-        };
-
-        var queryPlanEl = stmtEl.Element(Ns + "QueryPlan");
-
-        // XSD gap: Dispatcher/PSP (on StmtSimple, not inside QueryPlan)
-        var dispatcherEl = stmtEl.Element(Ns + "Dispatcher");
-        if (dispatcherEl != null)
-        {
-            stmt.Dispatcher = new DispatcherInfo();
-            foreach (var pspEl in dispatcherEl.Elements(Ns + "ParameterSensitivePredicate"))
-            {
-                var psp = new ParameterSensitivePredicateInfo
-                {
-                    LowBoundary = ParseDouble(pspEl.Attribute("LowBoundary")?.Value),
-                    HighBoundary = ParseDouble(pspEl.Attribute("HighBoundary")?.Value)
-                };
-                var predEl = pspEl.Element(Ns + "Predicate")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
-                psp.PredicateText = predEl?.Attribute("ScalarString")?.Value;
-                foreach (var statEl in pspEl.Elements(Ns + "StatisticsInfo"))
-                {
-                    psp.Statistics.Add(new OptimizerStatsUsageItem
-                    {
-                        StatisticsName = statEl.Attribute("Statistics")?.Value?.Replace("[", "").Replace("]", "") ?? "",
-                        TableName = statEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "",
-                        DatabaseName = statEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", ""),
-                        SchemaName = statEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", ""),
-                        ModificationCount = ParseLong(statEl.Attribute("ModificationCount")?.Value),
-                        SamplingPercent = ParseDouble(statEl.Attribute("SamplingPercent")?.Value),
-                        LastUpdate = statEl.Attribute("LastUpdate")?.Value
-                    });
-                }
-                stmt.Dispatcher.ParameterSensitivePredicates.Add(psp);
-            }
-            foreach (var oppEl in dispatcherEl.Elements(Ns + "OptionalParameterPredicate"))
-            {
-                var opp = new OptionalParameterPredicateInfo();
-                var oppPredEl = oppEl.Element(Ns + "Predicate")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
-                opp.PredicateText = oppPredEl?.Attribute("ScalarString")?.Value;
-                stmt.Dispatcher.OptionalParameterPredicates.Add(opp);
-            }
-        }
-
-        if (queryPlanEl == null) return stmt;
-
-        ParseStmtAttributes(stmt, stmtEl);
-        ParseQueryPlanElements(stmt, stmtEl, queryPlanEl);
-
-        // Root RelOp — wrap in a synthetic statement-type node (SELECT, INSERT, etc.)
-        var relOpEl = queryPlanEl.Element(Ns + "RelOp");
-        if (relOpEl != null)
-        {
-            var opNode = ParseRelOp(relOpEl);
-            var stmtType = stmt.StatementType.Length > 0
-                ? stmt.StatementType.ToUpperInvariant()
-                : "QUERY";
-
-            var stmtNode = new PlanNode
-            {
-                NodeId = -1,
-                PhysicalOp = stmtType,
-                LogicalOp = stmtType,
-                EstimatedTotalSubtreeCost = stmt.StatementSubTreeCost,
-                EstimateRows = stmt.StatementEstRows,
-                IconName = stmtType switch
-                {
-                    "SELECT" => "result",
-                    "INSERT" => "insert",
-                    "UPDATE" => "update",
-                    "DELETE" => "delete",
-                    _ => "language_construct_catch_all"
-                }
-            };
-            opNode.Parent = stmtNode;
-            stmtNode.Children.Add(opNode);
-            stmt.RootNode = stmtNode;
-        }
-
-        // XSD gap: UDF sub-plans
-        foreach (var udfEl in stmtEl.Elements(Ns + "UDF"))
-        {
-            var udfInfo = new FunctionPlanInfo
-            {
-                ProcName = udfEl.Attribute("ProcName")?.Value ?? "",
-                IsNativelyCompiled = udfEl.Attribute("IsNativelyCompiled")?.Value is "true" or "1"
-            };
-            var udfStmts = udfEl.Element(Ns + "Statements");
-            if (udfStmts != null)
-            {
-                foreach (var childStmt in udfStmts.Elements())
-                {
-                    var parsed = ParseStatementAndChildren(childStmt);
-                    udfInfo.Statements.AddRange(parsed);
-                }
-            }
-            stmt.UdfPlans.Add(udfInfo);
-        }
-
-        // XSD gap: StoredProc sub-plan
-        var storedProcEl = stmtEl.Element(Ns + "StoredProc");
-        if (storedProcEl != null)
-        {
-            var spInfo = new FunctionPlanInfo
-            {
-                ProcName = storedProcEl.Attribute("ProcName")?.Value ?? "",
-                IsNativelyCompiled = storedProcEl.Attribute("IsNativelyCompiled")?.Value is "true" or "1"
-            };
-            var spStmts = storedProcEl.Element(Ns + "Statements");
-            if (spStmts != null)
-            {
-                foreach (var childStmt in spStmts.Elements())
-                {
-                    var parsed = ParseStatementAndChildren(childStmt);
-                    spInfo.Statements.AddRange(parsed);
-                }
-            }
-            stmt.StoredProcPlan = spInfo;
-        }
-
-        return stmt;
-    }
-
-    /// <summary>
-    /// Parse a QueryPlan element that comes from a cursor Operation (no parent StmtSimple attributes).
-    /// </summary>
-    private static PlanStatement? ParseQueryPlanAsStatement(XElement stmtEl, XElement queryPlanEl, XElement relOpEl)
-    {
-        var stmt = new PlanStatement
-        {
-            StatementText = stmtEl.Attribute("StatementText")?.Value ?? "",
-            StatementType = stmtEl.Attribute("StatementType")?.Value ?? "SELECT",
-            StatementSubTreeCost = ParseDouble(stmtEl.Attribute("StatementSubTreeCost")?.Value)
-        };
-
-        ParseStmtAttributes(stmt, stmtEl);
-        ParseQueryPlanElements(stmt, stmtEl, queryPlanEl);
-
-        var opNode = ParseRelOp(relOpEl);
-        var stmtType = stmt.StatementType.Length > 0
-            ? stmt.StatementType.ToUpperInvariant()
-            : "QUERY";
-
-        // Use subtree cost from RelOp if statement cost is 0
-        if (stmt.StatementSubTreeCost <= 0)
-            stmt.StatementSubTreeCost = opNode.EstimatedTotalSubtreeCost;
-
-        var stmtNode = new PlanNode
-        {
-            NodeId = -1,
-            PhysicalOp = stmtType,
-            LogicalOp = stmtType,
-            EstimatedTotalSubtreeCost = stmt.StatementSubTreeCost,
-            EstimateRows = stmt.StatementEstRows,
-            IconName = stmtType switch
-            {
-                "SELECT" => "result",
-                "INSERT" => "insert",
-                "UPDATE" => "update",
-                "DELETE" => "delete",
-                _ => "language_construct_catch_all"
-            }
-        };
-        opNode.Parent = stmtNode;
-        stmtNode.Children.Add(opNode);
-        stmt.RootNode = stmtNode;
-
-        return stmt;
-    }
-
-    /// <summary>
-    /// Parse attributes from StmtSimple element.
-    /// </summary>
-    private static void ParseStmtAttributes(PlanStatement stmt, XElement stmtEl)
-    {
-        stmt.StatementOptmLevel = stmtEl.Attribute("StatementOptmLevel")?.Value;
-        stmt.StatementOptmEarlyAbortReason = stmtEl.Attribute("StatementOptmEarlyAbortReason")?.Value;
-        stmt.StatementParameterizationType = (int)ParseDouble(stmtEl.Attribute("StatementParameterizationType")?.Value);
-        stmt.StatementSqlHandle = stmtEl.Attribute("StatementSqlHandle")?.Value;
-        stmt.DatabaseContextSettingsId = ParseLong(stmtEl.Attribute("DatabaseContextSettingsId")?.Value);
-        stmt.ParentObjectId = (int)ParseDouble(stmtEl.Attribute("ParentObjectId")?.Value);
-        stmt.SecurityPolicyApplied = stmtEl.Attribute("SecurityPolicyApplied")?.Value is "true" or "1";
-        stmt.BatchModeOnRowStoreUsed = stmtEl.Attribute("BatchModeOnRowStoreUsed")?.Value is "true" or "1";
-        stmt.QueryHash = stmtEl.Attribute("QueryHash")?.Value;
-        stmt.QueryPlanHash = stmtEl.Attribute("QueryPlanHash")?.Value;
-
-        // Bug fix 1.3: CE version is on StmtSimple per XSD
-        stmt.CardinalityEstimationModelVersion = (int)ParseDouble(stmtEl.Attribute("CardinalityEstimationModelVersion")?.Value);
-
-        // Wave 3.6: Query Store hint attributes
-        stmt.QueryStoreStatementHintId = (int)ParseDouble(stmtEl.Attribute("QueryStoreStatementHintId")?.Value);
-        stmt.QueryStoreStatementHintText = stmtEl.Attribute("QueryStoreStatementHintText")?.Value;
-        stmt.QueryStoreStatementHintSource = stmtEl.Attribute("QueryStoreStatementHintSource")?.Value;
-
-        // XSD gap: Statement-level identifiers and handles
-        stmt.StatementId = (int)ParseDouble(stmtEl.Attribute("StatementId")?.Value);
-        stmt.StatementCompId = (int)ParseDouble(stmtEl.Attribute("StatementCompId")?.Value);
-        stmt.TemplatePlanGuideDB = stmtEl.Attribute("TemplatePlanGuideDB")?.Value;
-        stmt.TemplatePlanGuideName = stmtEl.Attribute("TemplatePlanGuideName")?.Value;
-        stmt.ParameterizedPlanHandle = stmtEl.Attribute("ParameterizedPlanHandle")?.Value;
-        stmt.BatchSqlHandle = stmtEl.Attribute("BatchSqlHandle")?.Value;
-        stmt.ContainsLedgerTables = stmtEl.Attribute("ContainsLedgerTables")?.Value is "true" or "1";
-        stmt.QueryCompilationReplay = (int)ParseDouble(stmtEl.Attribute("QueryCompilationReplay")?.Value);
-    }
-
-    /// <summary>
-    /// Parse child elements of QueryPlan (memory grant, stats, parameters, etc.)
-    /// </summary>
-    private static void ParseQueryPlanElements(PlanStatement stmt, XElement stmtEl, XElement queryPlanEl)
-    {
-        // StatementSetOptions (child element of StmtSimple)
-        var setOptsEl = stmtEl.Element(Ns + "StatementSetOptions");
-        if (setOptsEl != null)
-        {
-            stmt.SetOptions = new SetOptionsInfo
-            {
-                AnsiNulls = setOptsEl.Attribute("ANSI_NULLS")?.Value is "true" or "1",
-                AnsiPadding = setOptsEl.Attribute("ANSI_PADDING")?.Value is "true" or "1",
-                AnsiWarnings = setOptsEl.Attribute("ANSI_WARNINGS")?.Value is "true" or "1",
-                ArithAbort = setOptsEl.Attribute("ARITHABORT")?.Value is "true" or "1",
-                ConcatNullYieldsNull = setOptsEl.Attribute("CONCAT_NULL_YIELDS_NULL")?.Value is "true" or "1",
-                NumericRoundAbort = setOptsEl.Attribute("NUMERIC_ROUNDABORT")?.Value is "true" or "1",
-                QuotedIdentifier = setOptsEl.Attribute("QUOTED_IDENTIFIER")?.Value is "true" or "1"
-            };
-        }
-
-        // Memory grant info
-        var memEl = queryPlanEl.Element(Ns + "MemoryGrantInfo");
-        if (memEl != null)
-        {
-            stmt.MemoryGrant = new MemoryGrantInfo
-            {
-                SerialRequiredMemoryKB = ParseLong(memEl.Attribute("SerialRequiredMemory")?.Value),
-                SerialDesiredMemoryKB = ParseLong(memEl.Attribute("SerialDesiredMemory")?.Value),
-                RequiredMemoryKB = ParseLong(memEl.Attribute("RequiredMemory")?.Value),
-                DesiredMemoryKB = ParseLong(memEl.Attribute("DesiredMemory")?.Value),
-                RequestedMemoryKB = ParseLong(memEl.Attribute("RequestedMemory")?.Value),
-                GrantedMemoryKB = ParseLong(memEl.Attribute("GrantedMemory")?.Value),
-                MaxUsedMemoryKB = ParseLong(memEl.Attribute("MaxUsedMemory")?.Value),
-                GrantWaitTimeMs = ParseLong(memEl.Attribute("GrantWaitTime")?.Value),
-                LastRequestedMemoryKB = ParseLong(memEl.Attribute("LastRequestedMemory")?.Value),
-                IsMemoryGrantFeedbackAdjusted = memEl.Attribute("IsMemoryGrantFeedbackAdjusted")?.Value
-            };
-        }
-
-        // Statement-level metadata from QueryPlan attributes
-        stmt.CachedPlanSizeKB = ParseLong(queryPlanEl.Attribute("CachedPlanSize")?.Value);
-        stmt.DegreeOfParallelism = (int)ParseDouble(queryPlanEl.Attribute("DegreeOfParallelism")?.Value);
-        stmt.NonParallelPlanReason = queryPlanEl.Attribute("NonParallelPlanReason")?.Value;
-        stmt.RetrievedFromCache = queryPlanEl.Attribute("RetrievedFromCache")?.Value is "true" or "1";
-        stmt.CompileTimeMs = ParseLong(queryPlanEl.Attribute("CompileTime")?.Value);
-        stmt.CompileMemoryKB = ParseLong(queryPlanEl.Attribute("CompileMemory")?.Value);
-        stmt.CompileCPUMs = ParseLong(queryPlanEl.Attribute("CompileCPU")?.Value);
-
-        // Fallback: some plans have CE version on QueryPlan instead of StmtSimple
-        if (stmt.CardinalityEstimationModelVersion == 0)
-            stmt.CardinalityEstimationModelVersion = (int)ParseDouble(queryPlanEl.Attribute("CardinalityEstimationModelVersion")?.Value);
-
-        // Wave 2.5: MaxQueryMemory
-        stmt.MaxQueryMemoryKB = ParseLong(queryPlanEl.Attribute("MaxQueryMemory")?.Value);
-
-        // Wave 3.1: EffectiveDOP + DOP feedback
-        stmt.EffectiveDOP = (int)ParseDouble(queryPlanEl.Attribute("EffectiveDegreeOfParallelism")?.Value);
-        stmt.DOPFeedbackAdjusted = queryPlanEl.Attribute("IsDOPFeedbackAdjusted")?.Value;
-
-        // Wave 3.4: Plan Guide attributes
-        stmt.PlanGuideDB = queryPlanEl.Attribute("PlanGuideDB")?.Value;
-        stmt.PlanGuideName = queryPlanEl.Attribute("PlanGuideName")?.Value;
-        stmt.UsePlan = queryPlanEl.Attribute("UsePlan")?.Value is "true" or "1";
-
-        // Wave 3.5: ParameterizedText
-        stmt.ParameterizedText = queryPlanEl.Element(Ns + "ParameterizedText")?.Value;
-
-        // XSD gap: QueryPlan-level attributes
-        stmt.ContainsInterleavedExecutionCandidates = queryPlanEl.Attribute("ContainsInterleavedExecutionCandidates")?.Value is "true" or "1";
-        stmt.ContainsInlineScalarTsqlUdfs = queryPlanEl.Attribute("ContainsInlineScalarTsqlUdfs")?.Value is "true" or "1";
-        stmt.QueryVariantID = (int)ParseDouble(queryPlanEl.Attribute("QueryVariantID")?.Value);
-        stmt.DispatcherPlanHandle = queryPlanEl.Attribute("DispatcherPlanHandle")?.Value;
-        stmt.ExclusiveProfileTimeActive = queryPlanEl.Attribute("ExclusiveProfileTimeActive")?.Value is "true" or "1";
-
-        // XSD gap: OptimizationReplay
-        var optReplayEl = queryPlanEl.Element(Ns + "OptimizationReplay");
-        if (optReplayEl != null)
-            stmt.OptimizationReplayScript = optReplayEl.Attribute("Script")?.Value;
-
-        // Missing indexes
-        stmt.MissingIndexes = ParseMissingIndexes(queryPlanEl);
-
-        // Wave 2.8: QueryPlan-level warnings
-        var planWarningsEl = queryPlanEl.Element(Ns + "Warnings");
-        if (planWarningsEl != null)
-            stmt.PlanWarnings = ParseWarningsFromElement(planWarningsEl);
-
-        // OptimizerHardwareDependentProperties
-        var hwEl = queryPlanEl.Element(Ns + "OptimizerHardwareDependentProperties");
-        if (hwEl != null)
-        {
-            stmt.HardwareProperties = new OptimizerHardwareInfo
-            {
-                EstimatedAvailableMemoryGrant = ParseLong(hwEl.Attribute("EstimatedAvailableMemoryGrant")?.Value),
-                EstimatedPagesCached = ParseLong(hwEl.Attribute("EstimatedPagesCached")?.Value),
-                EstimatedAvailableDOP = (int)ParseDouble(hwEl.Attribute("EstimatedAvailableDegreeOfParallelism")?.Value),
-                MaxCompileMemory = ParseLong(hwEl.Attribute("MaxCompileMemory")?.Value)
-            };
-        }
-
-        // OptimizerStatsUsage
-        var statsUsageEl = queryPlanEl.Element(Ns + "OptimizerStatsUsage");
-        if (statsUsageEl != null)
-        {
-            foreach (var statEl in statsUsageEl.Elements(Ns + "StatisticsInfo"))
-            {
-                stmt.StatsUsage.Add(new OptimizerStatsUsageItem
-                {
-                    StatisticsName = statEl.Attribute("Statistics")?.Value?.Replace("[", "").Replace("]", "") ?? "",
-                    TableName = statEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "",
-                    DatabaseName = statEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", ""),
-                    SchemaName = statEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", ""),
-                    ModificationCount = ParseLong(statEl.Attribute("ModificationCount")?.Value),
-                    SamplingPercent = ParseDouble(statEl.Attribute("SamplingPercent")?.Value),
-                    LastUpdate = statEl.Attribute("LastUpdate")?.Value
-                });
-            }
-        }
-
-        // ThreadStat (actual plans)
-        var threadStatEl = queryPlanEl.Element(Ns + "ThreadStat");
-        if (threadStatEl != null)
-        {
-            stmt.ThreadStats = new ThreadStatInfo
-            {
-                Branches = (int)ParseDouble(threadStatEl.Attribute("Branches")?.Value),
-                UsedThreads = (int)ParseDouble(threadStatEl.Attribute("UsedThreads")?.Value)
-            };
-            foreach (var trEl in threadStatEl.Elements(Ns + "ThreadReservation"))
-            {
-                stmt.ThreadStats.Reservations.Add(new ThreadReservation
-                {
-                    NodeId = (int)ParseDouble(trEl.Attribute("NodeId")?.Value),
-                    ReservedThreads = (int)ParseDouble(trEl.Attribute("ReservedThreads")?.Value)
-                });
-            }
-        }
-
-        // ParameterList
-        var paramListEl = queryPlanEl.Element(Ns + "ParameterList");
-        if (paramListEl != null)
-        {
-            foreach (var paramEl in paramListEl.Elements(Ns + "ColumnReference"))
-            {
-                stmt.Parameters.Add(new PlanParameter
-                {
-                    Name = paramEl.Attribute("Column")?.Value ?? "",
-                    DataType = paramEl.Attribute("ParameterDataType")?.Value ?? "",
-                    CompiledValue = paramEl.Attribute("ParameterCompiledValue")?.Value,
-                    RuntimeValue = paramEl.Attribute("ParameterRuntimeValue")?.Value
-                });
-            }
-        }
-
-        // WaitStats (actual plans)
-        var waitStatsEl = queryPlanEl.Element(Ns + "WaitStats");
-        if (waitStatsEl != null)
-        {
-            foreach (var waitEl in waitStatsEl.Elements(Ns + "Wait"))
-            {
-                stmt.WaitStats.Add(new WaitStatInfo
-                {
-                    WaitType = waitEl.Attribute("WaitType")?.Value ?? "",
-                    WaitTimeMs = ParseLong(waitEl.Attribute("WaitTimeMs")?.Value),
-                    WaitCount = ParseLong(waitEl.Attribute("WaitCount")?.Value)
-                });
-            }
-        }
-
-        // QueryTimeStats (actual plans)
-        var queryTimeEl = queryPlanEl.Element(Ns + "QueryTimeStats");
-        if (queryTimeEl != null)
-        {
-            stmt.QueryTimeStats = new QueryTimeInfo
-            {
-                CpuTimeMs = ParseLong(queryTimeEl.Attribute("CpuTime")?.Value),
-                ElapsedTimeMs = ParseLong(queryTimeEl.Attribute("ElapsedTime")?.Value)
-            };
-            stmt.QueryUdfCpuTimeMs = ParseLong(queryTimeEl.Attribute("UdfCpuTime")?.Value);
-            stmt.QueryUdfElapsedTimeMs = ParseLong(queryTimeEl.Attribute("UdfElapsedTime")?.Value);
-        }
-
-        // Wave 3.12: TraceFlags
-        foreach (var traceFlagsEl in queryPlanEl.Elements(Ns + "TraceFlags"))
-        {
-            var isCompile = traceFlagsEl.Attribute("IsCompileTime")?.Value is "true" or "1";
-            foreach (var tf in traceFlagsEl.Elements(Ns + "TraceFlag"))
-            {
-                stmt.TraceFlags.Add(new TraceFlagInfo
-                {
-                    Value = (int)ParseDouble(tf.Attribute("Value")?.Value),
-                    Scope = tf.Attribute("Scope")?.Value ?? "",
-                    IsCompileTime = isCompile
-                });
-            }
-        }
-
-        // Wave 3.13: IndexedViewInfo
-        var ivInfoEl = queryPlanEl.Element(Ns + "IndexedViewInfo");
-        if (ivInfoEl != null)
-        {
-            foreach (var objEl in ivInfoEl.Elements(Ns + "Object"))
-            {
-                var db = objEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
-                var schema = objEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
-                var table = objEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
-                var index = objEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
-                var parts = new List<string>();
-                if (!string.IsNullOrEmpty(db)) parts.Add(db);
-                if (!string.IsNullOrEmpty(schema)) parts.Add(schema);
-                if (!string.IsNullOrEmpty(table)) parts.Add(table);
-                if (!string.IsNullOrEmpty(index)) parts.Add(index);
-                var name = string.Join(".", parts);
-                if (!string.IsNullOrEmpty(name))
-                    stmt.IndexedViews.Add(name);
-            }
-        }
-
-        // XSD gap: CardinalityFeedback
-        var ceFeedbackEl = queryPlanEl.Element(Ns + "CardinalityFeedback");
-        if (ceFeedbackEl != null)
-        {
-            foreach (var entry in ceFeedbackEl.Elements(Ns + "Entry"))
-            {
-                stmt.CardinalityFeedback.Add(new CardinalityFeedbackEntry
-                {
-                    Key = ParseLong(entry.Attribute("Key")?.Value),
-                    Value = ParseLong(entry.Attribute("Value")?.Value)
-                });
-            }
-        }
-    }
-
-    private static PlanNode ParseRelOp(XElement relOpEl)
-    {
-        var node = new PlanNode
-        {
-            NodeId = (int)ParseDouble(relOpEl.Attribute("NodeId")?.Value),
-            PhysicalOp = relOpEl.Attribute("PhysicalOp")?.Value ?? "",
-            LogicalOp = relOpEl.Attribute("LogicalOp")?.Value ?? "",
-            EstimatedTotalSubtreeCost = ParseDouble(relOpEl.Attribute("EstimatedTotalSubtreeCost")?.Value),
-            EstimateRows = ParseDouble(relOpEl.Attribute("EstimateRows")?.Value),
-            EstimateIO = ParseDouble(relOpEl.Attribute("EstimateIO")?.Value),
-            EstimateCPU = ParseDouble(relOpEl.Attribute("EstimateCPU")?.Value),
-            EstimateRebinds = ParseDouble(relOpEl.Attribute("EstimateRebinds")?.Value),
-            EstimateRewinds = ParseDouble(relOpEl.Attribute("EstimateRewinds")?.Value),
-            EstimatedRowSize = (int)ParseDouble(relOpEl.Attribute("AvgRowSize")?.Value),
-            Parallel = relOpEl.Attribute("Parallel")?.Value is "true" or "1",
-            Partitioned = relOpEl.Attribute("Partitioned")?.Value is "true" or "1",
-            ExecutionMode = relOpEl.Attribute("EstimatedExecutionMode")?.Value,
-            IsAdaptive = relOpEl.Attribute("IsAdaptive")?.Value is "true" or "1",
-            AdaptiveThresholdRows = ParseDouble(relOpEl.Attribute("AdaptiveThresholdRows")?.Value),
-            EstimatedJoinType = relOpEl.Attribute("EstimatedJoinType")?.Value,
-            // Wave 3.14: Estimated DOP per operator
-            EstimatedDOP = (int)ParseDouble(relOpEl.Attribute("EstimatedAvailableDegreeOfParallelism")?.Value),
-            // XSD gap: RelOp-level metadata
-            GroupExecuted = relOpEl.Attribute("GroupExecuted")?.Value is "true" or "1",
-            RemoteDataAccess = relOpEl.Attribute("RemoteDataAccess")?.Value is "true" or "1",
-            OptimizedHalloweenProtectionUsed = relOpEl.Attribute("OptimizedHalloweenProtectionUsed")?.Value is "true" or "1",
-            StatsCollectionId = ParseLong(relOpEl.Attribute("StatsCollectionId")?.Value)
-        };
-
-        // Map to icon
-        node.IconName = PlanIconMapper.GetIconName(node.PhysicalOp);
-
-        // Handle operator-specific element
-        var physicalOpEl = GetOperatorElement(relOpEl);
-        if (physicalOpEl != null)
-        {
-            // Object reference (table/index name) — scoped to stop at child RelOps
-            var objEl = ScopedDescendants(physicalOpEl, Ns + "Object").FirstOrDefault();
-            if (objEl != null)
-            {
-                var db = objEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
-                var schema = objEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
-                var table = objEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
-                var index = objEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
-
-                node.DatabaseName = db;
-                node.IndexName = index;
-
-                var shortParts = new List<string>();
-                if (!string.IsNullOrEmpty(schema)) shortParts.Add(schema);
-                if (!string.IsNullOrEmpty(table)) shortParts.Add(table);
-                node.ObjectName = shortParts.Count > 0 ? string.Join(".", shortParts) : null;
-
-                var fullParts = new List<string>();
-                if (!string.IsNullOrEmpty(db)) fullParts.Add(db);
-                if (!string.IsNullOrEmpty(schema)) fullParts.Add(schema);
-                if (!string.IsNullOrEmpty(table)) fullParts.Add(table);
-                var fullName = string.Join(".", fullParts);
-                if (!string.IsNullOrEmpty(index))
-                    fullName += $".{index}";
-                node.FullObjectName = !string.IsNullOrEmpty(fullName) ? fullName : null;
-
-                node.StorageType = objEl.Attribute("Storage")?.Value;
-                node.ServerName = objEl.Attribute("Server")?.Value?.Replace("[", "").Replace("]", "");
-                node.ObjectAlias = objEl.Attribute("Alias")?.Value?.Replace("[", "").Replace("]", "");
-                node.IndexKind = objEl.Attribute("IndexKind")?.Value;
-                node.FilteredIndex = objEl.Attribute("Filtered")?.Value is "true" or "1";
-                node.TableReferenceId = (int)ParseDouble(objEl.Attribute("TableReferenceId")?.Value);
-            }
-
-            // Hash keys for hash match operators
-            var hashKeysProbeEl = physicalOpEl.Element(Ns + "HashKeysProbe");
-            if (hashKeysProbeEl != null)
-            {
-                var cols = hashKeysProbeEl.Elements(Ns + "ColumnReference")
-                    .Select(c => FormatColumnRef(c))
-                    .Where(s => !string.IsNullOrEmpty(s));
-                node.HashKeysProbe = string.Join(", ", cols);
-            }
-            var hashKeysBuildEl = physicalOpEl.Element(Ns + "HashKeysBuild");
-            if (hashKeysBuildEl != null)
-            {
-                var cols = hashKeysBuildEl.Elements(Ns + "ColumnReference")
-                    .Select(c => FormatColumnRef(c))
-                    .Where(s => !string.IsNullOrEmpty(s));
-                node.HashKeysBuild = string.Join(", ", cols);
-            }
-
-            // Ordered attribute
-            node.Ordered = physicalOpEl.Attribute("Ordered")?.Value == "true" || physicalOpEl.Attribute("Ordered")?.Value == "1";
-
-            // Seek predicates — scoped to stop at child RelOps
-            var seekPreds = ScopedDescendants(physicalOpEl, Ns + "SeekPredicateNew")
-                .Concat(ScopedDescendants(physicalOpEl, Ns + "SeekPredicate"));
-            var seekParts = new List<string>();
-            foreach (var sp in seekPreds)
-            {
-                var scalarOps = sp.Descendants(Ns + "ScalarOperator");
-                foreach (var so in scalarOps)
-                {
-                    var val = so.Attribute("ScalarString")?.Value;
-                    if (!string.IsNullOrEmpty(val))
-                        seekParts.Add(val);
-                }
-            }
-            if (seekParts.Count > 0)
-                node.SeekPredicates = string.Join(" AND ", seekParts);
-
-            // Residual predicate
-            var predEl = physicalOpEl.Elements(Ns + "Predicate").FirstOrDefault();
-            if (predEl != null)
-            {
-                var scalarOp = predEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
-                node.Predicate = scalarOp?.Attribute("ScalarString")?.Value;
-            }
-
-            // Partitioning type (for parallelism operators)
-            node.PartitioningType = physicalOpEl.Attribute("PartitioningType")?.Value;
-
-            // Build/Probe residuals (Hash Match)
-            var buildResEl = physicalOpEl.Element(Ns + "BuildResidual");
-            if (buildResEl != null)
-            {
-                var so = buildResEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
-                node.BuildResidual = so?.Attribute("ScalarString")?.Value;
-            }
-            var probeResEl = physicalOpEl.Element(Ns + "ProbeResidual");
-            if (probeResEl != null)
-            {
-                var so = probeResEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
-                node.ProbeResidual = so?.Attribute("ScalarString")?.Value;
-            }
-
-            // Wave 2.1/2.2: Merge Residual + PassThru (Merge Join + Nested Loops)
-            var residualEl = physicalOpEl.Element(Ns + "Residual");
-            if (residualEl != null)
-            {
-                var so = residualEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
-                node.MergeResidual = so?.Attribute("ScalarString")?.Value;
-            }
-            var passThruEl = physicalOpEl.Element(Ns + "PassThru");
-            if (passThruEl != null)
-            {
-                var so = passThruEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
-                node.PassThru = so?.Attribute("ScalarString")?.Value;
-            }
-
-            // OrderBy columns (Sort operator)
-            var orderByEl = physicalOpEl.Element(Ns + "OrderBy");
-            if (orderByEl != null)
-            {
-                var obParts = orderByEl.Elements(Ns + "OrderByColumn")
-                    .Select(obc =>
-                    {
-                        var ascending = obc.Attribute("Ascending")?.Value != "false";
-                        var colRef = obc.Element(Ns + "ColumnReference");
-                        var name = colRef != null ? FormatColumnRef(colRef) : "";
-                        return string.IsNullOrEmpty(name) ? "" : $"{name} {(ascending ? "ASC" : "DESC")}";
-                    })
-                    .Where(s => !string.IsNullOrEmpty(s));
-                var obStr = string.Join(", ", obParts);
-                if (!string.IsNullOrEmpty(obStr))
-                    node.OrderBy = obStr;
-            }
-
-            // OuterReferences (Nested Loops)
-            var outerRefsEl = physicalOpEl.Element(Ns + "OuterReferences");
-            if (outerRefsEl != null)
-            {
-                var refs = outerRefsEl.Elements(Ns + "ColumnReference")
-                    .Select(c => FormatColumnRef(c))
-                    .Where(s => !string.IsNullOrEmpty(s));
-                var refsStr = string.Join(", ", refs);
-                if (!string.IsNullOrEmpty(refsStr))
-                    node.OuterReferences = refsStr;
-            }
-
-            // Inner/Outer side join columns (Merge Join)
-            node.InnerSideJoinColumns = ParseColumnList(physicalOpEl, "InnerSideJoinColumns");
-            node.OuterSideJoinColumns = ParseColumnList(physicalOpEl, "OuterSideJoinColumns");
-
-            // GroupBy columns (Hash/Stream Aggregate)
-            node.GroupBy = ParseColumnList(physicalOpEl, "GroupBy");
-
-            // Partition columns (Parallelism)
-            node.PartitionColumns = ParseColumnList(physicalOpEl, "PartitionColumns");
-
-            // Wave 2.6: Parallelism HashKeys
-            node.HashKeys = ParseColumnList(physicalOpEl, "HashKeys");
-
-            // Segment column
-            var segColEl = physicalOpEl.Element(Ns + "SegmentColumn")?.Element(Ns + "ColumnReference");
-            if (segColEl != null)
-                node.SegmentColumn = FormatColumnRef(segColEl);
-
-            // Defined values (Compute Scalar)
-            var definedValsEl = physicalOpEl.Element(Ns + "DefinedValues");
-            if (definedValsEl != null)
-            {
-                var dvParts = new List<string>();
-                foreach (var dvEl in definedValsEl.Elements(Ns + "DefinedValue"))
-                {
-                    var colRef = dvEl.Element(Ns + "ColumnReference");
-                    var scalarOp = dvEl.Element(Ns + "ScalarOperator");
-                    var colName = colRef != null ? FormatColumnRef(colRef) : "";
-                    var expr = scalarOp?.Attribute("ScalarString")?.Value ?? "";
-                    if (!string.IsNullOrEmpty(colName) && !string.IsNullOrEmpty(expr))
-                        dvParts.Add($"{colName} = {expr}");
-                    else if (!string.IsNullOrEmpty(expr))
-                        dvParts.Add(expr);
-                    else if (!string.IsNullOrEmpty(colName))
-                        dvParts.Add(colName);
-                }
-                if (dvParts.Count > 0)
-                    node.DefinedValues = string.Join("; ", dvParts);
-            }
-
-            // IndexScan / TableScan properties
-            node.ScanDirection = physicalOpEl.Attribute("ScanDirection")?.Value;
-            node.ForcedIndex = physicalOpEl.Attribute("ForcedIndex")?.Value is "true" or "1";
-            node.ForceScan = physicalOpEl.Attribute("ForceScan")?.Value is "true" or "1";
-            node.ForceSeek = physicalOpEl.Attribute("ForceSeek")?.Value is "true" or "1";
-            node.NoExpandHint = physicalOpEl.Attribute("NoExpandHint")?.Value is "true" or "1";
-            node.Lookup = physicalOpEl.Attribute("Lookup")?.Value is "true" or "1";
-            node.DynamicSeek = physicalOpEl.Attribute("DynamicSeek")?.Value is "true" or "1";
-
-            // Table cardinality and rows to be read (on <RelOp> per XSD)
-            node.TableCardinality = ParseDouble(relOpEl.Attribute("TableCardinality")?.Value);
-            node.EstimatedRowsRead = ParseDouble(relOpEl.Attribute("EstimatedRowsRead")?.Value);
-            if (node.EstimatedRowsRead == 0)
-                node.EstimatedRowsRead = ParseDouble(relOpEl.Attribute("EstimateRowsWithoutRowGoal")?.Value);
-
-            // TOP operator properties
-            var topExprEl = physicalOpEl.Element(Ns + "TopExpression")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
-            if (topExprEl != null)
-                node.TopExpression = topExprEl.Attribute("ScalarString")?.Value;
-            node.IsPercent = physicalOpEl.Attribute("IsPercent")?.Value is "true" or "1";
-            node.WithTies = physicalOpEl.Attribute("WithTies")?.Value is "true" or "1";
-
-            // Wave 2.7: Top OffsetExpression, RowCount, Rows
-            var offsetEl = physicalOpEl.Element(Ns + "OffsetExpression")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
-            if (offsetEl != null)
-                node.OffsetExpression = offsetEl.Attribute("ScalarString")?.Value;
-            node.RowCount = physicalOpEl.Attribute("RowCount")?.Value is "true" or "1";
-            node.TopRows = (int)ParseDouble(physicalOpEl.Attribute("Rows")?.Value);
-
-            // Sort properties
-            node.SortDistinct = physicalOpEl.Attribute("Distinct")?.Value is "true" or "1";
-
-            // Filter properties
-            node.StartupExpression = physicalOpEl.Attribute("StartupExpression")?.Value is "true" or "1";
-
-            // Nested Loops properties
-            node.NLOptimized = physicalOpEl.Attribute("Optimized")?.Value is "true" or "1";
-            node.WithOrderedPrefetch = physicalOpEl.Attribute("WithOrderedPrefetch")?.Value is "true" or "1";
-            node.WithUnorderedPrefetch = physicalOpEl.Attribute("WithUnorderedPrefetch")?.Value is "true" or "1";
-
-            // Hash Match properties
-            node.ManyToMany = physicalOpEl.Attribute("ManyToMany")?.Value is "true" or "1";
-            node.BitmapCreator = physicalOpEl.Attribute("BitmapCreator")?.Value is "true" or "1";
-
-            // Parallelism properties
-            node.Remoting = physicalOpEl.Attribute("Remoting")?.Value is "true" or "1";
-            node.LocalParallelism = physicalOpEl.Attribute("LocalParallelism")?.Value is "true" or "1";
-
-            // Wave 3.8: Spool Stack + PrimaryNodeId
-            node.SpoolStack = physicalOpEl.Attribute("Stack")?.Value is "true" or "1";
-            node.PrimaryNodeId = (int)ParseDouble(physicalOpEl.Attribute("PrimaryNodeId")?.Value);
-
-            // Eager Index Spool — suggest CREATE INDEX from SeekPredicateNew + OutputList
-            if (node.LogicalOp == "Eager Spool")
-            {
-                var spoolSeek = physicalOpEl.Element(Ns + "SeekPredicateNew")
-                             ?? physicalOpEl.Element(Ns + "SeekPredicate");
-                if (spoolSeek != null)
-                {
-                    var rangeCols = spoolSeek.Descendants(Ns + "RangeColumns")
-                        .SelectMany(rc => rc.Elements(Ns + "ColumnReference"));
-
-                    var keyColumns = new List<string>();
-                    string? tblSchema = null;
-                    string? tblName = null;
-
-                    foreach (var col in rangeCols)
-                    {
-                        var colName = col.Attribute("Column")?.Value;
-                        if (!string.IsNullOrEmpty(colName))
-                            keyColumns.Add(colName);
-                        tblSchema ??= col.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
-                        tblName ??= col.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
-                    }
-
-                    if (keyColumns.Count > 0 && !string.IsNullOrEmpty(tblName))
-                    {
-                        var includeCols = relOpEl.Element(Ns + "OutputList")?.Elements(Ns + "ColumnReference")
-                            .Select(c => c.Attribute("Column")?.Value)
-                            .Where(c => !string.IsNullOrEmpty(c) && !keyColumns.Contains(c))
-                            .ToList() ?? new List<string?>();
-
-                        var prefix = !string.IsNullOrEmpty(tblSchema) ? $"{tblSchema}.{tblName}" : tblName;
-                        var keyStr = string.Join(", ", keyColumns);
-                        var sql = $"CREATE INDEX [{string.Join("_", keyColumns)}] ON {prefix} ({keyStr})";
-                        if (includeCols.Count > 0)
-                            sql += $" INCLUDE ({string.Join(", ", includeCols)})";
-                        sql += ";";
-                        node.SuggestedIndex = sql;
-                    }
-                }
-            }
-
-            // Wave 3.9: Update DMLRequestSort + ActionColumn
-            node.DMLRequestSort = physicalOpEl.Attribute("DMLRequestSort")?.Value is "true" or "1";
-            var actionColEl = physicalOpEl.Element(Ns + "ActionColumn")?.Element(Ns + "ColumnReference");
-            if (actionColEl != null)
-                node.ActionColumn = FormatColumnRef(actionColEl);
-
-            // SET predicate (UPDATE operator)
-            var setPredicateEl = physicalOpEl.Element(Ns + "SetPredicate");
-            if (setPredicateEl != null)
-            {
-                var so = setPredicateEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
-                node.SetPredicate = so?.Attribute("ScalarString")?.Value;
-            }
-
-            // ActualJoinType from runtime info on adaptive joins
-            node.ActualJoinType = physicalOpEl.Attribute("ActualJoinType")?.Value;
-
-            // XSD gap: ForceSeekColumnCount (IndexScan)
-            node.ForceSeekColumnCount = (int)ParseDouble(physicalOpEl.Attribute("ForceSeekColumnCount")?.Value);
-
-            // XSD gap: PartitionId (IndexScan, TableScan, Sort, NestedLoops, AdaptiveJoin)
-            var partitionIdEl = physicalOpEl.Element(Ns + "PartitionId");
-            if (partitionIdEl != null)
-            {
-                var pidCols = partitionIdEl.Elements(Ns + "ColumnReference")
-                    .Select(c => FormatColumnRef(c))
-                    .Where(s => !string.IsNullOrEmpty(s));
-                var pidStr = string.Join(", ", pidCols);
-                if (!string.IsNullOrEmpty(pidStr))
-                    node.PartitionId = pidStr;
-            }
-
-            // XSD gap: StarJoinInfo (Hash, Merge, NL, AdaptiveJoin)
-            var starJoinEl = physicalOpEl.Element(Ns + "StarJoinInfo");
-            if (starJoinEl != null)
-            {
-                node.IsStarJoin = starJoinEl.Attribute("Root")?.Value is "true" or "1";
-                node.StarJoinOperationType = starJoinEl.Attribute("OperationType")?.Value;
-            }
-
-            // XSD gap: ProbeColumn (NL, Parallelism, Update)
-            var probeColEl = physicalOpEl.Element(Ns + "ProbeColumn")?.Element(Ns + "ColumnReference");
-            if (probeColEl != null)
-                node.ProbeColumn = FormatColumnRef(probeColEl);
-
-            // XSD gap: InRow (Parallelism)
-            node.InRow = physicalOpEl.Attribute("InRow")?.Value is "true" or "1";
-
-            // XSD gap: ComputeSequence (ComputeScalar)
-            node.ComputeSequence = physicalOpEl.Attribute("ComputeSequence")?.Value is "true" or "1";
-
-            // XSD gap: RollupInfo (StreamAggregate)
-            var rollupEl = physicalOpEl.Element(Ns + "RollupInfo");
-            if (rollupEl != null)
-            {
-                node.RollupHighestLevel = (int)ParseDouble(rollupEl.Attribute("HighestLevel")?.Value);
-                foreach (var rlEl in rollupEl.Elements(Ns + "RollupLevel"))
-                    node.RollupLevels.Add((int)ParseDouble(rlEl.Attribute("Level")?.Value));
-            }
-
-            // XSD gap: TVF ParameterList
-            var tvfParamListEl = physicalOpEl.Element(Ns + "ParameterList");
-            if (tvfParamListEl != null)
-            {
-                var tvfCols = tvfParamListEl.Elements(Ns + "ColumnReference")
-                    .Select(c => FormatColumnRef(c))
-                    .Where(s => !string.IsNullOrEmpty(s));
-                var tvfStr = string.Join(", ", tvfCols);
-                if (!string.IsNullOrEmpty(tvfStr))
-                    node.TvfParameters = tvfStr;
-                // Also check for ScalarOperator children (TVF can have scalar params)
-                if (string.IsNullOrEmpty(node.TvfParameters))
-                {
-                    var tvfScalars = tvfParamListEl.Elements(Ns + "ScalarOperator")
-                        .Select(s => s.Attribute("ScalarString")?.Value)
-                        .Where(s => !string.IsNullOrEmpty(s));
-                    var tvfScalarStr = string.Join(", ", tvfScalars);
-                    if (!string.IsNullOrEmpty(tvfScalarStr))
-                        node.TvfParameters = tvfScalarStr;
-                }
-            }
-
-            // XSD gap: OriginalActionColumn (Update)
-            var origActionColEl = physicalOpEl.Element(Ns + "OriginalActionColumn")?.Element(Ns + "ColumnReference");
-            if (origActionColEl != null)
-                node.OriginalActionColumn = FormatColumnRef(origActionColEl);
-
-            // XSD gap: Scalar UDF structured detection
-            foreach (var udfEl in ScopedDescendants(physicalOpEl, Ns + "UserDefinedFunction"))
-            {
-                var udfRef = new ScalarUdfReference
-                {
-                    FunctionName = udfEl.Attribute("FunctionName")?.Value?.Replace("[", "").Replace("]", "") ?? "",
-                    IsClrFunction = udfEl.Attribute("IsClrFunction")?.Value is "true" or "1"
-                };
-                var clrEl = udfEl.Element(Ns + "CLRFunction");
-                if (clrEl != null)
-                {
-                    udfRef.ClrAssembly = clrEl.Attribute("Assembly")?.Value;
-                    udfRef.ClrClass = clrEl.Attribute("Class")?.Value;
-                    udfRef.ClrMethod = clrEl.Attribute("Method")?.Value;
-                }
-                if (!string.IsNullOrEmpty(udfRef.FunctionName))
-                    node.ScalarUdfs.Add(udfRef);
-            }
-
-            // XSD gap: TieColumns (Top operator)
-            node.TieColumns = ParseColumnList(physicalOpEl, "TieColumns");
-
-            // XSD gap: UDXName (Extension operator)
-            node.UdxName = physicalOpEl.Attribute("UDXName")?.Value;
-
-            // XSD gap: Operator-level IndexedViewInfo
-            var opIvInfoEl = physicalOpEl.Element(Ns + "IndexedViewInfo");
-            if (opIvInfoEl != null)
-            {
-                foreach (var ivObjEl in opIvInfoEl.Elements(Ns + "Object"))
-                {
-                    var ivDb = ivObjEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
-                    var ivSchema = ivObjEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
-                    var ivTable = ivObjEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
-                    var ivIndex = ivObjEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
-                    var ivParts = new List<string>();
-                    if (!string.IsNullOrEmpty(ivDb)) ivParts.Add(ivDb);
-                    if (!string.IsNullOrEmpty(ivSchema)) ivParts.Add(ivSchema);
-                    if (!string.IsNullOrEmpty(ivTable)) ivParts.Add(ivTable);
-                    if (!string.IsNullOrEmpty(ivIndex)) ivParts.Add(ivIndex);
-                    var ivName = string.Join(".", ivParts);
-                    if (!string.IsNullOrEmpty(ivName))
-                        node.OperatorIndexedViews.Add(ivName);
-                }
-            }
-
-            // XSD gap: NamedParameterList (IndexScan)
-            var namedParamListEl = physicalOpEl.Element(Ns + "NamedParameterList");
-            if (namedParamListEl != null)
-            {
-                foreach (var npEl in namedParamListEl.Elements(Ns + "NamedParameter"))
-                {
-                    var np = new NamedParameterInfo
-                    {
-                        Name = npEl.Attribute("Name")?.Value ?? ""
-                    };
-                    var npScalar = npEl.Element(Ns + "ScalarOperator");
-                    if (npScalar != null)
-                        np.ScalarString = npScalar.Attribute("ScalarString")?.Value;
-                    if (!string.IsNullOrEmpty(np.Name))
-                        node.NamedParameters.Add(np);
-                }
-            }
-
-            // XSD gap: Remote operator metadata
-            node.RemoteDestination = physicalOpEl.Attribute("RemoteDestination")?.Value;
-            node.RemoteSource = physicalOpEl.Attribute("RemoteSource")?.Value;
-            node.RemoteObject = physicalOpEl.Attribute("RemoteObject")?.Value;
-            node.RemoteQuery = physicalOpEl.Attribute("RemoteQuery")?.Value;
-        }
-
-        // Output columns
-        var outputList = relOpEl.Element(Ns + "OutputList");
-        if (outputList != null)
-        {
-            var cols = outputList.Elements(Ns + "ColumnReference")
-                .Select(c =>
-                {
-                    var col = c.Attribute("Column")?.Value ?? "";
-                    var tbl = c.Attribute("Table")?.Value ?? "";
-                    return string.IsNullOrEmpty(tbl) ? col : $"{tbl}.{col}";
-                })
-                .Where(s => !string.IsNullOrEmpty(s));
-            var colList = string.Join(", ", cols);
-            if (!string.IsNullOrEmpty(colList))
-                node.OutputColumns = colList.Replace("[", "").Replace("]", "");
-        }
-
-        // Warnings
-        node.Warnings = ParseWarnings(relOpEl);
-
-        // Wave 3.2: MemoryFractions (on RelOp)
-        var memFracEl = relOpEl.Element(Ns + "MemoryFractions");
-        if (memFracEl != null)
-        {
-            node.MemoryFractionInput = ParseDouble(memFracEl.Attribute("Input")?.Value);
-            node.MemoryFractionOutput = ParseDouble(memFracEl.Attribute("Output")?.Value);
-        }
-
-        // Wave 3.3: RunTimePartitionSummary (on RelOp)
-        var rtPartEl = relOpEl.Element(Ns + "RunTimePartitionSummary");
-        if (rtPartEl != null)
-        {
-            var partAccEl = rtPartEl.Element(Ns + "PartitionsAccessed");
-            if (partAccEl != null)
-            {
-                node.PartitionsAccessed = (int)ParseDouble(partAccEl.Attribute("PartitionCount")?.Value);
-                var ranges = partAccEl.Elements(Ns + "PartitionRange")
-                    .Select(r => $"{r.Attribute("Start")?.Value}-{r.Attribute("End")?.Value}");
-                node.PartitionRanges = string.Join(", ", ranges);
-                if (string.IsNullOrEmpty(node.PartitionRanges))
-                    node.PartitionRanges = null;
-            }
-        }
-
-        // Wave 2.4: Per-operator memory grants (MemoryGrant on RelOp)
-        var memGrantEl = relOpEl.Element(Ns + "MemoryGrant");
-        if (memGrantEl != null)
-        {
-            node.MemoryGrantKB = ParseLong(memGrantEl.Attribute("GrantedMemory")?.Value);
-            node.DesiredMemoryKB = ParseLong(memGrantEl.Attribute("DesiredMemory")?.Value);
-            node.MaxUsedMemoryKB = ParseLong(memGrantEl.Attribute("MaxUsedMemory")?.Value);
-        }
-
-        // Runtime information (actual plan)
-        var runtimeEl = relOpEl.Element(Ns + "RunTimeInformation");
-        if (runtimeEl != null)
-        {
-            node.HasActualStats = true;
-            long totalRows = 0, totalExecutions = 0, totalRowsRead = 0;
-            long totalRebinds = 0, totalRewinds = 0;
-            long maxElapsed = 0, totalCpu = 0;
-            long totalLogicalReads = 0, totalPhysicalReads = 0;
-            long totalScans = 0, totalReadAheads = 0;
-            long totalLobLogicalReads = 0, totalLobPhysicalReads = 0, totalLobReadAheads = 0;
-            long totalSegmentReads = 0, totalSegmentSkips = 0;
-            long totalUdfCpu = 0, maxUdfElapsed = 0;
-            string? actualExecMode = null;
-
-            foreach (var thread in runtimeEl.Elements(Ns + "RunTimeCountersPerThread"))
-            {
-                totalRows += ParseLong(thread.Attribute("ActualRows")?.Value);
-                totalExecutions += ParseLong(thread.Attribute("ActualExecutions")?.Value);
-                totalRowsRead += ParseLong(thread.Attribute("ActualRowsRead")?.Value);
-                totalRebinds += ParseLong(thread.Attribute("ActualRebinds")?.Value);
-                totalRewinds += ParseLong(thread.Attribute("ActualRewinds")?.Value);
-                totalCpu += ParseLong(thread.Attribute("ActualCPUms")?.Value);
-                totalLogicalReads += ParseLong(thread.Attribute("ActualLogicalReads")?.Value);
-                totalPhysicalReads += ParseLong(thread.Attribute("ActualPhysicalReads")?.Value);
-                totalScans += ParseLong(thread.Attribute("ActualScans")?.Value);
-                totalReadAheads += ParseLong(thread.Attribute("ActualReadAheads")?.Value);
-                totalLobLogicalReads += ParseLong(thread.Attribute("ActualLobLogicalReads")?.Value);
-                totalLobPhysicalReads += ParseLong(thread.Attribute("ActualLobPhysicalReads")?.Value);
-                totalLobReadAheads += ParseLong(thread.Attribute("ActualLobReadAheads")?.Value);
-
-                // Wave 3.10: Columnstore segment reads/skips
-                totalSegmentReads += ParseLong(thread.Attribute("ActualSegmentReads")?.Value);
-                totalSegmentSkips += ParseLong(thread.Attribute("ActualSegmentSkips")?.Value);
-
-                // Wave 3.11: UDF timing
-                totalUdfCpu += ParseLong(thread.Attribute("UdfCpuTime")?.Value);
-                var udfElapsed = ParseLong(thread.Attribute("UdfElapsedTime")?.Value);
-                if (udfElapsed > maxUdfElapsed) maxUdfElapsed = udfElapsed;
-
-                actualExecMode ??= thread.Attribute("ActualExecutionMode")?.Value;
-
-                var elapsed = ParseLong(thread.Attribute("ActualElapsedms")?.Value);
-                if (elapsed > maxElapsed) maxElapsed = elapsed;
-            }
-
-            node.ActualRows = totalRows;
-            node.ActualExecutions = totalExecutions;
-            node.ActualRowsRead = totalRowsRead;
-            node.ActualRebinds = totalRebinds;
-            node.ActualRewinds = totalRewinds;
-            node.ActualElapsedMs = maxElapsed;
-            node.ActualCPUMs = totalCpu;
-            node.ActualLogicalReads = totalLogicalReads;
-            node.ActualPhysicalReads = totalPhysicalReads;
-            node.ActualScans = totalScans;
-            node.ActualReadAheads = totalReadAheads;
-            node.ActualLobLogicalReads = totalLobLogicalReads;
-            node.ActualLobPhysicalReads = totalLobPhysicalReads;
-            node.ActualLobReadAheads = totalLobReadAheads;
-            node.ActualExecutionMode = actualExecMode;
-            node.ActualSegmentReads = totalSegmentReads;
-            node.ActualSegmentSkips = totalSegmentSkips;
-            node.UdfCpuTimeUs = totalUdfCpu;
-            node.UdfElapsedTimeUs = maxUdfElapsed;
-
-            // Store per-thread data for parallel skew analysis
-            foreach (var thread in runtimeEl.Elements(Ns + "RunTimeCountersPerThread"))
-            {
-                node.PerThreadStats.Add(new PerThreadRuntimeInfo
-                {
-                    ThreadId = (int)ParseDouble(thread.Attribute("Thread")?.Value),
-                    ActualRows = ParseLong(thread.Attribute("ActualRows")?.Value),
-                    ActualExecutions = ParseLong(thread.Attribute("ActualExecutions")?.Value),
-                    ActualElapsedMs = ParseLong(thread.Attribute("ActualElapsedms")?.Value),
-                    ActualCPUMs = ParseLong(thread.Attribute("ActualCPUms")?.Value),
-                    ActualRowsRead = ParseLong(thread.Attribute("ActualRowsRead")?.Value),
-                    ActualLogicalReads = ParseLong(thread.Attribute("ActualLogicalReads")?.Value),
-                    ActualPhysicalReads = ParseLong(thread.Attribute("ActualPhysicalReads")?.Value),
-                    ActualScans = ParseLong(thread.Attribute("ActualScans")?.Value),
-                    ActualReadAheads = ParseLong(thread.Attribute("ActualReadAheads")?.Value),
-                    FirstActiveTime = ParseLong(thread.Attribute("FirstActiveTime")?.Value),
-                    LastActiveTime = ParseLong(thread.Attribute("LastActiveTime")?.Value),
-                    OpenTime = ParseLong(thread.Attribute("OpenTime")?.Value),
-                    FirstRowTime = ParseLong(thread.Attribute("FirstRowTime")?.Value),
-                    LastRowTime = ParseLong(thread.Attribute("LastRowTime")?.Value),
-                    CloseTime = ParseLong(thread.Attribute("CloseTime")?.Value),
-                    InputMemoryGrant = ParseLong(thread.Attribute("InputMemoryGrant")?.Value),
-                    OutputMemoryGrant = ParseLong(thread.Attribute("OutputMemoryGrant")?.Value),
-                    UsedMemoryGrant = ParseLong(thread.Attribute("UsedMemoryGrant")?.Value),
-                    Batches = ParseLong(thread.Attribute("Batches")?.Value),
-                    ActualEndOfScans = ParseLong(thread.Attribute("ActualEndOfScans")?.Value),
-                    ActualLocallyAggregatedRows = ParseLong(thread.Attribute("ActualLocallyAggregatedRows")?.Value),
-                    IsInterleavedExecuted = thread.Attribute("IsInterleavedExecuted")?.Value is "true" or "1",
-                    RowRequalifications = ParseLong(thread.Attribute("RowRequalifications")?.Value)
-                });
-            }
-        }
-
-        // Recurse into child RelOps
-        foreach (var childRelOp in FindChildRelOps(relOpEl))
-        {
-            var childNode = ParseRelOp(childRelOp);
-            childNode.Parent = node;
-            node.Children.Add(childNode);
-        }
-
-        return node;
-    }
-
-    private static XElement? GetOperatorElement(XElement relOpEl)
-    {
-        foreach (var child in relOpEl.Elements())
-        {
-            var name = child.Name.LocalName;
-            if (name != "OutputList" && name != "RunTimeInformation" && name != "Warnings"
-                && name != "MemoryFractions" && name != "RunTimePartitionSummary"
-                && name != "MemoryGrant" && name != "InternalInfo")
-            {
-                return child;
-            }
-        }
-        return null;
-    }
-
-    private static IEnumerable<XElement> FindChildRelOps(XElement relOpEl)
-    {
-        var operatorEl = GetOperatorElement(relOpEl);
-        if (operatorEl == null) yield break;
-
-        foreach (var child in operatorEl.Elements(Ns + "RelOp"))
-            yield return child;
-
-        foreach (var child in operatorEl.Elements())
-        {
-            if (child.Name.LocalName == "RelOp") continue;
-            foreach (var nestedRelOp in child.Elements(Ns + "RelOp"))
-                yield return nestedRelOp;
-        }
-    }
-
-    private static List<MissingIndex> ParseMissingIndexes(XElement queryPlanEl)
-    {
-        var result = new List<MissingIndex>();
-        var missingIndexesEl = queryPlanEl.Element(Ns + "MissingIndexes");
-        if (missingIndexesEl == null) return result;
-
-        foreach (var groupEl in missingIndexesEl.Elements(Ns + "MissingIndexGroup"))
-        {
-            var impact = ParseDouble(groupEl.Attribute("Impact")?.Value);
-            foreach (var indexEl in groupEl.Elements(Ns + "MissingIndex"))
-            {
-                var mi = new MissingIndex
-                {
-                    Database = indexEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "") ?? "",
-                    Schema = indexEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "") ?? "",
-                    Table = indexEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "",
-                    Impact = impact
-                };
-
-                foreach (var colGroup in indexEl.Elements(Ns + "ColumnGroup"))
-                {
-                    var usage = colGroup.Attribute("Usage")?.Value ?? "";
-                    var cols = colGroup.Elements(Ns + "Column")
-                        .Select(c => c.Attribute("Name")?.Value?.Replace("[", "").Replace("]", "") ?? "")
-                        .Where(s => !string.IsNullOrEmpty(s))
-                        .ToList();
-
-                    switch (usage)
-                    {
-                        case "EQUALITY": mi.EqualityColumns = cols; break;
-                        case "INEQUALITY": mi.InequalityColumns = cols; break;
-                        case "INCLUDE": mi.IncludeColumns = cols; break;
-                    }
-                }
-
-                var keyCols = mi.EqualityColumns.Concat(mi.InequalityColumns).ToList();
-                if (keyCols.Count > 0)
-                {
-                    var create = $"CREATE NONCLUSTERED INDEX [IX_{mi.Table}_{string.Join("_", keyCols.Take(3))}]\nON {mi.Schema}.{mi.Table} ({string.Join(", ", keyCols)})";
-                    if (mi.IncludeColumns.Count > 0)
-                        create += $"\nINCLUDE ({string.Join(", ", mi.IncludeColumns)})";
-                    mi.CreateStatement = create;
-                }
-
-                result.Add(mi);
-            }
-        }
-        return result;
-    }
-
-    /// <summary>
-    /// Parse warnings from a parent element that contains a &lt;Warnings&gt; child (e.g. RelOp).
-    /// </summary>
-    private static List<PlanWarning> ParseWarnings(XElement parentEl)
-    {
-        var warningsEl = parentEl.Element(Ns + "Warnings");
-        if (warningsEl == null) return new List<PlanWarning>();
-        return ParseWarningsFromElement(warningsEl);
-    }
-
-    /// <summary>
-    /// Parse warnings directly from a &lt;Warnings&gt; element.
-    /// </summary>
-    private static List<PlanWarning> ParseWarningsFromElement(XElement warningsEl)
-    {
-        var result = new List<PlanWarning>();
-
-        // No join predicate
-        if (warningsEl.Attribute("NoJoinPredicate")?.Value is "true" or "1")
-        {
-            result.Add(new PlanWarning
-            {
-                WarningType = "No Join Predicate",
-                Message = "This join has no join predicate (possible cross join)",
-                Severity = PlanWarningSeverity.Critical
-            });
-        }
-
-        if (warningsEl.Attribute("SpatialGuess")?.Value is "true" or "1")
-        {
-            result.Add(new PlanWarning
-            {
-                WarningType = "Spatial Guess",
-                Message = "Spatial index selectivity was guessed",
-                Severity = PlanWarningSeverity.Info
-            });
-        }
-
-        if (warningsEl.Attribute("UnmatchedIndexes")?.Value is "true" or "1")
-        {
-            result.Add(new PlanWarning
-            {
-                WarningType = "Unmatched Indexes",
-                Message = "Indexes could not be matched due to parameterization",
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
-
-        if (warningsEl.Attribute("FullUpdateForOnlineIndexBuild")?.Value is "true" or "1")
-        {
-            result.Add(new PlanWarning
-            {
-                WarningType = "Full Update for Online Index Build",
-                Message = "Full update required for online index build operation",
-                Severity = PlanWarningSeverity.Info
-            });
-        }
-
-        // Spill to TempDb (with enhanced details — Wave 3.7)
-        foreach (var spillEl in warningsEl.Elements(Ns + "SpillToTempDb"))
-        {
-            var spillLevel = spillEl.Attribute("SpillLevel")?.Value ?? "?";
-            var threadCount = spillEl.Attribute("SpilledThreadCount")?.Value ?? "?";
-            var msg = $"Spill level {spillLevel}, {threadCount} thread(s)";
-
-            var grantedKB = ParseLong(spillEl.Attribute("GrantedMemoryKB")?.Value);
-            var usedKB = ParseLong(spillEl.Attribute("UsedMemoryKB")?.Value);
-            var writes = ParseLong(spillEl.Attribute("WritesToTempDb")?.Value);
-            var reads = ParseLong(spillEl.Attribute("ReadsFromTempDb")?.Value);
-            if (grantedKB > 0 || writes > 0)
-            {
-                msg += $" — Granted: {grantedKB:N0} KB, Used: {usedKB:N0} KB";
-                if (writes > 0) msg += $", Writes: {writes:N0}";
-                if (reads > 0) msg += $", Reads: {reads:N0}";
-            }
-
-            result.Add(new PlanWarning
-            {
-                WarningType = "Spill to TempDb",
-                Message = msg,
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
-
-        // Sort spill details
-        foreach (var sortSpillEl in warningsEl.Elements(Ns + "SortSpillDetails"))
-        {
-            result.Add(new PlanWarning
-            {
-                WarningType = "Sort Spill",
-                Message = $"Sort spill — Granted: {ParseLong(sortSpillEl.Attribute("GrantedMemoryKb")?.Value):N0} KB, Used: {ParseLong(sortSpillEl.Attribute("UsedMemoryKb")?.Value):N0} KB, Writes: {ParseLong(sortSpillEl.Attribute("WritesToTempDb")?.Value):N0}, Reads: {ParseLong(sortSpillEl.Attribute("ReadsFromTempDb")?.Value):N0}",
-                Severity = PlanWarningSeverity.Warning,
-                SpillDetails = new SpillDetail
-                {
-                    SpillType = "Sort",
-                    GrantedMemoryKB = ParseLong(sortSpillEl.Attribute("GrantedMemoryKb")?.Value),
-                    UsedMemoryKB = ParseLong(sortSpillEl.Attribute("UsedMemoryKb")?.Value),
-                    WritesToTempDb = ParseLong(sortSpillEl.Attribute("WritesToTempDb")?.Value),
-                    ReadsFromTempDb = ParseLong(sortSpillEl.Attribute("ReadsFromTempDb")?.Value)
-                }
-            });
-        }
-
-        // Hash spill details
-        foreach (var hashSpillEl in warningsEl.Elements(Ns + "HashSpillDetails"))
-        {
-            result.Add(new PlanWarning
-            {
-                WarningType = "Hash Spill",
-                Message = $"Hash spill — Granted: {ParseLong(hashSpillEl.Attribute("GrantedMemoryKb")?.Value):N0} KB, Used: {ParseLong(hashSpillEl.Attribute("UsedMemoryKb")?.Value):N0} KB, Writes: {ParseLong(hashSpillEl.Attribute("WritesToTempDb")?.Value):N0}, Reads: {ParseLong(hashSpillEl.Attribute("ReadsFromTempDb")?.Value):N0}",
-                Severity = PlanWarningSeverity.Warning,
-                SpillDetails = new SpillDetail
-                {
-                    SpillType = "Hash",
-                    GrantedMemoryKB = ParseLong(hashSpillEl.Attribute("GrantedMemoryKb")?.Value),
-                    UsedMemoryKB = ParseLong(hashSpillEl.Attribute("UsedMemoryKb")?.Value),
-                    WritesToTempDb = ParseLong(hashSpillEl.Attribute("WritesToTempDb")?.Value),
-                    ReadsFromTempDb = ParseLong(hashSpillEl.Attribute("ReadsFromTempDb")?.Value)
-                }
-            });
-        }
-
-        // Exchange spill details
-        foreach (var exchSpillEl in warningsEl.Elements(Ns + "ExchangeSpillDetails"))
-        {
-            result.Add(new PlanWarning
-            {
-                WarningType = "Exchange Spill",
-                Message = $"Exchange spill — Writes: {ParseLong(exchSpillEl.Attribute("WritesToTempDb")?.Value):N0}",
-                Severity = PlanWarningSeverity.Warning,
-                SpillDetails = new SpillDetail
-                {
-                    SpillType = "Exchange",
-                    WritesToTempDb = ParseLong(exchSpillEl.Attribute("WritesToTempDb")?.Value)
-                }
-            });
-        }
-
-        // SpillOccurred
-        var spillOccurredEl = warningsEl.Element(Ns + "SpillOccurred");
-        if (spillOccurredEl != null)
-        {
-            result.Add(new PlanWarning
-            {
-                WarningType = "Spill Occurred",
-                Message = "Spill occurred during execution (from last query plan stats)",
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
-
-        // Memory grant warning
-        var memWarnEl = warningsEl.Element(Ns + "MemoryGrantWarning");
-        if (memWarnEl != null)
-        {
-            var kind = memWarnEl.Attribute("GrantWarningKind")?.Value ?? "Unknown";
-            var requested = ParseLong(memWarnEl.Attribute("RequestedMemory")?.Value);
-            var granted = ParseLong(memWarnEl.Attribute("GrantedMemory")?.Value);
-            var maxUsed = ParseLong(memWarnEl.Attribute("MaxUsedMemory")?.Value);
-            result.Add(new PlanWarning
-            {
-                WarningType = "Memory Grant",
-                Message = $"{kind}: Requested {requested:N0} KB, Granted {granted:N0} KB, Used {maxUsed:N0} KB",
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
-
-        // Implicit conversions
-        foreach (var convertEl in warningsEl.Elements(Ns + "PlanAffectingConvert"))
-        {
-            var issue = convertEl.Attribute("ConvertIssue")?.Value ?? "Unknown";
-            var expr = convertEl.Attribute("Expression")?.Value ?? "";
-            result.Add(new PlanWarning
-            {
-                WarningType = "Implicit Conversion",
-                Message = $"{issue}: {expr}",
-                Severity = issue.Contains("Cardinality") ? PlanWarningSeverity.Warning : PlanWarningSeverity.Critical
-            });
-        }
-
-        // Columns with no statistics
-        var noStatsEl = warningsEl.Element(Ns + "ColumnsWithNoStatistics");
-        if (noStatsEl != null)
-        {
-            var cols = noStatsEl.Elements(Ns + "ColumnReference")
-                .Select(c => c.Attribute("Column")?.Value ?? "")
-                .Where(s => !string.IsNullOrEmpty(s));
-            result.Add(new PlanWarning
-            {
-                WarningType = "Missing Statistics",
-                Message = $"No statistics on: {string.Join(", ", cols)}",
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
-
-        // Wave 2.3: Columns with stale statistics
-        var staleStatsEl = warningsEl.Element(Ns + "ColumnsWithStaleStatistics");
-        if (staleStatsEl != null)
-        {
-            var cols = staleStatsEl.Elements(Ns + "ColumnReference")
-                .Select(c => c.Attribute("Column")?.Value ?? "")
-                .Where(s => !string.IsNullOrEmpty(s));
-            result.Add(new PlanWarning
-            {
-                WarningType = "Stale Statistics",
-                Message = $"Stale statistics on: {string.Join(", ", cols)}",
-                Severity = PlanWarningSeverity.Warning
-            });
-        }
-
-        // Wait warnings
-        foreach (var waitEl in warningsEl.Elements(Ns + "Wait"))
-        {
-            result.Add(new PlanWarning
-            {
-                WarningType = "Wait",
-                Message = $"{waitEl.Attribute("WaitType")?.Value}: {waitEl.Attribute("WaitTime")?.Value}ms",
-                Severity = PlanWarningSeverity.Info
-            });
-        }
-
-        return result;
-    }
-
-    private static void ComputeOperatorCosts(ParsedPlan plan)
-    {
-        foreach (var batch in plan.Batches)
-        {
-            foreach (var stmt in batch.Statements)
-            {
-                if (stmt.RootNode == null) continue;
-                var totalCost = stmt.StatementSubTreeCost > 0
-                    ? stmt.StatementSubTreeCost
-                    : stmt.RootNode.EstimatedTotalSubtreeCost;
-                if (totalCost <= 0) totalCost = 1;
-                ComputeNodeCosts(stmt.RootNode, totalCost);
-            }
-        }
-    }
-
-    private static void ComputeNodeCosts(PlanNode node, double totalStatementCost)
-    {
-        var childrenSubtreeCost = node.Children.Sum(c => c.EstimatedTotalSubtreeCost);
-        node.EstimatedOperatorCost = Math.Max(0, node.EstimatedTotalSubtreeCost - childrenSubtreeCost);
-        node.CostPercent = (int)Math.Round((node.EstimatedOperatorCost / totalStatementCost) * 100);
-        node.CostPercent = Math.Min(100, Math.Max(0, node.CostPercent));
-
-        foreach (var child in node.Children)
-            ComputeNodeCosts(child, totalStatementCost);
-    }
-
-    private static IEnumerable<XElement> ScopedDescendants(XElement element, XName name)
-    {
-        foreach (var child in element.Elements())
-        {
-            if (child.Name == Ns + "RelOp") continue;
-            if (child.Name == name) yield return child;
-            foreach (var desc in ScopedDescendants(child, name))
-                yield return desc;
-        }
-    }
-
-    private static string? ParseColumnList(XElement parent, string elementName)
-    {
-        var el = parent.Element(Ns + elementName);
-        if (el == null) return null;
-        var cols = el.Elements(Ns + "ColumnReference")
-            .Select(c => FormatColumnRef(c))
-            .Where(s => !string.IsNullOrEmpty(s));
-        var result = string.Join(", ", cols);
-        return string.IsNullOrEmpty(result) ? null : result;
-    }
-
-    private static string FormatColumnRef(XElement colRef)
-    {
-        var col = colRef.Attribute("Column")?.Value ?? "";
-        var tbl = colRef.Attribute("Table")?.Value ?? "";
-        var result = string.IsNullOrEmpty(tbl) ? col : $"{tbl}.{col}";
-        return result.Replace("[", "").Replace("]", "");
-    }
-
-    private static double ParseDouble(string? value)
-    {
-        if (string.IsNullOrEmpty(value)) return 0;
-        return double.TryParse(value, System.Globalization.NumberStyles.Float,
-            System.Globalization.CultureInfo.InvariantCulture, out var result) ? result : 0;
-    }
-
-    private static long ParseLong(string? value)
-    {
-        if (string.IsNullOrEmpty(value)) return 0;
-        return long.TryParse(value, out var result) ? result : 0;
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Xml.Linq;
+using PerformanceMonitorLite.Models;
+
+namespace PerformanceMonitorLite.Services;
+
+public static class ShowPlanParser
+{
+    private static readonly XNamespace Ns = "http://schemas.microsoft.com/sqlserver/2004/07/showplan";
+
+    public static ParsedPlan Parse(string xml)
+    {
+        var plan = new ParsedPlan { RawXml = xml };
+
+        XDocument doc;
+        try
+        {
+            doc = XDocument.Parse(xml);
+        }
+        catch
+        {
+            return plan;
+        }
+
+        var root = doc.Root;
+        if (root == null) return plan;
+
+        plan.BuildVersion = root.Attribute("Version")?.Value;
+        plan.Build = root.Attribute("Build")?.Value;
+        plan.ClusteredMode = root.Attribute("ClusteredMode")?.Value is "true" or "1";
+
+        // Standard path: ShowPlanXML → BatchSequence → Batch → Statements
+        var batches = root.Descendants(Ns + "Batch");
+        foreach (var batchEl in batches)
+        {
+            var batch = new PlanBatch();
+            var statementsEl = batchEl.Element(Ns + "Statements");
+            if (statementsEl != null)
+            {
+                foreach (var stmtEl in statementsEl.Elements())
+                {
+                    var stmts = ParseStatementAndChildren(stmtEl);
+                    batch.Statements.AddRange(stmts);
+                }
+            }
+            if (batch.Statements.Count > 0)
+                plan.Batches.Add(batch);
+        }
+
+        // Fallback: some plan XML has StmtSimple directly under QueryPlan
+        if (plan.Batches.Count == 0)
+        {
+            var batch = new PlanBatch();
+            foreach (var stmtEl in root.Descendants(Ns + "StmtSimple"))
+            {
+                var stmt = ParseStatement(stmtEl);
+                if (stmt != null)
+                    batch.Statements.Add(stmt);
+            }
+            if (batch.Statements.Count > 0)
+                plan.Batches.Add(batch);
+        }
+
+        ComputeOperatorCosts(plan);
+        return plan;
+    }
+
+    /// <summary>
+    /// Handles StmtSimple, StmtCond (IF/ELSE), and StmtCursor recursively.
+    /// Returns a flat list of all parseable statements found.
+    /// </summary>
+    private static List<PlanStatement> ParseStatementAndChildren(XElement stmtEl)
+    {
+        var results = new List<PlanStatement>();
+        var localName = stmtEl.Name.LocalName;
+
+        if (localName == "StmtCond")
+        {
+            // IF/ELSE blocks — recurse into Condition, Then, Else
+            var condEl = stmtEl.Element(Ns + "Condition");
+            if (condEl != null)
+            {
+                foreach (var child in condEl.Elements())
+                    results.AddRange(ParseStatementAndChildren(child));
+            }
+
+            var thenStmts = stmtEl.Element(Ns + "Then")?.Element(Ns + "Statements");
+            if (thenStmts != null)
+            {
+                foreach (var child in thenStmts.Elements())
+                    results.AddRange(ParseStatementAndChildren(child));
+            }
+
+            var elseStmts = stmtEl.Element(Ns + "Else")?.Element(Ns + "Statements");
+            if (elseStmts != null)
+            {
+                foreach (var child in elseStmts.Elements())
+                    results.AddRange(ParseStatementAndChildren(child));
+            }
+        }
+        else if (localName == "StmtCursor")
+        {
+            // Cursor plans — parse each Operation's QueryPlan
+            var cursorPlanEl = stmtEl.Element(Ns + "CursorPlan");
+            if (cursorPlanEl != null)
+            {
+                var cursorName = cursorPlanEl.Attribute("CursorName")?.Value;
+                var cursorActualType = cursorPlanEl.Attribute("CursorActualType")?.Value;
+                var cursorRequestedType = cursorPlanEl.Attribute("CursorRequestedType")?.Value;
+                var cursorConcurrency = cursorPlanEl.Attribute("CursorConcurrency")?.Value;
+                var cursorForwardOnly = cursorPlanEl.Attribute("ForwardOnly")?.Value is "true" or "1";
+
+                foreach (var opEl in cursorPlanEl.Elements(Ns + "Operation"))
+                {
+                    var opType = opEl.Attribute("OperationType")?.Value ?? "CursorOp";
+                    var qpEl = opEl.Element(Ns + "QueryPlan");
+                    if (qpEl == null) continue;
+
+                    // Build a synthetic StmtSimple-like wrapper for ParseStatement
+                    var relOpEl = qpEl.Element(Ns + "RelOp");
+                    if (relOpEl == null) continue;
+
+                    var stmt = ParseQueryPlanAsStatement(stmtEl, qpEl, relOpEl);
+                    if (stmt != null)
+                    {
+                        // Override statement text with cursor context
+                        if (string.IsNullOrEmpty(stmt.StatementText))
+                            stmt.StatementText = $"Cursor: {cursorName} ({opType})";
+                        stmt.CursorName = cursorName;
+                        stmt.CursorActualType = cursorActualType;
+                        stmt.CursorRequestedType = cursorRequestedType;
+                        stmt.CursorConcurrency = cursorConcurrency;
+                        stmt.CursorForwardOnly = cursorForwardOnly;
+                        results.Add(stmt);
+                    }
+                }
+            }
+        }
+        else
+        {
+            // StmtSimple or any other statement type
+            var stmt = ParseStatement(stmtEl);
+            if (stmt != null)
+                results.Add(stmt);
+        }
+
+        return results;
+    }
+
+    private static PlanStatement? ParseStatement(XElement stmtEl)
+    {
+        var stmt = new PlanStatement
+        {
+            StatementText = stmtEl.Attribute("StatementText")?.Value ?? "",
+            StatementType = stmtEl.Attribute("StatementType")?.Value ?? "",
+            StatementSubTreeCost = ParseDouble(stmtEl.Attribute("StatementSubTreeCost")?.Value),
+            StatementEstRows = ParseDouble(stmtEl.Attribute("StatementEstRows")?.Value)
+        };
+
+        // StmtUseDb: capture the Database attribute
+        if (stmtEl.Name.LocalName == "StmtUseDb")
+            stmt.StmtUseDatabaseName = stmtEl.Attribute("Database")?.Value;
+
+        var queryPlanEl = stmtEl.Element(Ns + "QueryPlan");
+
+        // XSD gap: Dispatcher/PSP (on StmtSimple, not inside QueryPlan)
+        var dispatcherEl = stmtEl.Element(Ns + "Dispatcher");
+        if (dispatcherEl != null)
+        {
+            stmt.Dispatcher = new DispatcherInfo();
+            foreach (var pspEl in dispatcherEl.Elements(Ns + "ParameterSensitivePredicate"))
+            {
+                var psp = new ParameterSensitivePredicateInfo
+                {
+                    LowBoundary = ParseDouble(pspEl.Attribute("LowBoundary")?.Value),
+                    HighBoundary = ParseDouble(pspEl.Attribute("HighBoundary")?.Value)
+                };
+                var predEl = pspEl.Element(Ns + "Predicate")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                psp.PredicateText = predEl?.Attribute("ScalarString")?.Value;
+                foreach (var statEl in pspEl.Elements(Ns + "StatisticsInfo"))
+                {
+                    psp.Statistics.Add(new OptimizerStatsUsageItem
+                    {
+                        StatisticsName = statEl.Attribute("Statistics")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                        TableName = statEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                        DatabaseName = statEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", ""),
+                        SchemaName = statEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", ""),
+                        ModificationCount = ParseLong(statEl.Attribute("ModificationCount")?.Value),
+                        SamplingPercent = ParseDouble(statEl.Attribute("SamplingPercent")?.Value),
+                        LastUpdate = statEl.Attribute("LastUpdate")?.Value
+                    });
+                }
+                stmt.Dispatcher.ParameterSensitivePredicates.Add(psp);
+            }
+            foreach (var oppEl in dispatcherEl.Elements(Ns + "OptionalParameterPredicate"))
+            {
+                var opp = new OptionalParameterPredicateInfo();
+                var oppPredEl = oppEl.Element(Ns + "Predicate")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                opp.PredicateText = oppPredEl?.Attribute("ScalarString")?.Value;
+                stmt.Dispatcher.OptionalParameterPredicates.Add(opp);
+            }
+        }
+
+        if (queryPlanEl == null) return stmt;
+
+        ParseStmtAttributes(stmt, stmtEl);
+        ParseQueryPlanElements(stmt, stmtEl, queryPlanEl);
+
+        // Root RelOp — wrap in a synthetic statement-type node (SELECT, INSERT, etc.)
+        var relOpEl = queryPlanEl.Element(Ns + "RelOp");
+        if (relOpEl != null)
+        {
+            var opNode = ParseRelOp(relOpEl);
+            var stmtType = stmt.StatementType.Length > 0
+                ? stmt.StatementType.ToUpperInvariant()
+                : "QUERY";
+
+            var stmtNode = new PlanNode
+            {
+                NodeId = -1,
+                PhysicalOp = stmtType,
+                LogicalOp = stmtType,
+                EstimatedTotalSubtreeCost = stmt.StatementSubTreeCost,
+                EstimateRows = stmt.StatementEstRows,
+                IconName = stmtType switch
+                {
+                    "SELECT" => "result",
+                    "INSERT" => "insert",
+                    "UPDATE" => "update",
+                    "DELETE" => "delete",
+                    _ => "language_construct_catch_all"
+                }
+            };
+            opNode.Parent = stmtNode;
+            stmtNode.Children.Add(opNode);
+            stmt.RootNode = stmtNode;
+        }
+
+        // XSD gap: UDF sub-plans
+        foreach (var udfEl in stmtEl.Elements(Ns + "UDF"))
+        {
+            var udfInfo = new FunctionPlanInfo
+            {
+                ProcName = udfEl.Attribute("ProcName")?.Value ?? "",
+                IsNativelyCompiled = udfEl.Attribute("IsNativelyCompiled")?.Value is "true" or "1"
+            };
+            var udfStmts = udfEl.Element(Ns + "Statements");
+            if (udfStmts != null)
+            {
+                foreach (var childStmt in udfStmts.Elements())
+                {
+                    var parsed = ParseStatementAndChildren(childStmt);
+                    udfInfo.Statements.AddRange(parsed);
+                }
+            }
+            stmt.UdfPlans.Add(udfInfo);
+        }
+
+        // XSD gap: StoredProc sub-plan
+        var storedProcEl = stmtEl.Element(Ns + "StoredProc");
+        if (storedProcEl != null)
+        {
+            var spInfo = new FunctionPlanInfo
+            {
+                ProcName = storedProcEl.Attribute("ProcName")?.Value ?? "",
+                IsNativelyCompiled = storedProcEl.Attribute("IsNativelyCompiled")?.Value is "true" or "1"
+            };
+            var spStmts = storedProcEl.Element(Ns + "Statements");
+            if (spStmts != null)
+            {
+                foreach (var childStmt in spStmts.Elements())
+                {
+                    var parsed = ParseStatementAndChildren(childStmt);
+                    spInfo.Statements.AddRange(parsed);
+                }
+            }
+            stmt.StoredProcPlan = spInfo;
+        }
+
+        return stmt;
+    }
+
+    /// <summary>
+    /// Parse a QueryPlan element that comes from a cursor Operation (no parent StmtSimple attributes).
+    /// </summary>
+    private static PlanStatement? ParseQueryPlanAsStatement(XElement stmtEl, XElement queryPlanEl, XElement relOpEl)
+    {
+        var stmt = new PlanStatement
+        {
+            StatementText = stmtEl.Attribute("StatementText")?.Value ?? "",
+            StatementType = stmtEl.Attribute("StatementType")?.Value ?? "SELECT",
+            StatementSubTreeCost = ParseDouble(stmtEl.Attribute("StatementSubTreeCost")?.Value)
+        };
+
+        ParseStmtAttributes(stmt, stmtEl);
+        ParseQueryPlanElements(stmt, stmtEl, queryPlanEl);
+
+        var opNode = ParseRelOp(relOpEl);
+        var stmtType = stmt.StatementType.Length > 0
+            ? stmt.StatementType.ToUpperInvariant()
+            : "QUERY";
+
+        // Use subtree cost from RelOp if statement cost is 0
+        if (stmt.StatementSubTreeCost <= 0)
+            stmt.StatementSubTreeCost = opNode.EstimatedTotalSubtreeCost;
+
+        var stmtNode = new PlanNode
+        {
+            NodeId = -1,
+            PhysicalOp = stmtType,
+            LogicalOp = stmtType,
+            EstimatedTotalSubtreeCost = stmt.StatementSubTreeCost,
+            EstimateRows = stmt.StatementEstRows,
+            IconName = stmtType switch
+            {
+                "SELECT" => "result",
+                "INSERT" => "insert",
+                "UPDATE" => "update",
+                "DELETE" => "delete",
+                _ => "language_construct_catch_all"
+            }
+        };
+        opNode.Parent = stmtNode;
+        stmtNode.Children.Add(opNode);
+        stmt.RootNode = stmtNode;
+
+        return stmt;
+    }
+
+    /// <summary>
+    /// Parse attributes from StmtSimple element.
+    /// </summary>
+    private static void ParseStmtAttributes(PlanStatement stmt, XElement stmtEl)
+    {
+        stmt.StatementOptmLevel = stmtEl.Attribute("StatementOptmLevel")?.Value;
+        stmt.StatementOptmEarlyAbortReason = stmtEl.Attribute("StatementOptmEarlyAbortReason")?.Value;
+        stmt.StatementParameterizationType = (int)ParseDouble(stmtEl.Attribute("StatementParameterizationType")?.Value);
+        stmt.StatementSqlHandle = stmtEl.Attribute("StatementSqlHandle")?.Value;
+        stmt.DatabaseContextSettingsId = ParseLong(stmtEl.Attribute("DatabaseContextSettingsId")?.Value);
+        stmt.ParentObjectId = (int)ParseDouble(stmtEl.Attribute("ParentObjectId")?.Value);
+        stmt.SecurityPolicyApplied = stmtEl.Attribute("SecurityPolicyApplied")?.Value is "true" or "1";
+        stmt.BatchModeOnRowStoreUsed = stmtEl.Attribute("BatchModeOnRowStoreUsed")?.Value is "true" or "1";
+        stmt.QueryHash = stmtEl.Attribute("QueryHash")?.Value;
+        stmt.QueryPlanHash = stmtEl.Attribute("QueryPlanHash")?.Value;
+
+        // Bug fix 1.3: CE version is on StmtSimple per XSD
+        stmt.CardinalityEstimationModelVersion = (int)ParseDouble(stmtEl.Attribute("CardinalityEstimationModelVersion")?.Value);
+
+        // Wave 3.6: Query Store hint attributes
+        stmt.QueryStoreStatementHintId = (int)ParseDouble(stmtEl.Attribute("QueryStoreStatementHintId")?.Value);
+        stmt.QueryStoreStatementHintText = stmtEl.Attribute("QueryStoreStatementHintText")?.Value;
+        stmt.QueryStoreStatementHintSource = stmtEl.Attribute("QueryStoreStatementHintSource")?.Value;
+
+        // XSD gap: Statement-level identifiers and handles
+        stmt.StatementId = (int)ParseDouble(stmtEl.Attribute("StatementId")?.Value);
+        stmt.StatementCompId = (int)ParseDouble(stmtEl.Attribute("StatementCompId")?.Value);
+        stmt.TemplatePlanGuideDB = stmtEl.Attribute("TemplatePlanGuideDB")?.Value;
+        stmt.TemplatePlanGuideName = stmtEl.Attribute("TemplatePlanGuideName")?.Value;
+        stmt.ParameterizedPlanHandle = stmtEl.Attribute("ParameterizedPlanHandle")?.Value;
+        stmt.BatchSqlHandle = stmtEl.Attribute("BatchSqlHandle")?.Value;
+        stmt.ContainsLedgerTables = stmtEl.Attribute("ContainsLedgerTables")?.Value is "true" or "1";
+        stmt.QueryCompilationReplay = (int)ParseDouble(stmtEl.Attribute("QueryCompilationReplay")?.Value);
+    }
+
+    /// <summary>
+    /// Parse child elements of QueryPlan (memory grant, stats, parameters, etc.)
+    /// </summary>
+    private static void ParseQueryPlanElements(PlanStatement stmt, XElement stmtEl, XElement queryPlanEl)
+    {
+        // StatementSetOptions (child element of StmtSimple)
+        var setOptsEl = stmtEl.Element(Ns + "StatementSetOptions");
+        if (setOptsEl != null)
+        {
+            stmt.SetOptions = new SetOptionsInfo
+            {
+                AnsiNulls = setOptsEl.Attribute("ANSI_NULLS")?.Value is "true" or "1",
+                AnsiPadding = setOptsEl.Attribute("ANSI_PADDING")?.Value is "true" or "1",
+                AnsiWarnings = setOptsEl.Attribute("ANSI_WARNINGS")?.Value is "true" or "1",
+                ArithAbort = setOptsEl.Attribute("ARITHABORT")?.Value is "true" or "1",
+                ConcatNullYieldsNull = setOptsEl.Attribute("CONCAT_NULL_YIELDS_NULL")?.Value is "true" or "1",
+                NumericRoundAbort = setOptsEl.Attribute("NUMERIC_ROUNDABORT")?.Value is "true" or "1",
+                QuotedIdentifier = setOptsEl.Attribute("QUOTED_IDENTIFIER")?.Value is "true" or "1"
+            };
+        }
+
+        // Memory grant info
+        var memEl = queryPlanEl.Element(Ns + "MemoryGrantInfo");
+        if (memEl != null)
+        {
+            stmt.MemoryGrant = new MemoryGrantInfo
+            {
+                SerialRequiredMemoryKB = ParseLong(memEl.Attribute("SerialRequiredMemory")?.Value),
+                SerialDesiredMemoryKB = ParseLong(memEl.Attribute("SerialDesiredMemory")?.Value),
+                RequiredMemoryKB = ParseLong(memEl.Attribute("RequiredMemory")?.Value),
+                DesiredMemoryKB = ParseLong(memEl.Attribute("DesiredMemory")?.Value),
+                RequestedMemoryKB = ParseLong(memEl.Attribute("RequestedMemory")?.Value),
+                GrantedMemoryKB = ParseLong(memEl.Attribute("GrantedMemory")?.Value),
+                MaxUsedMemoryKB = ParseLong(memEl.Attribute("MaxUsedMemory")?.Value),
+                GrantWaitTimeMs = ParseLong(memEl.Attribute("GrantWaitTime")?.Value),
+                LastRequestedMemoryKB = ParseLong(memEl.Attribute("LastRequestedMemory")?.Value),
+                IsMemoryGrantFeedbackAdjusted = memEl.Attribute("IsMemoryGrantFeedbackAdjusted")?.Value
+            };
+        }
+
+        // Statement-level metadata from QueryPlan attributes
+        stmt.CachedPlanSizeKB = ParseLong(queryPlanEl.Attribute("CachedPlanSize")?.Value);
+        stmt.DegreeOfParallelism = (int)ParseDouble(queryPlanEl.Attribute("DegreeOfParallelism")?.Value);
+        stmt.NonParallelPlanReason = queryPlanEl.Attribute("NonParallelPlanReason")?.Value;
+        stmt.RetrievedFromCache = queryPlanEl.Attribute("RetrievedFromCache")?.Value is "true" or "1";
+        stmt.CompileTimeMs = ParseLong(queryPlanEl.Attribute("CompileTime")?.Value);
+        stmt.CompileMemoryKB = ParseLong(queryPlanEl.Attribute("CompileMemory")?.Value);
+        stmt.CompileCPUMs = ParseLong(queryPlanEl.Attribute("CompileCPU")?.Value);
+
+        // Fallback: some plans have CE version on QueryPlan instead of StmtSimple
+        if (stmt.CardinalityEstimationModelVersion == 0)
+            stmt.CardinalityEstimationModelVersion = (int)ParseDouble(queryPlanEl.Attribute("CardinalityEstimationModelVersion")?.Value);
+
+        // Wave 2.5: MaxQueryMemory
+        stmt.MaxQueryMemoryKB = ParseLong(queryPlanEl.Attribute("MaxQueryMemory")?.Value);
+
+        // Wave 3.1: EffectiveDOP + DOP feedback
+        stmt.EffectiveDOP = (int)ParseDouble(queryPlanEl.Attribute("EffectiveDegreeOfParallelism")?.Value);
+        stmt.DOPFeedbackAdjusted = queryPlanEl.Attribute("IsDOPFeedbackAdjusted")?.Value;
+
+        // Wave 3.4: Plan Guide attributes
+        stmt.PlanGuideDB = queryPlanEl.Attribute("PlanGuideDB")?.Value;
+        stmt.PlanGuideName = queryPlanEl.Attribute("PlanGuideName")?.Value;
+        stmt.UsePlan = queryPlanEl.Attribute("UsePlan")?.Value is "true" or "1";
+
+        // Wave 3.5: ParameterizedText
+        stmt.ParameterizedText = queryPlanEl.Element(Ns + "ParameterizedText")?.Value;
+
+        // XSD gap: QueryPlan-level attributes
+        stmt.ContainsInterleavedExecutionCandidates = queryPlanEl.Attribute("ContainsInterleavedExecutionCandidates")?.Value is "true" or "1";
+        stmt.ContainsInlineScalarTsqlUdfs = queryPlanEl.Attribute("ContainsInlineScalarTsqlUdfs")?.Value is "true" or "1";
+        stmt.QueryVariantID = (int)ParseDouble(queryPlanEl.Attribute("QueryVariantID")?.Value);
+        stmt.DispatcherPlanHandle = queryPlanEl.Attribute("DispatcherPlanHandle")?.Value;
+        stmt.ExclusiveProfileTimeActive = queryPlanEl.Attribute("ExclusiveProfileTimeActive")?.Value is "true" or "1";
+
+        // QueryPlan-level MemoryGrant attribute (unsignedLong)
+        stmt.QueryPlanMemoryGrantKB = ParseLong(queryPlanEl.Attribute("MemoryGrant")?.Value);
+
+        // XSD gap: OptimizationReplay
+        var optReplayEl = queryPlanEl.Element(Ns + "OptimizationReplay");
+        if (optReplayEl != null)
+            stmt.OptimizationReplayScript = optReplayEl.Attribute("Script")?.Value;
+
+        // Missing indexes
+        stmt.MissingIndexes = ParseMissingIndexes(queryPlanEl);
+
+        // Wave 2.8: QueryPlan-level warnings
+        var planWarningsEl = queryPlanEl.Element(Ns + "Warnings");
+        if (planWarningsEl != null)
+            stmt.PlanWarnings = ParseWarningsFromElement(planWarningsEl);
+
+        // OptimizerHardwareDependentProperties
+        var hwEl = queryPlanEl.Element(Ns + "OptimizerHardwareDependentProperties");
+        if (hwEl != null)
+        {
+            stmt.HardwareProperties = new OptimizerHardwareInfo
+            {
+                EstimatedAvailableMemoryGrant = ParseLong(hwEl.Attribute("EstimatedAvailableMemoryGrant")?.Value),
+                EstimatedPagesCached = ParseLong(hwEl.Attribute("EstimatedPagesCached")?.Value),
+                EstimatedAvailableDOP = (int)ParseDouble(hwEl.Attribute("EstimatedAvailableDegreeOfParallelism")?.Value),
+                MaxCompileMemory = ParseLong(hwEl.Attribute("MaxCompileMemory")?.Value)
+            };
+        }
+
+        // OptimizerStatsUsage
+        var statsUsageEl = queryPlanEl.Element(Ns + "OptimizerStatsUsage");
+        if (statsUsageEl != null)
+        {
+            foreach (var statEl in statsUsageEl.Elements(Ns + "StatisticsInfo"))
+            {
+                stmt.StatsUsage.Add(new OptimizerStatsUsageItem
+                {
+                    StatisticsName = statEl.Attribute("Statistics")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    TableName = statEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    DatabaseName = statEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", ""),
+                    SchemaName = statEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", ""),
+                    ModificationCount = ParseLong(statEl.Attribute("ModificationCount")?.Value),
+                    SamplingPercent = ParseDouble(statEl.Attribute("SamplingPercent")?.Value),
+                    LastUpdate = statEl.Attribute("LastUpdate")?.Value
+                });
+            }
+        }
+
+        // ThreadStat (actual plans)
+        var threadStatEl = queryPlanEl.Element(Ns + "ThreadStat");
+        if (threadStatEl != null)
+        {
+            stmt.ThreadStats = new ThreadStatInfo
+            {
+                Branches = (int)ParseDouble(threadStatEl.Attribute("Branches")?.Value),
+                UsedThreads = (int)ParseDouble(threadStatEl.Attribute("UsedThreads")?.Value)
+            };
+            foreach (var trEl in threadStatEl.Elements(Ns + "ThreadReservation"))
+            {
+                stmt.ThreadStats.Reservations.Add(new ThreadReservation
+                {
+                    NodeId = (int)ParseDouble(trEl.Attribute("NodeId")?.Value),
+                    ReservedThreads = (int)ParseDouble(trEl.Attribute("ReservedThreads")?.Value)
+                });
+            }
+        }
+
+        // ParameterList
+        var paramListEl = queryPlanEl.Element(Ns + "ParameterList");
+        if (paramListEl != null)
+        {
+            foreach (var paramEl in paramListEl.Elements(Ns + "ColumnReference"))
+            {
+                stmt.Parameters.Add(new PlanParameter
+                {
+                    Name = paramEl.Attribute("Column")?.Value ?? "",
+                    DataType = paramEl.Attribute("ParameterDataType")?.Value ?? "",
+                    CompiledValue = paramEl.Attribute("ParameterCompiledValue")?.Value,
+                    RuntimeValue = paramEl.Attribute("ParameterRuntimeValue")?.Value
+                });
+            }
+        }
+
+        // WaitStats (actual plans)
+        var waitStatsEl = queryPlanEl.Element(Ns + "WaitStats");
+        if (waitStatsEl != null)
+        {
+            foreach (var waitEl in waitStatsEl.Elements(Ns + "Wait"))
+            {
+                stmt.WaitStats.Add(new WaitStatInfo
+                {
+                    WaitType = waitEl.Attribute("WaitType")?.Value ?? "",
+                    WaitTimeMs = ParseLong(waitEl.Attribute("WaitTimeMs")?.Value),
+                    WaitCount = ParseLong(waitEl.Attribute("WaitCount")?.Value)
+                });
+            }
+        }
+
+        // QueryTimeStats (actual plans)
+        var queryTimeEl = queryPlanEl.Element(Ns + "QueryTimeStats");
+        if (queryTimeEl != null)
+        {
+            stmt.QueryTimeStats = new QueryTimeInfo
+            {
+                CpuTimeMs = ParseLong(queryTimeEl.Attribute("CpuTime")?.Value),
+                ElapsedTimeMs = ParseLong(queryTimeEl.Attribute("ElapsedTime")?.Value)
+            };
+            stmt.QueryUdfCpuTimeMs = ParseLong(queryTimeEl.Attribute("UdfCpuTime")?.Value);
+            stmt.QueryUdfElapsedTimeMs = ParseLong(queryTimeEl.Attribute("UdfElapsedTime")?.Value);
+        }
+
+        // Wave 3.12: TraceFlags
+        foreach (var traceFlagsEl in queryPlanEl.Elements(Ns + "TraceFlags"))
+        {
+            var isCompile = traceFlagsEl.Attribute("IsCompileTime")?.Value is "true" or "1";
+            foreach (var tf in traceFlagsEl.Elements(Ns + "TraceFlag"))
+            {
+                stmt.TraceFlags.Add(new TraceFlagInfo
+                {
+                    Value = (int)ParseDouble(tf.Attribute("Value")?.Value),
+                    Scope = tf.Attribute("Scope")?.Value ?? "",
+                    IsCompileTime = isCompile
+                });
+            }
+        }
+
+        // Wave 3.13: IndexedViewInfo
+        var ivInfoEl = queryPlanEl.Element(Ns + "IndexedViewInfo");
+        if (ivInfoEl != null)
+        {
+            foreach (var objEl in ivInfoEl.Elements(Ns + "Object"))
+            {
+                var db = objEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
+                var schema = objEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
+                var table = objEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
+                var index = objEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
+                var parts = new List<string>();
+                if (!string.IsNullOrEmpty(db)) parts.Add(db);
+                if (!string.IsNullOrEmpty(schema)) parts.Add(schema);
+                if (!string.IsNullOrEmpty(table)) parts.Add(table);
+                if (!string.IsNullOrEmpty(index)) parts.Add(index);
+                var name = string.Join(".", parts);
+                if (!string.IsNullOrEmpty(name))
+                    stmt.IndexedViews.Add(name);
+            }
+        }
+
+        // XSD gap: CardinalityFeedback
+        var ceFeedbackEl = queryPlanEl.Element(Ns + "CardinalityFeedback");
+        if (ceFeedbackEl != null)
+        {
+            foreach (var entry in ceFeedbackEl.Elements(Ns + "Entry"))
+            {
+                stmt.CardinalityFeedback.Add(new CardinalityFeedbackEntry
+                {
+                    Key = ParseLong(entry.Attribute("Key")?.Value),
+                    Value = ParseLong(entry.Attribute("Value")?.Value)
+                });
+            }
+        }
+    }
+
+    private static PlanNode ParseRelOp(XElement relOpEl)
+    {
+        var node = new PlanNode
+        {
+            NodeId = (int)ParseDouble(relOpEl.Attribute("NodeId")?.Value),
+            PhysicalOp = relOpEl.Attribute("PhysicalOp")?.Value ?? "",
+            LogicalOp = relOpEl.Attribute("LogicalOp")?.Value ?? "",
+            EstimatedTotalSubtreeCost = ParseDouble(relOpEl.Attribute("EstimatedTotalSubtreeCost")?.Value),
+            EstimateRows = ParseDouble(relOpEl.Attribute("EstimateRows")?.Value),
+            EstimateIO = ParseDouble(relOpEl.Attribute("EstimateIO")?.Value),
+            EstimateCPU = ParseDouble(relOpEl.Attribute("EstimateCPU")?.Value),
+            EstimateRebinds = ParseDouble(relOpEl.Attribute("EstimateRebinds")?.Value),
+            EstimateRewinds = ParseDouble(relOpEl.Attribute("EstimateRewinds")?.Value),
+            EstimatedRowSize = (int)ParseDouble(relOpEl.Attribute("AvgRowSize")?.Value),
+            Parallel = relOpEl.Attribute("Parallel")?.Value is "true" or "1",
+            Partitioned = relOpEl.Attribute("Partitioned")?.Value is "true" or "1",
+            ExecutionMode = relOpEl.Attribute("EstimatedExecutionMode")?.Value,
+            IsAdaptive = relOpEl.Attribute("IsAdaptive")?.Value is "true" or "1",
+            AdaptiveThresholdRows = ParseDouble(relOpEl.Attribute("AdaptiveThresholdRows")?.Value),
+            EstimatedJoinType = relOpEl.Attribute("EstimatedJoinType")?.Value,
+            // Wave 3.14: Estimated DOP per operator
+            EstimatedDOP = (int)ParseDouble(relOpEl.Attribute("EstimatedAvailableDegreeOfParallelism")?.Value),
+            // XSD gap: RelOp-level metadata
+            GroupExecuted = relOpEl.Attribute("GroupExecuted")?.Value is "true" or "1",
+            RemoteDataAccess = relOpEl.Attribute("RemoteDataAccess")?.Value is "true" or "1",
+            OptimizedHalloweenProtectionUsed = relOpEl.Attribute("OptimizedHalloweenProtectionUsed")?.Value is "true" or "1",
+            StatsCollectionId = ParseLong(relOpEl.Attribute("StatsCollectionId")?.Value)
+        };
+
+        // Map to icon
+        node.IconName = PlanIconMapper.GetIconName(node.PhysicalOp);
+
+        // Handle operator-specific element
+        var physicalOpEl = GetOperatorElement(relOpEl);
+        if (physicalOpEl != null)
+        {
+            // Object reference (table/index name) — scoped to stop at child RelOps
+            var objEl = ScopedDescendants(physicalOpEl, Ns + "Object").FirstOrDefault();
+            if (objEl != null)
+            {
+                var db = objEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
+                var schema = objEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
+                var table = CleanTempTableName(objEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "");
+                var index = objEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
+
+                node.DatabaseName = db;
+                node.IndexName = index;
+
+                var shortParts = new List<string>();
+                if (!string.IsNullOrEmpty(schema)) shortParts.Add(schema);
+                if (!string.IsNullOrEmpty(table)) shortParts.Add(table);
+                node.ObjectName = shortParts.Count > 0 ? string.Join(".", shortParts) : null;
+
+                var fullParts = new List<string>();
+                if (!string.IsNullOrEmpty(db)) fullParts.Add(db);
+                if (!string.IsNullOrEmpty(schema)) fullParts.Add(schema);
+                if (!string.IsNullOrEmpty(table)) fullParts.Add(table);
+                var fullName = string.Join(".", fullParts);
+                if (!string.IsNullOrEmpty(index))
+                    fullName += $".{index}";
+                node.FullObjectName = !string.IsNullOrEmpty(fullName) ? fullName : null;
+
+                node.StorageType = objEl.Attribute("Storage")?.Value;
+                node.ServerName = objEl.Attribute("Server")?.Value?.Replace("[", "").Replace("]", "");
+                node.ObjectAlias = objEl.Attribute("Alias")?.Value?.Replace("[", "").Replace("]", "");
+                node.IndexKind = objEl.Attribute("IndexKind")?.Value;
+                node.FilteredIndex = objEl.Attribute("Filtered")?.Value is "true" or "1";
+                node.TableReferenceId = (int)ParseDouble(objEl.Attribute("TableReferenceId")?.Value);
+            }
+
+            // Hash keys for hash match operators
+            var hashKeysProbeEl = physicalOpEl.Element(Ns + "HashKeysProbe");
+            if (hashKeysProbeEl != null)
+            {
+                var cols = hashKeysProbeEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                node.HashKeysProbe = string.Join(", ", cols);
+            }
+            var hashKeysBuildEl = physicalOpEl.Element(Ns + "HashKeysBuild");
+            if (hashKeysBuildEl != null)
+            {
+                var cols = hashKeysBuildEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                node.HashKeysBuild = string.Join(", ", cols);
+            }
+
+            // Ordered attribute
+            node.Ordered = physicalOpEl.Attribute("Ordered")?.Value == "true" || physicalOpEl.Attribute("Ordered")?.Value == "1";
+
+            // Seek predicates — scoped to stop at child RelOps
+            var seekPreds = ScopedDescendants(physicalOpEl, Ns + "SeekPredicateNew")
+                .Concat(ScopedDescendants(physicalOpEl, Ns + "SeekPredicate"));
+            var seekParts = new List<string>();
+            foreach (var sp in seekPreds)
+            {
+                var scalarOps = sp.Descendants(Ns + "ScalarOperator");
+                foreach (var so in scalarOps)
+                {
+                    var val = so.Attribute("ScalarString")?.Value;
+                    if (!string.IsNullOrEmpty(val))
+                        seekParts.Add(val);
+                }
+            }
+            if (seekParts.Count > 0)
+                node.SeekPredicates = string.Join(" AND ", seekParts);
+
+            // GuessedSelectivity — check if optimizer guessed selectivity on predicates
+            if (ScopedDescendants(physicalOpEl, Ns + "GuessedSelectivity").Any())
+                node.GuessedSelectivity = true;
+
+            // Residual predicate
+            var predEl = physicalOpEl.Elements(Ns + "Predicate").FirstOrDefault();
+            if (predEl != null)
+            {
+                var scalarOp = predEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.Predicate = scalarOp?.Attribute("ScalarString")?.Value;
+            }
+
+            // Partitioning type (for parallelism operators)
+            node.PartitioningType = physicalOpEl.Attribute("PartitioningType")?.Value;
+
+            // Build/Probe residuals (Hash Match)
+            var buildResEl = physicalOpEl.Element(Ns + "BuildResidual");
+            if (buildResEl != null)
+            {
+                var so = buildResEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.BuildResidual = so?.Attribute("ScalarString")?.Value;
+            }
+            var probeResEl = physicalOpEl.Element(Ns + "ProbeResidual");
+            if (probeResEl != null)
+            {
+                var so = probeResEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.ProbeResidual = so?.Attribute("ScalarString")?.Value;
+            }
+
+            // Wave 2.1/2.2: Merge Residual + PassThru (Merge Join + Nested Loops)
+            var residualEl = physicalOpEl.Element(Ns + "Residual");
+            if (residualEl != null)
+            {
+                var so = residualEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.MergeResidual = so?.Attribute("ScalarString")?.Value;
+            }
+            var passThruEl = physicalOpEl.Element(Ns + "PassThru");
+            if (passThruEl != null)
+            {
+                var so = passThruEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.PassThru = so?.Attribute("ScalarString")?.Value;
+            }
+
+            // OrderBy columns (Sort operator)
+            var orderByEl = physicalOpEl.Element(Ns + "OrderBy");
+            if (orderByEl != null)
+            {
+                var obParts = orderByEl.Elements(Ns + "OrderByColumn")
+                    .Select(obc =>
+                    {
+                        var ascending = obc.Attribute("Ascending")?.Value != "false";
+                        var colRef = obc.Element(Ns + "ColumnReference");
+                        var name = colRef != null ? FormatColumnRef(colRef) : "";
+                        return string.IsNullOrEmpty(name) ? "" : $"{name} {(ascending ? "ASC" : "DESC")}";
+                    })
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var obStr = string.Join(", ", obParts);
+                if (!string.IsNullOrEmpty(obStr))
+                    node.OrderBy = obStr;
+            }
+
+            // OuterReferences (Nested Loops)
+            var outerRefsEl = physicalOpEl.Element(Ns + "OuterReferences");
+            if (outerRefsEl != null)
+            {
+                var refs = outerRefsEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var refsStr = string.Join(", ", refs);
+                if (!string.IsNullOrEmpty(refsStr))
+                    node.OuterReferences = refsStr;
+            }
+
+            // Inner/Outer side join columns (Merge Join)
+            node.InnerSideJoinColumns = ParseColumnList(physicalOpEl, "InnerSideJoinColumns");
+            node.OuterSideJoinColumns = ParseColumnList(physicalOpEl, "OuterSideJoinColumns");
+
+            // GroupBy columns (Hash/Stream Aggregate)
+            node.GroupBy = ParseColumnList(physicalOpEl, "GroupBy");
+
+            // Partition columns (Parallelism)
+            node.PartitionColumns = ParseColumnList(physicalOpEl, "PartitionColumns");
+
+            // Wave 2.6: Parallelism HashKeys
+            node.HashKeys = ParseColumnList(physicalOpEl, "HashKeys");
+
+            // Segment column
+            var segColEl = physicalOpEl.Element(Ns + "SegmentColumn")?.Element(Ns + "ColumnReference");
+            if (segColEl != null)
+                node.SegmentColumn = FormatColumnRef(segColEl);
+
+            // Defined values (Compute Scalar)
+            var definedValsEl = physicalOpEl.Element(Ns + "DefinedValues");
+            if (definedValsEl != null)
+            {
+                var dvParts = new List<string>();
+                foreach (var dvEl in definedValsEl.Elements(Ns + "DefinedValue"))
+                {
+                    var colRef = dvEl.Element(Ns + "ColumnReference");
+                    var scalarOp = dvEl.Element(Ns + "ScalarOperator");
+                    var colName = colRef != null ? FormatColumnRef(colRef) : "";
+                    var expr = scalarOp?.Attribute("ScalarString")?.Value ?? "";
+                    if (!string.IsNullOrEmpty(colName) && !string.IsNullOrEmpty(expr))
+                        dvParts.Add($"{colName} = {expr}");
+                    else if (!string.IsNullOrEmpty(expr))
+                        dvParts.Add(expr);
+                    else if (!string.IsNullOrEmpty(colName))
+                        dvParts.Add(colName);
+                }
+                if (dvParts.Count > 0)
+                    node.DefinedValues = string.Join("; ", dvParts);
+            }
+
+            // IndexScan / TableScan properties
+            node.ScanDirection = physicalOpEl.Attribute("ScanDirection")?.Value;
+            node.ForcedIndex = physicalOpEl.Attribute("ForcedIndex")?.Value is "true" or "1";
+            node.ForceScan = physicalOpEl.Attribute("ForceScan")?.Value is "true" or "1";
+            node.ForceSeek = physicalOpEl.Attribute("ForceSeek")?.Value is "true" or "1";
+            node.NoExpandHint = physicalOpEl.Attribute("NoExpandHint")?.Value is "true" or "1";
+            node.Lookup = physicalOpEl.Attribute("Lookup")?.Value is "true" or "1";
+            node.DynamicSeek = physicalOpEl.Attribute("DynamicSeek")?.Value is "true" or "1";
+
+            // Table cardinality and rows to be read (on <RelOp> per XSD)
+            node.TableCardinality = ParseDouble(relOpEl.Attribute("TableCardinality")?.Value);
+            node.EstimatedRowsRead = ParseDouble(relOpEl.Attribute("EstimatedRowsRead")?.Value);
+            node.EstimateRowsWithoutRowGoal = ParseDouble(relOpEl.Attribute("EstimateRowsWithoutRowGoal")?.Value);
+            if (node.EstimatedRowsRead == 0)
+                node.EstimatedRowsRead = node.EstimateRowsWithoutRowGoal;
+
+            // TOP operator properties
+            var topExprEl = physicalOpEl.Element(Ns + "TopExpression")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+            if (topExprEl != null)
+                node.TopExpression = topExprEl.Attribute("ScalarString")?.Value;
+            node.IsPercent = physicalOpEl.Attribute("IsPercent")?.Value is "true" or "1";
+            node.WithTies = physicalOpEl.Attribute("WithTies")?.Value is "true" or "1";
+
+            // Wave 2.7: Top OffsetExpression, RowCount, Rows
+            var offsetEl = physicalOpEl.Element(Ns + "OffsetExpression")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+            if (offsetEl != null)
+                node.OffsetExpression = offsetEl.Attribute("ScalarString")?.Value;
+            node.RowCount = physicalOpEl.Attribute("RowCount")?.Value is "true" or "1";
+            node.TopRows = (int)ParseDouble(physicalOpEl.Attribute("Rows")?.Value);
+
+            // Sort properties
+            node.SortDistinct = physicalOpEl.Attribute("Distinct")?.Value is "true" or "1";
+
+            // Filter properties
+            node.StartupExpression = physicalOpEl.Attribute("StartupExpression")?.Value is "true" or "1";
+
+            // Nested Loops properties
+            node.NLOptimized = physicalOpEl.Attribute("Optimized")?.Value is "true" or "1";
+            node.WithOrderedPrefetch = physicalOpEl.Attribute("WithOrderedPrefetch")?.Value is "true" or "1";
+            node.WithUnorderedPrefetch = physicalOpEl.Attribute("WithUnorderedPrefetch")?.Value is "true" or "1";
+
+            // Hash Match properties
+            node.ManyToMany = physicalOpEl.Attribute("ManyToMany")?.Value is "true" or "1";
+            node.BitmapCreator = physicalOpEl.Attribute("BitmapCreator")?.Value is "true" or "1";
+
+            // Parallelism properties
+            node.Remoting = physicalOpEl.Attribute("Remoting")?.Value is "true" or "1";
+            node.LocalParallelism = physicalOpEl.Attribute("LocalParallelism")?.Value is "true" or "1";
+
+            // Wave 3.8: Spool Stack + PrimaryNodeId
+            node.SpoolStack = physicalOpEl.Attribute("Stack")?.Value is "true" or "1";
+            node.PrimaryNodeId = (int)ParseDouble(physicalOpEl.Attribute("PrimaryNodeId")?.Value);
+
+            // Eager Index Spool — suggest CREATE INDEX from SeekPredicateNew + OutputList
+            if (node.LogicalOp == "Eager Spool")
+            {
+                var spoolSeek = physicalOpEl.Element(Ns + "SeekPredicateNew")
+                             ?? physicalOpEl.Element(Ns + "SeekPredicate");
+                if (spoolSeek != null)
+                {
+                    var rangeCols = spoolSeek.Descendants(Ns + "RangeColumns")
+                        .SelectMany(rc => rc.Elements(Ns + "ColumnReference"));
+
+                    var keyColumns = new List<string>();
+                    string? tblSchema = null;
+                    string? tblName = null;
+
+                    foreach (var col in rangeCols)
+                    {
+                        var colName = col.Attribute("Column")?.Value;
+                        if (!string.IsNullOrEmpty(colName))
+                            keyColumns.Add(colName);
+                        tblSchema ??= col.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
+                        tblName ??= col.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
+                    }
+
+                    if (keyColumns.Count > 0 && !string.IsNullOrEmpty(tblName))
+                    {
+                        var includeCols = relOpEl.Element(Ns + "OutputList")?.Elements(Ns + "ColumnReference")
+                            .Select(c => c.Attribute("Column")?.Value)
+                            .Where(c => !string.IsNullOrEmpty(c) && !keyColumns.Contains(c))
+                            .ToList() ?? new List<string?>();
+
+                        var prefix = !string.IsNullOrEmpty(tblSchema) ? $"{tblSchema}.{tblName}" : tblName;
+                        var keyStr = string.Join(", ", keyColumns);
+                        var sql = $"CREATE INDEX [{string.Join("_", keyColumns)}] ON {prefix} ({keyStr})";
+                        if (includeCols.Count > 0)
+                            sql += $" INCLUDE ({string.Join(", ", includeCols)})";
+                        sql += ";";
+                        node.SuggestedIndex = sql;
+                    }
+                }
+            }
+
+            // Wave 3.9: Update DMLRequestSort + ActionColumn
+            node.DMLRequestSort = physicalOpEl.Attribute("DMLRequestSort")?.Value is "true" or "1";
+            var actionColEl = physicalOpEl.Element(Ns + "ActionColumn")?.Element(Ns + "ColumnReference");
+            if (actionColEl != null)
+                node.ActionColumn = FormatColumnRef(actionColEl);
+
+            // SET predicate (UPDATE operator)
+            var setPredicateEl = physicalOpEl.Element(Ns + "SetPredicate");
+            if (setPredicateEl != null)
+            {
+                var so = setPredicateEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.SetPredicate = so?.Attribute("ScalarString")?.Value;
+            }
+
+            // ActualJoinType from runtime info on adaptive joins
+            node.ActualJoinType = physicalOpEl.Attribute("ActualJoinType")?.Value;
+
+            // XSD gap: ForceSeekColumnCount (IndexScan)
+            node.ForceSeekColumnCount = (int)ParseDouble(physicalOpEl.Attribute("ForceSeekColumnCount")?.Value);
+
+            // XSD gap: PartitionId (IndexScan, TableScan, Sort, NestedLoops, AdaptiveJoin)
+            var partitionIdEl = physicalOpEl.Element(Ns + "PartitionId");
+            if (partitionIdEl != null)
+            {
+                var pidCols = partitionIdEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var pidStr = string.Join(", ", pidCols);
+                if (!string.IsNullOrEmpty(pidStr))
+                    node.PartitionId = pidStr;
+            }
+
+            // XSD gap: StarJoinInfo (Hash, Merge, NL, AdaptiveJoin)
+            var starJoinEl = physicalOpEl.Element(Ns + "StarJoinInfo");
+            if (starJoinEl != null)
+            {
+                node.IsStarJoin = starJoinEl.Attribute("Root")?.Value is "true" or "1";
+                node.StarJoinOperationType = starJoinEl.Attribute("OperationType")?.Value;
+            }
+
+            // XSD gap: ProbeColumn (NL, Parallelism, Update)
+            var probeColEl = physicalOpEl.Element(Ns + "ProbeColumn")?.Element(Ns + "ColumnReference");
+            if (probeColEl != null)
+                node.ProbeColumn = FormatColumnRef(probeColEl);
+
+            // XSD gap: InRow (Parallelism)
+            node.InRow = physicalOpEl.Attribute("InRow")?.Value is "true" or "1";
+
+            // XSD gap: ComputeSequence (ComputeScalar)
+            node.ComputeSequence = physicalOpEl.Attribute("ComputeSequence")?.Value is "true" or "1";
+
+            // XSD gap: RollupInfo (StreamAggregate)
+            var rollupEl = physicalOpEl.Element(Ns + "RollupInfo");
+            if (rollupEl != null)
+            {
+                node.RollupHighestLevel = (int)ParseDouble(rollupEl.Attribute("HighestLevel")?.Value);
+                foreach (var rlEl in rollupEl.Elements(Ns + "RollupLevel"))
+                    node.RollupLevels.Add((int)ParseDouble(rlEl.Attribute("Level")?.Value));
+            }
+
+            // XSD gap: TVF ParameterList
+            var tvfParamListEl = physicalOpEl.Element(Ns + "ParameterList");
+            if (tvfParamListEl != null)
+            {
+                var tvfCols = tvfParamListEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var tvfStr = string.Join(", ", tvfCols);
+                if (!string.IsNullOrEmpty(tvfStr))
+                    node.TvfParameters = tvfStr;
+                // Also check for ScalarOperator children (TVF can have scalar params)
+                if (string.IsNullOrEmpty(node.TvfParameters))
+                {
+                    var tvfScalars = tvfParamListEl.Elements(Ns + "ScalarOperator")
+                        .Select(s => s.Attribute("ScalarString")?.Value)
+                        .Where(s => !string.IsNullOrEmpty(s));
+                    var tvfScalarStr = string.Join(", ", tvfScalars);
+                    if (!string.IsNullOrEmpty(tvfScalarStr))
+                        node.TvfParameters = tvfScalarStr;
+                }
+            }
+
+            // XSD gap: OriginalActionColumn (Update)
+            var origActionColEl = physicalOpEl.Element(Ns + "OriginalActionColumn")?.Element(Ns + "ColumnReference");
+            if (origActionColEl != null)
+                node.OriginalActionColumn = FormatColumnRef(origActionColEl);
+
+            // XSD gap: Scalar UDF structured detection
+            foreach (var udfEl in ScopedDescendants(physicalOpEl, Ns + "UserDefinedFunction"))
+            {
+                var udfRef = new ScalarUdfReference
+                {
+                    FunctionName = udfEl.Attribute("FunctionName")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    IsClrFunction = udfEl.Attribute("IsClrFunction")?.Value is "true" or "1"
+                };
+                var clrEl = udfEl.Element(Ns + "CLRFunction");
+                if (clrEl != null)
+                {
+                    udfRef.ClrAssembly = clrEl.Attribute("Assembly")?.Value;
+                    udfRef.ClrClass = clrEl.Attribute("Class")?.Value;
+                    udfRef.ClrMethod = clrEl.Attribute("Method")?.Value;
+                }
+                if (!string.IsNullOrEmpty(udfRef.FunctionName))
+                    node.ScalarUdfs.Add(udfRef);
+            }
+
+            // XSD gap: TieColumns (Top operator)
+            node.TieColumns = ParseColumnList(physicalOpEl, "TieColumns");
+
+            // XSD gap: UDXName (Extension operator)
+            node.UdxName = physicalOpEl.Attribute("UDXName")?.Value;
+
+            // XSD gap: Operator-level IndexedViewInfo
+            var opIvInfoEl = physicalOpEl.Element(Ns + "IndexedViewInfo");
+            if (opIvInfoEl != null)
+            {
+                foreach (var ivObjEl in opIvInfoEl.Elements(Ns + "Object"))
+                {
+                    var ivDb = ivObjEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
+                    var ivSchema = ivObjEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
+                    var ivTable = ivObjEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
+                    var ivIndex = ivObjEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
+                    var ivParts = new List<string>();
+                    if (!string.IsNullOrEmpty(ivDb)) ivParts.Add(ivDb);
+                    if (!string.IsNullOrEmpty(ivSchema)) ivParts.Add(ivSchema);
+                    if (!string.IsNullOrEmpty(ivTable)) ivParts.Add(ivTable);
+                    if (!string.IsNullOrEmpty(ivIndex)) ivParts.Add(ivIndex);
+                    var ivName = string.Join(".", ivParts);
+                    if (!string.IsNullOrEmpty(ivName))
+                        node.OperatorIndexedViews.Add(ivName);
+                }
+            }
+
+            // XSD gap: NamedParameterList (IndexScan)
+            var namedParamListEl = physicalOpEl.Element(Ns + "NamedParameterList");
+            if (namedParamListEl != null)
+            {
+                foreach (var npEl in namedParamListEl.Elements(Ns + "NamedParameter"))
+                {
+                    var np = new NamedParameterInfo
+                    {
+                        Name = npEl.Attribute("Name")?.Value ?? ""
+                    };
+                    var npScalar = npEl.Element(Ns + "ScalarOperator");
+                    if (npScalar != null)
+                        np.ScalarString = npScalar.Attribute("ScalarString")?.Value;
+                    if (!string.IsNullOrEmpty(np.Name))
+                        node.NamedParameters.Add(np);
+                }
+            }
+
+            // XSD gap: Remote operator metadata
+            node.RemoteDestination = physicalOpEl.Attribute("RemoteDestination")?.Value;
+            node.RemoteSource = physicalOpEl.Attribute("RemoteSource")?.Value;
+            node.RemoteObject = physicalOpEl.Attribute("RemoteObject")?.Value;
+            node.RemoteQuery = physicalOpEl.Attribute("RemoteQuery")?.Value;
+
+            // ForeignKeyReferenceCheck attributes
+            node.ForeignKeyReferencesCount = (int)ParseDouble(physicalOpEl.Attribute("ForeignKeyReferencesCount")?.Value);
+            node.NoMatchingIndexCount = (int)ParseDouble(physicalOpEl.Attribute("NoMatchingIndexCount")?.Value);
+            node.PartialMatchingIndexCount = (int)ParseDouble(physicalOpEl.Attribute("PartialMatchingIndexCount")?.Value);
+
+            // ConstantScan Values — parse Values/Row/ScalarOperator children
+            var valuesEl = physicalOpEl.Element(Ns + "Values");
+            if (valuesEl != null)
+            {
+                var rowParts = new List<string>();
+                foreach (var rowEl in valuesEl.Elements(Ns + "Row"))
+                {
+                    var scalars = rowEl.Elements(Ns + "ScalarOperator")
+                        .Select(s => s.Attribute("ScalarString")?.Value ?? "")
+                        .Where(s => !string.IsNullOrEmpty(s));
+                    var rowStr = string.Join(", ", scalars);
+                    if (!string.IsNullOrEmpty(rowStr))
+                        rowParts.Add($"({rowStr})");
+                }
+                if (rowParts.Count > 0)
+                    node.ConstantScanValues = string.Join(", ", rowParts);
+            }
+
+            // UDX UsedUDXColumns — column references for CLR aggregate operators
+            var udxColsEl = physicalOpEl.Element(Ns + "UsedUDXColumns");
+            if (udxColsEl != null)
+            {
+                var udxCols = udxColsEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var udxColStr = string.Join(", ", udxCols);
+                if (!string.IsNullOrEmpty(udxColStr))
+                    node.UdxUsedColumns = udxColStr;
+            }
+        }
+
+        // Output columns
+        var outputList = relOpEl.Element(Ns + "OutputList");
+        if (outputList != null)
+        {
+            var cols = outputList.Elements(Ns + "ColumnReference")
+                .Select(c =>
+                {
+                    var col = c.Attribute("Column")?.Value ?? "";
+                    var tbl = c.Attribute("Table")?.Value ?? "";
+                    return string.IsNullOrEmpty(tbl) ? col : $"{tbl}.{col}";
+                })
+                .Where(s => !string.IsNullOrEmpty(s));
+            var colList = string.Join(", ", cols);
+            if (!string.IsNullOrEmpty(colList))
+                node.OutputColumns = colList.Replace("[", "").Replace("]", "");
+        }
+
+        // Warnings
+        node.Warnings = ParseWarnings(relOpEl);
+
+        // SpillOccurred detail flag (node-level boolean)
+        var warningsCheckEl = relOpEl.Element(Ns + "Warnings");
+        if (warningsCheckEl?.Element(Ns + "SpillOccurred") != null)
+            node.SpillOccurredDetail = true;
+
+        // Wave 3.2: MemoryFractions (on RelOp)
+        var memFracEl = relOpEl.Element(Ns + "MemoryFractions");
+        if (memFracEl != null)
+        {
+            node.MemoryFractionInput = ParseDouble(memFracEl.Attribute("Input")?.Value);
+            node.MemoryFractionOutput = ParseDouble(memFracEl.Attribute("Output")?.Value);
+        }
+
+        // Wave 3.3: RunTimePartitionSummary (on RelOp)
+        var rtPartEl = relOpEl.Element(Ns + "RunTimePartitionSummary");
+        if (rtPartEl != null)
+        {
+            var partAccEl = rtPartEl.Element(Ns + "PartitionsAccessed");
+            if (partAccEl != null)
+            {
+                node.PartitionsAccessed = (int)ParseDouble(partAccEl.Attribute("PartitionCount")?.Value);
+                var ranges = partAccEl.Elements(Ns + "PartitionRange")
+                    .Select(r => $"{r.Attribute("Start")?.Value}-{r.Attribute("End")?.Value}");
+                node.PartitionRanges = string.Join(", ", ranges);
+                if (string.IsNullOrEmpty(node.PartitionRanges))
+                    node.PartitionRanges = null;
+            }
+        }
+
+        // Wave 2.4: Per-operator memory grants (MemoryGrant on RelOp)
+        var memGrantEl = relOpEl.Element(Ns + "MemoryGrant");
+        if (memGrantEl != null)
+        {
+            node.MemoryGrantKB = ParseLong(memGrantEl.Attribute("GrantedMemory")?.Value);
+            node.DesiredMemoryKB = ParseLong(memGrantEl.Attribute("DesiredMemory")?.Value);
+            node.MaxUsedMemoryKB = ParseLong(memGrantEl.Attribute("MaxUsedMemory")?.Value);
+        }
+
+        // Runtime information (actual plan)
+        var runtimeEl = relOpEl.Element(Ns + "RunTimeInformation");
+        if (runtimeEl != null)
+        {
+            node.HasActualStats = true;
+            long totalRows = 0, totalExecutions = 0, totalRowsRead = 0;
+            long totalRebinds = 0, totalRewinds = 0;
+            long maxElapsed = 0, totalCpu = 0;
+            long totalLogicalReads = 0, totalPhysicalReads = 0;
+            long totalScans = 0, totalReadAheads = 0;
+            long totalLobLogicalReads = 0, totalLobPhysicalReads = 0, totalLobReadAheads = 0;
+            long totalSegmentReads = 0, totalSegmentSkips = 0;
+            long totalUdfCpu = 0, maxUdfElapsed = 0;
+            long maxInputMemoryGrant = 0, maxOutputMemoryGrant = 0, maxUsedMemoryGrant = 0;
+            string? actualExecMode = null;
+
+            foreach (var thread in runtimeEl.Elements(Ns + "RunTimeCountersPerThread"))
+            {
+                totalRows += ParseLong(thread.Attribute("ActualRows")?.Value);
+                totalExecutions += ParseLong(thread.Attribute("ActualExecutions")?.Value);
+                totalRowsRead += ParseLong(thread.Attribute("ActualRowsRead")?.Value);
+                totalRebinds += ParseLong(thread.Attribute("ActualRebinds")?.Value);
+                totalRewinds += ParseLong(thread.Attribute("ActualRewinds")?.Value);
+                totalCpu += ParseLong(thread.Attribute("ActualCPUms")?.Value);
+                totalLogicalReads += ParseLong(thread.Attribute("ActualLogicalReads")?.Value);
+                totalPhysicalReads += ParseLong(thread.Attribute("ActualPhysicalReads")?.Value);
+                totalScans += ParseLong(thread.Attribute("ActualScans")?.Value);
+                totalReadAheads += ParseLong(thread.Attribute("ActualReadAheads")?.Value);
+                totalLobLogicalReads += ParseLong(thread.Attribute("ActualLobLogicalReads")?.Value);
+                totalLobPhysicalReads += ParseLong(thread.Attribute("ActualLobPhysicalReads")?.Value);
+                totalLobReadAheads += ParseLong(thread.Attribute("ActualLobReadAheads")?.Value);
+
+                // Wave 3.10: Columnstore segment reads/skips
+                totalSegmentReads += ParseLong(thread.Attribute("ActualSegmentReads")?.Value);
+                totalSegmentSkips += ParseLong(thread.Attribute("ActualSegmentSkips")?.Value);
+
+                // Wave 3.11: UDF timing
+                totalUdfCpu += ParseLong(thread.Attribute("UdfCpuTime")?.Value);
+                var udfElapsed = ParseLong(thread.Attribute("UdfElapsedTime")?.Value);
+                if (udfElapsed > maxUdfElapsed) maxUdfElapsed = udfElapsed;
+
+                // Per-operator memory grant (same value on all threads, take max)
+                var inputMem = ParseLong(thread.Attribute("InputMemoryGrant")?.Value);
+                var outputMem = ParseLong(thread.Attribute("OutputMemoryGrant")?.Value);
+                var usedMem = ParseLong(thread.Attribute("UsedMemoryGrant")?.Value);
+                if (inputMem > maxInputMemoryGrant) maxInputMemoryGrant = inputMem;
+                if (outputMem > maxOutputMemoryGrant) maxOutputMemoryGrant = outputMem;
+                if (usedMem > maxUsedMemoryGrant) maxUsedMemoryGrant = usedMem;
+
+                actualExecMode ??= thread.Attribute("ActualExecutionMode")?.Value;
+
+                var elapsed = ParseLong(thread.Attribute("ActualElapsedms")?.Value);
+                if (elapsed > maxElapsed) maxElapsed = elapsed;
+            }
+
+            node.ActualRows = totalRows;
+            node.ActualExecutions = totalExecutions;
+            node.ActualRowsRead = totalRowsRead;
+            node.ActualRebinds = totalRebinds;
+            node.ActualRewinds = totalRewinds;
+            node.ActualElapsedMs = maxElapsed;
+            node.ActualCPUMs = totalCpu;
+            node.ActualLogicalReads = totalLogicalReads;
+            node.ActualPhysicalReads = totalPhysicalReads;
+            node.ActualScans = totalScans;
+            node.ActualReadAheads = totalReadAheads;
+            node.ActualLobLogicalReads = totalLobLogicalReads;
+            node.ActualLobPhysicalReads = totalLobPhysicalReads;
+            node.ActualLobReadAheads = totalLobReadAheads;
+            node.ActualExecutionMode = actualExecMode;
+            node.ActualSegmentReads = totalSegmentReads;
+            node.ActualSegmentSkips = totalSegmentSkips;
+            node.UdfCpuTimeMs = totalUdfCpu;
+            node.UdfElapsedTimeMs = maxUdfElapsed;
+            node.InputMemoryGrantKB = maxInputMemoryGrant;
+            node.OutputMemoryGrantKB = maxOutputMemoryGrant;
+            node.UsedMemoryGrantKB = maxUsedMemoryGrant;
+
+            // Store per-thread data for parallel skew analysis
+            foreach (var thread in runtimeEl.Elements(Ns + "RunTimeCountersPerThread"))
+            {
+                node.PerThreadStats.Add(new PerThreadRuntimeInfo
+                {
+                    ThreadId = (int)ParseDouble(thread.Attribute("Thread")?.Value),
+                    ActualRows = ParseLong(thread.Attribute("ActualRows")?.Value),
+                    ActualExecutions = ParseLong(thread.Attribute("ActualExecutions")?.Value),
+                    ActualElapsedMs = ParseLong(thread.Attribute("ActualElapsedms")?.Value),
+                    ActualCPUMs = ParseLong(thread.Attribute("ActualCPUms")?.Value),
+                    ActualRowsRead = ParseLong(thread.Attribute("ActualRowsRead")?.Value),
+                    ActualLogicalReads = ParseLong(thread.Attribute("ActualLogicalReads")?.Value),
+                    ActualPhysicalReads = ParseLong(thread.Attribute("ActualPhysicalReads")?.Value),
+                    ActualScans = ParseLong(thread.Attribute("ActualScans")?.Value),
+                    ActualReadAheads = ParseLong(thread.Attribute("ActualReadAheads")?.Value),
+                    FirstActiveTime = ParseLong(thread.Attribute("FirstActiveTime")?.Value),
+                    LastActiveTime = ParseLong(thread.Attribute("LastActiveTime")?.Value),
+                    OpenTime = ParseLong(thread.Attribute("OpenTime")?.Value),
+                    FirstRowTime = ParseLong(thread.Attribute("FirstRowTime")?.Value),
+                    LastRowTime = ParseLong(thread.Attribute("LastRowTime")?.Value),
+                    CloseTime = ParseLong(thread.Attribute("CloseTime")?.Value),
+                    InputMemoryGrant = ParseLong(thread.Attribute("InputMemoryGrant")?.Value),
+                    OutputMemoryGrant = ParseLong(thread.Attribute("OutputMemoryGrant")?.Value),
+                    UsedMemoryGrant = ParseLong(thread.Attribute("UsedMemoryGrant")?.Value),
+                    Batches = ParseLong(thread.Attribute("Batches")?.Value),
+                    ActualEndOfScans = ParseLong(thread.Attribute("ActualEndOfScans")?.Value),
+                    ActualLocallyAggregatedRows = ParseLong(thread.Attribute("ActualLocallyAggregatedRows")?.Value),
+                    IsInterleavedExecuted = thread.Attribute("IsInterleavedExecuted")?.Value is "true" or "1",
+                    RowRequalifications = ParseLong(thread.Attribute("RowRequalifications")?.Value)
+                });
+            }
+        }
+
+        // Recurse into child RelOps
+        foreach (var childRelOp in FindChildRelOps(relOpEl))
+        {
+            var childNode = ParseRelOp(childRelOp);
+            childNode.Parent = node;
+            node.Children.Add(childNode);
+        }
+
+        return node;
+    }
+
+    private static XElement? GetOperatorElement(XElement relOpEl)
+    {
+        foreach (var child in relOpEl.Elements())
+        {
+            var name = child.Name.LocalName;
+            if (name != "OutputList" && name != "RunTimeInformation" && name != "Warnings"
+                && name != "MemoryFractions" && name != "RunTimePartitionSummary"
+                && name != "MemoryGrant" && name != "InternalInfo")
+            {
+                return child;
+            }
+        }
+        return null;
+    }
+
+    private static IEnumerable<XElement> FindChildRelOps(XElement relOpEl)
+    {
+        var operatorEl = GetOperatorElement(relOpEl);
+        if (operatorEl == null) yield break;
+
+        foreach (var child in operatorEl.Elements(Ns + "RelOp"))
+            yield return child;
+
+        foreach (var child in operatorEl.Elements())
+        {
+            if (child.Name.LocalName == "RelOp") continue;
+            foreach (var nestedRelOp in child.Elements(Ns + "RelOp"))
+                yield return nestedRelOp;
+        }
+    }
+
+    private static List<MissingIndex> ParseMissingIndexes(XElement queryPlanEl)
+    {
+        var result = new List<MissingIndex>();
+        var missingIndexesEl = queryPlanEl.Element(Ns + "MissingIndexes");
+        if (missingIndexesEl == null) return result;
+
+        foreach (var groupEl in missingIndexesEl.Elements(Ns + "MissingIndexGroup"))
+        {
+            var impact = ParseDouble(groupEl.Attribute("Impact")?.Value);
+            foreach (var indexEl in groupEl.Elements(Ns + "MissingIndex"))
+            {
+                var mi = new MissingIndex
+                {
+                    Database = indexEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    Schema = indexEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    Table = CleanTempTableName(indexEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? ""),
+                    Impact = impact
+                };
+
+                foreach (var colGroup in indexEl.Elements(Ns + "ColumnGroup"))
+                {
+                    var usage = colGroup.Attribute("Usage")?.Value ?? "";
+                    var cols = colGroup.Elements(Ns + "Column")
+                        .Select(c => c.Attribute("Name")?.Value?.Replace("[", "").Replace("]", "") ?? "")
+                        .Where(s => !string.IsNullOrEmpty(s))
+                        .ToList();
+
+                    switch (usage)
+                    {
+                        case "EQUALITY": mi.EqualityColumns = cols; break;
+                        case "INEQUALITY": mi.InequalityColumns = cols; break;
+                        case "INCLUDE": mi.IncludeColumns = cols; break;
+                    }
+                }
+
+                var keyCols = mi.EqualityColumns.Concat(mi.InequalityColumns).ToList();
+                if (keyCols.Count > 0)
+                {
+                    var quotedKeyCols = keyCols.Select(c => $"[{c}]");
+                    var create = $"CREATE NONCLUSTERED INDEX [{mi.Table}_{string.Join("_", keyCols.Take(3))}]\nON [{mi.Schema}].[{mi.Table}] ({string.Join(", ", quotedKeyCols)})";
+                    if (mi.IncludeColumns.Count > 0)
+                    {
+                        var quotedIncludes = mi.IncludeColumns.Select(c => $"[{c}]");
+                        create += $"\nINCLUDE ({string.Join(", ", quotedIncludes)})";
+                    }
+                    create += ";";
+                    mi.CreateStatement = create;
+                }
+
+                result.Add(mi);
+            }
+        }
+        return result;
+    }
+
+    /// <summary>
+    /// Parse warnings from a parent element that contains a &lt;Warnings&gt; child (e.g. RelOp).
+    /// </summary>
+    private static List<PlanWarning> ParseWarnings(XElement parentEl)
+    {
+        var warningsEl = parentEl.Element(Ns + "Warnings");
+        if (warningsEl == null) return new List<PlanWarning>();
+        return ParseWarningsFromElement(warningsEl);
+    }
+
+    /// <summary>
+    /// Parse warnings directly from a &lt;Warnings&gt; element.
+    /// </summary>
+    private static List<PlanWarning> ParseWarningsFromElement(XElement warningsEl)
+    {
+        var result = new List<PlanWarning>();
+
+        // No join predicate
+        if (warningsEl.Attribute("NoJoinPredicate")?.Value is "true" or "1")
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "No Join Predicate",
+                Message = "This join has no join predicate (possible cross join)",
+                Severity = PlanWarningSeverity.Critical
+            });
+        }
+
+        if (warningsEl.Attribute("SpatialGuess")?.Value is "true" or "1")
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Spatial Guess",
+                Message = "Spatial index selectivity was guessed",
+                Severity = PlanWarningSeverity.Info
+            });
+        }
+
+        if (warningsEl.Attribute("UnmatchedIndexes")?.Value is "true" or "1")
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Unmatched Indexes",
+                Message = "Indexes could not be matched due to parameterization",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        if (warningsEl.Attribute("FullUpdateForOnlineIndexBuild")?.Value is "true" or "1")
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Full Update for Online Index Build",
+                Message = "Full update required for online index build operation",
+                Severity = PlanWarningSeverity.Info
+            });
+        }
+
+        // Spill warnings — merge SpillToTempDb context (level, threads) into Sort/Hash detail warnings.
+        // SpillToTempDb has the level and thread count; SortSpillDetails/HashSpillDetails have the memory/IO.
+        // Combine them into a single warning per spill. Only emit standalone SpillToTempDb when no detail exists.
+        var spillToTempDbEl = warningsEl.Element(Ns + "SpillToTempDb");
+        var spillLevel = spillToTempDbEl?.Attribute("SpillLevel")?.Value ?? "?";
+        var spillThreads = spillToTempDbEl?.Attribute("SpilledThreadCount")?.Value ?? "?";
+
+        // Sort spill details (merged with SpillToTempDb context)
+        foreach (var sortSpillEl in warningsEl.Elements(Ns + "SortSpillDetails"))
+        {
+            var granted = ParseLong(sortSpillEl.Attribute("GrantedMemoryKb")?.Value);
+            var used = ParseLong(sortSpillEl.Attribute("UsedMemoryKb")?.Value);
+            var writes = ParseLong(sortSpillEl.Attribute("WritesToTempDb")?.Value);
+            var reads = ParseLong(sortSpillEl.Attribute("ReadsFromTempDb")?.Value);
+            var prefix = spillToTempDbEl != null
+                ? $"Sort spill level {spillLevel}, {spillThreads} thread(s)"
+                : "Sort spill";
+            result.Add(new PlanWarning
+            {
+                WarningType = "Sort Spill",
+                Message = $"{prefix} — Granted: {granted:N0} KB, Used: {used:N0} KB, Writes: {writes:N0}, Reads: {reads:N0}",
+                Severity = PlanWarningSeverity.Warning,
+                SpillDetails = new SpillDetail
+                {
+                    SpillType = "Sort",
+                    GrantedMemoryKB = granted,
+                    UsedMemoryKB = used,
+                    WritesToTempDb = writes,
+                    ReadsFromTempDb = reads
+                }
+            });
+        }
+
+        // Hash spill details (merged with SpillToTempDb context)
+        foreach (var hashSpillEl in warningsEl.Elements(Ns + "HashSpillDetails"))
+        {
+            var granted = ParseLong(hashSpillEl.Attribute("GrantedMemoryKb")?.Value);
+            var used = ParseLong(hashSpillEl.Attribute("UsedMemoryKb")?.Value);
+            var writes = ParseLong(hashSpillEl.Attribute("WritesToTempDb")?.Value);
+            var reads = ParseLong(hashSpillEl.Attribute("ReadsFromTempDb")?.Value);
+            var prefix = spillToTempDbEl != null
+                ? $"Hash spill level {spillLevel}, {spillThreads} thread(s)"
+                : "Hash spill";
+            result.Add(new PlanWarning
+            {
+                WarningType = "Hash Spill",
+                Message = $"{prefix} — Granted: {granted:N0} KB, Used: {used:N0} KB, Writes: {writes:N0}, Reads: {reads:N0}",
+                Severity = PlanWarningSeverity.Warning,
+                SpillDetails = new SpillDetail
+                {
+                    SpillType = "Hash",
+                    GrantedMemoryKB = granted,
+                    UsedMemoryKB = used,
+                    WritesToTempDb = writes,
+                    ReadsFromTempDb = reads
+                }
+            });
+        }
+
+        // Standalone SpillToTempDb — only when no Sort/Hash detail elements consumed the context
+        if (spillToTempDbEl != null &&
+            !warningsEl.Elements(Ns + "SortSpillDetails").Any() &&
+            !warningsEl.Elements(Ns + "HashSpillDetails").Any())
+        {
+            var msg = $"Spill level {spillLevel}, {spillThreads} thread(s)";
+            var grantedKB = ParseLong(spillToTempDbEl.Attribute("GrantedMemoryKB")?.Value);
+            var usedKB = ParseLong(spillToTempDbEl.Attribute("UsedMemoryKB")?.Value);
+            var writes = ParseLong(spillToTempDbEl.Attribute("WritesToTempDb")?.Value);
+            var reads = ParseLong(spillToTempDbEl.Attribute("ReadsFromTempDb")?.Value);
+            if (grantedKB > 0 || writes > 0)
+            {
+                msg += $" — Granted: {grantedKB:N0} KB, Used: {usedKB:N0} KB";
+                if (writes > 0) msg += $", Writes: {writes:N0}";
+                if (reads > 0) msg += $", Reads: {reads:N0}";
+            }
+            result.Add(new PlanWarning
+            {
+                WarningType = "Spill to TempDb",
+                Message = msg,
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Exchange spill details
+        foreach (var exchSpillEl in warningsEl.Elements(Ns + "ExchangeSpillDetails"))
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Exchange Spill",
+                Message = $"Exchange spill — {ParseLong(exchSpillEl.Attribute("WritesToTempDb")?.Value):N0} writes to TempDB. The parallel exchange operator ran out of memory buffers and spilled rows to disk. This typically means the memory grant was too small for the data volume flowing through this exchange.",
+                Severity = PlanWarningSeverity.Warning,
+                SpillDetails = new SpillDetail
+                {
+                    SpillType = "Exchange",
+                    WritesToTempDb = ParseLong(exchSpillEl.Attribute("WritesToTempDb")?.Value)
+                }
+            });
+        }
+
+        // SpillOccurred
+        var spillOccurredEl = warningsEl.Element(Ns + "SpillOccurred");
+        if (spillOccurredEl != null)
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Spill Occurred",
+                Message = "Spill occurred during execution (from last query plan stats)",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Memory grant warning
+        var memWarnEl = warningsEl.Element(Ns + "MemoryGrantWarning");
+        if (memWarnEl != null)
+        {
+            var kind = memWarnEl.Attribute("GrantWarningKind")?.Value ?? "Unknown";
+            var requested = ParseLong(memWarnEl.Attribute("RequestedMemory")?.Value);
+            var granted = ParseLong(memWarnEl.Attribute("GrantedMemory")?.Value);
+            var maxUsed = ParseLong(memWarnEl.Attribute("MaxUsedMemory")?.Value);
+            result.Add(new PlanWarning
+            {
+                WarningType = "Memory Grant",
+                Message = $"{kind}: Requested {requested:N0} KB, Granted {granted:N0} KB, Used {maxUsed:N0} KB",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Implicit conversions
+        foreach (var convertEl in warningsEl.Elements(Ns + "PlanAffectingConvert"))
+        {
+            var issue = convertEl.Attribute("ConvertIssue")?.Value ?? "Unknown";
+            var expr = convertEl.Attribute("Expression")?.Value ?? "";
+            result.Add(new PlanWarning
+            {
+                WarningType = "Implicit Conversion",
+                Message = $"{issue}: {expr}",
+                Severity = issue.Contains("Cardinality") ? PlanWarningSeverity.Warning : PlanWarningSeverity.Critical
+            });
+        }
+
+        // Columns with no statistics
+        var noStatsEl = warningsEl.Element(Ns + "ColumnsWithNoStatistics");
+        if (noStatsEl != null)
+        {
+            var cols = noStatsEl.Elements(Ns + "ColumnReference")
+                .Select(c => c.Attribute("Column")?.Value ?? "")
+                .Where(s => !string.IsNullOrEmpty(s));
+            result.Add(new PlanWarning
+            {
+                WarningType = "Missing Statistics",
+                Message = $"No statistics on: {string.Join(", ", cols)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Wave 2.3: Columns with stale statistics
+        var staleStatsEl = warningsEl.Element(Ns + "ColumnsWithStaleStatistics");
+        if (staleStatsEl != null)
+        {
+            var cols = staleStatsEl.Elements(Ns + "ColumnReference")
+                .Select(c => c.Attribute("Column")?.Value ?? "")
+                .Where(s => !string.IsNullOrEmpty(s));
+            result.Add(new PlanWarning
+            {
+                WarningType = "Stale Statistics",
+                Message = $"Stale statistics on: {string.Join(", ", cols)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Wait warnings
+        foreach (var waitEl in warningsEl.Elements(Ns + "Wait"))
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Wait",
+                Message = $"{waitEl.Attribute("WaitType")?.Value}: {waitEl.Attribute("WaitTime")?.Value}ms",
+                Severity = PlanWarningSeverity.Info
+            });
+        }
+
+        return result;
+    }
+
+    private static void ComputeOperatorCosts(ParsedPlan plan)
+    {
+        foreach (var batch in plan.Batches)
+        {
+            foreach (var stmt in batch.Statements)
+            {
+                if (stmt.RootNode == null) continue;
+                var totalCost = stmt.StatementSubTreeCost > 0
+                    ? stmt.StatementSubTreeCost
+                    : stmt.RootNode.EstimatedTotalSubtreeCost;
+                if (totalCost <= 0) totalCost = 1;
+                ComputeNodeCosts(stmt.RootNode, totalCost);
+            }
+        }
+    }
+
+    private static void ComputeNodeCosts(PlanNode node, double totalStatementCost)
+    {
+        var childrenSubtreeCost = node.Children.Sum(c => c.EstimatedTotalSubtreeCost);
+        node.EstimatedOperatorCost = Math.Max(0, node.EstimatedTotalSubtreeCost - childrenSubtreeCost);
+        node.CostPercent = (int)Math.Round((node.EstimatedOperatorCost / totalStatementCost) * 100);
+        node.CostPercent = Math.Min(100, Math.Max(0, node.CostPercent));
+
+        foreach (var child in node.Children)
+            ComputeNodeCosts(child, totalStatementCost);
+    }
+
+    private static IEnumerable<XElement> ScopedDescendants(XElement element, XName name)
+    {
+        foreach (var child in element.Elements())
+        {
+            if (child.Name == Ns + "RelOp") continue;
+            if (child.Name == name) yield return child;
+            foreach (var desc in ScopedDescendants(child, name))
+                yield return desc;
+        }
+    }
+
+    private static string? ParseColumnList(XElement parent, string elementName)
+    {
+        var el = parent.Element(Ns + elementName);
+        if (el == null) return null;
+        var cols = el.Elements(Ns + "ColumnReference")
+            .Select(c => FormatColumnRef(c))
+            .Where(s => !string.IsNullOrEmpty(s));
+        var result = string.Join(", ", cols);
+        return string.IsNullOrEmpty(result) ? null : result;
+    }
+
+    private static string FormatColumnRef(XElement colRef)
+    {
+        var col = colRef.Attribute("Column")?.Value ?? "";
+        var tbl = colRef.Attribute("Table")?.Value ?? "";
+        var result = string.IsNullOrEmpty(tbl) ? col : $"{tbl}.{col}";
+        return result.Replace("[", "").Replace("]", "");
+    }
+
+    /// <summary>
+    /// Strips the internal padding and hex session suffix from temp table names.
+    /// SQL Server internally pads #temp names with underscores to 116 chars, then appends a hex suffix.
+    /// e.g. "#comment_sil_vous_plait_______________________________0000000000A86" → "#comment_sil_vous_plait"
+    /// </summary>
+    private static string CleanTempTableName(string name)
+    {
+        if (name.Length == 0 || name[0] != '#') return name;
+
+        // Find the end of the real name: trim trailing hex suffix, then trailing underscores
+        // The hex suffix is 8-16 hex chars at the end; the padding is consecutive underscores before it
+        var i = name.Length - 1;
+
+        // Skip trailing hex digits (0-9, A-F, a-f)
+        while (i > 0 && IsHexDigit(name[i])) i--;
+
+        // Skip trailing underscores (the padding)
+        while (i > 0 && name[i] == '_') i--;
+
+        // Only clean if we actually removed a meaningful amount (at least 8 chars of padding+hex)
+        if (name.Length - i > 8)
+            return name[..(i + 1)];
+        return name;
+    }
+
+    private static bool IsHexDigit(char c) =>
+        (c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f');
+
+    private static double ParseDouble(string? value)
+    {
+        if (string.IsNullOrEmpty(value)) return 0;
+        return double.TryParse(value, System.Globalization.NumberStyles.Float,
+            System.Globalization.CultureInfo.InvariantCulture, out var result) ? result : 0;
+    }
+
+    private static long ParseLong(string? value)
+    {
+        if (string.IsNullOrEmpty(value)) return 0;
+        return long.TryParse(value, out var result) ? result : 0;
+    }
+}
diff --git a/Lite/Services/SystemTrayService.cs b/Lite/Services/SystemTrayService.cs
index 8535777..a54bfc1 100644
--- a/Lite/Services/SystemTrayService.cs
+++ b/Lite/Services/SystemTrayService.cs
@@ -31,6 +31,7 @@ public SystemTrayService(Window mainWindow, CollectionBackgroundService? backgro
     {
         _mainWindow = mainWindow;
         _backgroundService = backgroundService;
+        Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
     }
 
     /// <summary>
@@ -42,29 +43,31 @@ public void Initialize()
 
         _trayIcon = new TaskbarIcon();
 
-        /* Custom dark tooltip (native ToolTipText uses Windows light theme) */
+        bool HasLightBackground = Helpers.ThemeManager.HasLightBackground;
+
+        /* Custom tooltip styled to match current theme */
         _tooltipText = new TextBlock
         {
             Text = "Performance Monitor Lite",
-            Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4E6EB")),
+            Foreground = new SolidColorBrush(HasLightBackground
+                ? (Color)ColorConverter.ConvertFromString("#1A1D23")
+                : (Color)ColorConverter.ConvertFromString("#E4E6EB")),
             FontSize = 12
         };
         _trayIcon.TrayToolTip = new Border
         {
-            Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#22252b")),
-            BorderBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#33363e")),
+            Background = new SolidColorBrush(HasLightBackground
+                ? (Color)ColorConverter.ConvertFromString("#FFFFFF")
+                : (Color)ColorConverter.ConvertFromString("#22252b")),
+            BorderBrush = new SolidColorBrush(HasLightBackground
+                ? (Color)ColorConverter.ConvertFromString("#DEE2E6")
+                : (Color)ColorConverter.ConvertFromString("#33363e")),
             BorderThickness = new Thickness(1),
             Padding = new Thickness(10, 8, 10, 8),
             CornerRadius = new CornerRadius(4),
             Child = _tooltipText
         };
 
-        /* Load dark theme for context menu styling */
-        var darkTheme = new ResourceDictionary
-        {
-            Source = new Uri("pack://application:,,,/Themes/DarkTheme.xaml", UriKind.Absolute)
-        };
-
         /* Load icon */
         try
         {
@@ -76,9 +79,8 @@ public void Initialize()
             /* Icon loading failed - tray icon will be blank but functional */
         }
 
-        /* Build context menu with dark theme */
+        /* Build context menu */
         var contextMenu = new ContextMenu();
-        contextMenu.Resources.MergedDictionaries.Add(darkTheme);
 
         var showItem = new MenuItem { Header = "Show Window", Icon = new TextBlock { Text = "📊", Background = Brushes.Transparent } };
         showItem.Click += (s, e) => ShowMainWindow();
@@ -166,6 +168,7 @@ protected virtual void Dispose(bool disposing)
 
         if (disposing && _trayIcon != null)
         {
+            Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
             _mainWindow.StateChanged -= MainWindow_StateChanged;
             _trayIcon.Visibility = Visibility.Collapsed;
             _trayIcon.Dispose();
@@ -174,4 +177,10 @@ protected virtual void Dispose(bool disposing)
 
         _disposed = true;
     }
+
+    private void OnThemeChanged(string _)
+    {
+        _mainWindow.Dispatcher.InvokeAsync(Initialize);
+    }
 }
+
diff --git a/Lite/Themes/CoolBreezeTheme.xaml b/Lite/Themes/CoolBreezeTheme.xaml
new file mode 100644
index 0000000..6bd705d
--- /dev/null
+++ b/Lite/Themes/CoolBreezeTheme.xaml
@@ -0,0 +1,1211 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:helpers="clr-namespace:PerformanceMonitorLite.Helpers">
+
+    <!-- ============================================ -->
+    <!-- Darling Data Cool Breeze Theme                      -->
+    <!-- Flat/Minimal Design                          -->
+    <!-- ============================================ -->
+
+    <!-- Brand Colors -->
+    <Color x:Key="AccentColor">#1E6FA8</Color>
+    <Color x:Key="AccentHoverColor">#2B87C8</Color>
+    <Color x:Key="AccentPressedColor">#155A8A</Color>
+
+    <!-- Background Colors -->
+    <Color x:Key="BackgroundDarkColor">#CFDDE9</Color>
+    <Color x:Key="AlternatingRowColor">#C5D5E4</Color>
+    <Color x:Key="BackgroundColor">#DAE6F0</Color>
+    <Color x:Key="BackgroundLightColor">#EEF4FA</Color>
+    <Color x:Key="BackgroundLighterColor">#BDD0E1</Color>
+
+    <!-- Text Colors (dark on light backgrounds) -->
+    <Color x:Key="ForegroundColor">#1A2A3A</Color>
+    <Color x:Key="ForegroundDimColor">#364D61</Color>
+    <Color x:Key="ForegroundMutedColor">#5B7A90</Color>
+
+    <!-- Border Colors (subtle, low-contrast) -->
+    <Color x:Key="BorderColor">#A8BDD0</Color>
+    <Color x:Key="BorderLightColor">#8AACC4</Color>
+
+    <!-- Status Colors (Material Design 700 — visible against light backgrounds) -->
+    <Color x:Key="SuccessColor">#2E7D32</Color>
+    <Color x:Key="WarningColor">#F57F17</Color>
+    <Color x:Key="ErrorColor">#C62828</Color>
+    <Color x:Key="InfoColor">#1E6FA8</Color>
+
+    <!-- Spacing Scale -->
+    <sys:Double x:Key="SpacingXS">2</sys:Double>
+    <sys:Double x:Key="SpacingSm">4</sys:Double>
+    <sys:Double x:Key="SpacingMd">8</sys:Double>
+    <sys:Double x:Key="SpacingLg">12</sys:Double>
+    <sys:Double x:Key="SpacingXL">16</sys:Double>
+
+    <!-- Corner Radius -->
+    <CornerRadius x:Key="CornerRadiusSm">2</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusMd">4</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusLg">6</CornerRadius>
+
+    <!-- Brushes -->
+    <SolidColorBrush x:Key="AccentBrush" Color="{StaticResource AccentColor}"/>
+    <SolidColorBrush x:Key="AccentHoverBrush" Color="{StaticResource AccentHoverColor}"/>
+    <SolidColorBrush x:Key="AccentPressedBrush" Color="{StaticResource AccentPressedColor}"/>
+
+    <SolidColorBrush x:Key="BackgroundDarkBrush" Color="{StaticResource BackgroundDarkColor}"/>
+    <SolidColorBrush x:Key="AlternatingRowBrush" Color="{StaticResource AlternatingRowColor}"/>
+    <SolidColorBrush x:Key="BackgroundBrush" Color="{StaticResource BackgroundColor}"/>
+    <SolidColorBrush x:Key="BackgroundLightBrush" Color="{StaticResource BackgroundLightColor}"/>
+    <SolidColorBrush x:Key="BackgroundLighterBrush" Color="{StaticResource BackgroundLighterColor}"/>
+
+    <SolidColorBrush x:Key="ForegroundBrush" Color="{StaticResource ForegroundColor}"/>
+    <SolidColorBrush x:Key="ForegroundDimBrush" Color="{StaticResource ForegroundDimColor}"/>
+    <SolidColorBrush x:Key="ForegroundMutedBrush" Color="{StaticResource ForegroundColor}"/>
+
+    <SolidColorBrush x:Key="BorderBrush" Color="{StaticResource BorderColor}"/>
+    <SolidColorBrush x:Key="BorderLightBrush" Color="{StaticResource BorderLightColor}"/>
+
+    <SolidColorBrush x:Key="SuccessBrush" Color="{StaticResource SuccessColor}"/>
+    <SolidColorBrush x:Key="WarningBrush" Color="{StaticResource WarningColor}"/>
+    <SolidColorBrush x:Key="ErrorBrush" Color="{StaticResource ErrorColor}"/>
+    <SolidColorBrush x:Key="InfoBrush" Color="{StaticResource InfoColor}"/>
+
+    <!-- ============================================ -->
+    <!-- Window Style                                 -->
+    <!-- ============================================ -->
+    <Style TargetType="Window">
+        <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- TextBlock Style                              -->
+    <!-- ============================================ -->
+    <Style TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Label Style                                  -->
+    <!-- ============================================ -->
+    <Style TargetType="Label">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Button Style - Flat Design                   -->
+    <!-- ============================================ -->
+    <Style TargetType="Button">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="#1A2A3A"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="12,6"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetName="border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="{StaticResource BackgroundLighterColor}" Duration="0:0:0.12"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetName="border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="{StaticResource BackgroundLightColor}" Duration="0:0:0.12"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentPressedBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Accent Button Style (for primary actions) -->
+    <Style x:Key="AccentButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentPressedBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- No Data Message Style (for empty DataGrids) -->
+    <Style x:Key="NoDataMessage" TargetType="TextBlock">
+        <Setter Property="Text" Value="No data for selected time range"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Visibility" Value="Collapsed"/>
+    </Style>
+
+    <!-- Alert Badge Styles -->
+    <Style x:Key="AlertBadge" TargetType="Border">
+        <Setter Property="Background" Value="#D97706"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="4,1"/>
+        <Setter Property="Margin" Value="6,0,0,0"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <Style x:Key="AlertBadgeCritical" TargetType="Border">
+        <Setter Property="Background" Value="#DC2626"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="4,1"/>
+        <Setter Property="Margin" Value="6,0,0,0"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <!-- ToggleButton Style (respects Background in all states) -->
+    <Style TargetType="ToggleButton">
+        <Setter Property="Background" Value="#E8ECF0"/>
+        <Setter Property="Foreground" Value="#1A2A3A"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="12,5"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border x:Name="Border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            CornerRadius="2">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.85"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.7"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Tab Close Button Style -->
+    <Style x:Key="TabCloseButton" TargetType="Button">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Width" Value="22"/>
+        <Setter Property="Height" Value="22"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="6,0,0,0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="FontSize" Value="15"/>
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="ToolTip" Value="Close tab"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="3"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}">
+                        <TextBlock Text="×"
+                                   FontSize="{TemplateBinding FontSize}"
+                                   FontWeight="{TemplateBinding FontWeight}"
+                                   Foreground="{TemplateBinding Foreground}"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   Margin="0,-2,0,0"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#C42B1C"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#9A2316"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Success Button Style (for Refresh) -->
+    <Style x:Key="SuccessButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Background" Value="{StaticResource SuccessBrush}"/>
+        <Setter Property="Foreground" Value="#EEF4FA"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#5DBF60"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#3D9140"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- TextBox Style                                -->
+    <!-- ============================================ -->
+
+    <!-- Named style for filter TextBoxes in DataGrid column headers -->
+    <Style x:Key="FilterTextBoxStyle" TargetType="TextBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="#1A2A3A"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="4,2"/>
+        <Setter Property="CaretBrush" Value="#1A2A3A"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+    </Style>
+
+    <!-- Column Filter Button Style - small button with filter icon -->
+    <Style x:Key="ColumnFilterButtonStyle" TargetType="Button">
+        <Setter Property="Width" Value="18"/>
+        <Setter Property="Height" Value="18"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Content" Value="&#xE71C;"/>
+        <Setter Property="FontFamily" Value="Segoe MDL2 Assets"/>
+        <Setter Property="FontSize" Value="11"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundDimBrush}"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <ContentPresenter HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Column Filter Button Style when filter is active -->
+    <Style x:Key="ColumnFilterButtonActiveStyle" TargetType="Button" BasedOn="{StaticResource ColumnFilterButtonStyle}">
+        <Setter Property="Foreground" Value="#FFD700"/>
+        <Setter Property="Background" Value="#33FFD700"/>
+        <Setter Property="Content" Value="&#xE16E;"/>
+        <Setter Property="ToolTip" Value="Filter active — click to modify"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="#FFEC8B"/>
+                <Setter Property="Background" Value="#55FFD700"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="TextBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TextBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            TextElement.Foreground="{StaticResource ForegroundBrush}">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Background="{StaticResource BackgroundDarkBrush}"
+                                      Margin="{TemplateBinding Padding}"
+                                      Foreground="{StaticResource ForegroundBrush}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- PasswordBox Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="PasswordBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Margin="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ComboBox Style                               -->
+    <!-- ============================================ -->
+    <ControlTemplate x:Key="ComboBoxToggleButton" TargetType="ToggleButton">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="20"/>
+            </Grid.ColumnDefinitions>
+            <Border x:Name="Border" Grid.ColumnSpan="2"
+                    Background="{StaticResource BackgroundDarkBrush}"
+                    BorderBrush="{StaticResource BorderBrush}"
+                    BorderThickness="1" CornerRadius="2"/>
+            <Border Grid.Column="0" Margin="1"
+                    Background="{StaticResource BackgroundDarkBrush}"
+                    BorderThickness="0"/>
+            <Path x:Name="Arrow" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
+                  Data="M 0 0 L 4 4 L 8 0 Z" Fill="{StaticResource ForegroundBrush}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style TargetType="ComboBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBox">
+                    <Grid>
+                        <ToggleButton x:Name="ToggleButton"
+                                      Template="{StaticResource ComboBoxToggleButton}"
+                                      Focusable="False"
+                                      IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ClickMode="Press"/>
+                        <ContentPresenter x:Name="ContentSite" IsHitTestVisible="False"
+                                          Content="{TemplateBinding SelectionBoxItem}"
+                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                          Margin="6,4,23,4" VerticalAlignment="Center" HorizontalAlignment="Left">
+                            <ContentPresenter.Resources>
+                                <Style TargetType="TextBlock">
+                                    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+                                </Style>
+                            </ContentPresenter.Resources>
+                        </ContentPresenter>
+                        <TextBox x:Name="PART_EditableTextBox"
+                                 Style="{x:Null}"
+                                 HorizontalAlignment="Left" VerticalAlignment="Center"
+                                 Margin="6,4,23,4" Focusable="True"
+                                 Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                 Visibility="Hidden" IsReadOnly="{TemplateBinding IsReadOnly}"/>
+                        <Popup x:Name="Popup" Placement="Bottom" IsOpen="{TemplateBinding IsDropDownOpen}"
+                               AllowsTransparency="True" Focusable="False" PopupAnimation="Slide">
+                            <Grid x:Name="DropDown" SnapsToDevicePixels="True"
+                                  MinWidth="{TemplateBinding ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <Border x:Name="DropDownBorder"
+                                        Background="{StaticResource BackgroundDarkBrush}"
+                                        BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"/>
+                                <ScrollViewer Margin="1" SnapsToDevicePixels="True">
+                                    <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained"/>
+                                </ScrollViewer>
+                            </Grid>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="ComboBoxItem">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBoxItem">
+                    <Border x:Name="Bd" Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- TabControl Style                             -->
+    <!-- ============================================ -->
+    <Style TargetType="TabControl">
+        <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+    </Style>
+
+    <Style TargetType="TabItem">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundDimBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="12,8"/>
+        <Setter Property="Margin" Value="0,0,2,0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TabItem">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="3,3,0,0"
+                            Padding="{TemplateBinding Padding}"
+                            Margin="{TemplateBinding Margin}">
+                        <ContentPresenter x:Name="contentPresenter"
+                                          ContentSource="Header"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentBrush}"/>
+                            <Setter Property="Foreground" Value="#EEF4FA"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- DataGrid Style                               -->
+    <!-- ============================================ -->
+    <Style TargetType="DataGrid">
+        <Setter Property="helpers:DataGridClipboardBehavior.FixHeaderCopy" Value="True"/>
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="ClipToBounds" Value="True"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="RowBackground" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="AlternatingRowBackground" Value="{StaticResource AlternatingRowBrush}"/>
+        <Setter Property="GridLinesVisibility" Value="Horizontal"/>
+        <Setter Property="HorizontalGridLinesBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="VerticalGridLinesBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="HeadersVisibility" Value="Column"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Visible"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Visible"/>
+    </Style>
+
+    <!-- Column header resize gripper -->
+    <Style x:Key="ColumnHeaderGripperStyle" TargetType="{x:Type Thumb}">
+        <Setter Property="Width" Value="8"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="SizeWE"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="DataGridColumnHeader">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0,0,1,1"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridColumnHeader">
+                    <Grid>
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <ContentPresenter Grid.Column="0"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="Center"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                <Path x:Name="SortArrow"
+                                      Grid.Column="1"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      Width="8" Height="6"
+                                      Margin="4,0,2,0"
+                                      Stretch="Fill"
+                                      Opacity="0.7"
+                                      Fill="{StaticResource ForegroundDimBrush}"
+                                      RenderTransformOrigin="0.5,0.5"
+                                      Visibility="Collapsed"
+                                      Data="M 0,0 L 8,0 L 4,6 Z"/>
+                            </Grid>
+                        </Border>
+                        <Thumb x:Name="PART_LeftHeaderGripper"
+                               HorizontalAlignment="Left"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                        <Thumb x:Name="PART_RightHeaderGripper"
+                               HorizontalAlignment="Right"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="SortDirection" Value="Ascending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="SortArrow" Property="RenderTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="SortDirection" Value="Descending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Column header style when filter is active - subtle blue highlight -->
+    <Style x:Key="FilteredColumnHeaderStyle" TargetType="DataGridColumnHeader"
+           BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+        <Setter Property="Background" Value="#9DBFD9"/>
+    </Style>
+
+    <!-- Right-aligned text style for numeric DataGrid columns -->
+    <Style x:Key="NumericCell" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+        <Setter Property="TextAlignment" Value="Right"/>
+    </Style>
+
+    <Style TargetType="DataGridCell">
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridCell">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
+                <Setter Property="Foreground" Value="#EEF4FA"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="DataGridRow">
+        <Setter Property="Background" Value="Transparent"/>
+        <Style.Triggers>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ListView Style                               -->
+    <!-- ============================================ -->
+    <Style TargetType="ListView">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+    </Style>
+
+    <Style TargetType="ListViewItem">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="Margin" Value="2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListViewItem">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                            <Setter TargetName="border" Property="BorderThickness" Value="1"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ScrollBar Style                              -->
+    <!-- ============================================ -->
+    <Style TargetType="ScrollBar">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Border Style for Panels                      -->
+    <!-- ============================================ -->
+    <Style x:Key="PanelBorder" TargetType="Border">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="10"/>
+    </Style>
+
+    <!-- Card Style for Chart Containers -->
+    <Style x:Key="ChartCard" TargetType="Border">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Margin" Value="5"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- DatePickerTextBox Style (internal control)   -->
+    <!-- ============================================ -->
+    <Style TargetType="DatePickerTextBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DatePickerTextBox">
+                    <Grid Background="{StaticResource BackgroundDarkBrush}">
+                        <Border x:Name="Border"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}">
+                            <ScrollViewer x:Name="PART_ContentHost" Background="{StaticResource BackgroundDarkBrush}"
+                                          HorizontalContentAlignment="Stretch"
+                                          VerticalContentAlignment="Center"/>
+                        </Border>
+                        <!-- Watermark: hidden via Visibility=Collapsed -->
+                        <ContentControl x:Name="PART_Watermark"
+                                        Focusable="False"
+                                        IsHitTestVisible="False"
+                                        Visibility="Collapsed"
+                                        Foreground="{StaticResource ForegroundMutedBrush}"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- DatePicker Style                             -->
+    <!-- ============================================ -->
+    <Style TargetType="DatePicker">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="4,2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DatePicker">
+                    <Border x:Name="OuterBorder"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}">
+                        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <DatePickerTextBox x:Name="PART_TextBox"
+                                               Grid.Column="0"
+                                               Focusable="True"
+                                               HorizontalContentAlignment="Stretch"
+                                               VerticalContentAlignment="Center"
+                                               Background="Transparent"
+                                               Foreground="{StaticResource ForegroundBrush}"/>
+                            <Button x:Name="PART_Button"
+                                    Grid.Column="1"
+                                    Focusable="False"
+                                    Foreground="{StaticResource ForegroundBrush}"
+                                    Background="Transparent"
+                                    BorderThickness="0"
+                                    Padding="4,0">
+                                <Path Data="M0,0 L4,4 L8,0 Z"
+                                      Fill="{StaticResource ForegroundBrush}"
+                                      VerticalAlignment="Center"/>
+                            </Button>
+                            <Popup x:Name="PART_Popup"
+                                   AllowsTransparency="True"
+                                   Placement="Bottom"
+                                   PlacementTarget="{Binding ElementName=OuterBorder}"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Calendar Styles for DatePicker dropdown      -->
+    <!-- ============================================ -->
+
+    <!-- Calendar main style with full template -->
+    <Style TargetType="Calendar">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Calendar">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <CalendarItem x:Name="PART_CalendarItem"
+                                      Background="{StaticResource BackgroundDarkBrush}"
+                                      BorderThickness="0"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- CalendarItem style (the container for month/year views) -->
+    <Style TargetType="CalendarItem">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarItem">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+
+                            <!-- Header: Previous/Next buttons and Month/Year title -->
+                            <Grid Grid.Row="0" Background="{StaticResource BackgroundLightBrush}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+
+                                <Button x:Name="PART_PreviousButton" Grid.Column="0"
+                                        Content="&#x25C0;" FontWeight="Bold"
+                                        Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                        BorderThickness="0" Padding="10,5"
+                                        Cursor="Hand"/>
+
+                                <Button x:Name="PART_HeaderButton" Grid.Column="1"
+                                        HorizontalAlignment="Center"
+                                        Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                        BorderThickness="0" FontWeight="SemiBold" FontSize="14"
+                                        Padding="5" Cursor="Hand"/>
+
+                                <Button x:Name="PART_NextButton" Grid.Column="2"
+                                        Content="&#x25B6;" FontWeight="Bold"
+                                        Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                        BorderThickness="0" Padding="10,5"
+                                        Cursor="Hand"/>
+                            </Grid>
+
+                            <!-- Day grid or Month/Year grid -->
+                            <Grid Grid.Row="1" Background="{StaticResource BackgroundDarkBrush}">
+                                <Grid x:Name="PART_MonthView" Visibility="Visible">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+                                <Grid x:Name="PART_YearView" Visibility="Hidden">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+                            </Grid>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- CalendarDayButton style (individual day cells) -->
+    <Style TargetType="CalendarDayButton">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="MinWidth" Value="32"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarDayButton">
+                    <Grid>
+                        <Border x:Name="Background" Background="Transparent" CornerRadius="3"/>
+                        <ContentPresenter x:Name="Content"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsToday" Value="True">
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                            <Setter TargetName="Background" Property="BorderThickness" Value="1"/>
+                        </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsBlackedOut" Value="True">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- CalendarButton style (month/year selection cells) -->
+    <Style TargetType="CalendarButton">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="MinWidth" Value="50"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarButton">
+                    <Grid>
+                        <Border x:Name="Background" Background="Transparent" CornerRadius="3"/>
+                        <ContentPresenter x:Name="Content"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="HasSelectedDays" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- CheckBox Style                               -->
+    <!-- ============================================ -->
+    <Style TargetType="CheckBox">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CheckBox">
+                    <BulletDecorator Background="Transparent" VerticalAlignment="Center">
+                        <BulletDecorator.Bullet>
+                            <Border x:Name="Border" Width="16" Height="16"
+                                    Background="{StaticResource BackgroundDarkBrush}"
+                                    BorderBrush="{StaticResource BorderBrush}"
+                                    BorderThickness="1" CornerRadius="2">
+                                <Path x:Name="CheckMark" Width="10" Height="10" Stretch="Fill"
+                                      Stroke="{StaticResource AccentBrush}" StrokeThickness="2"
+                                      Data="M 0,5 L 4,9 L 10,0" Visibility="Collapsed"
+                                      HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                        </BulletDecorator.Bullet>
+                        <ContentPresenter Margin="6,0,0,0"
+                                          VerticalAlignment="Center"
+                                          HorizontalAlignment="Left"
+                                          RecognizesAccessKey="True"/>
+                    </BulletDecorator>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="CheckMark" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ForegroundMutedBrush}"/>
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ContextMenu Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="ContextMenu">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderLightBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ContextMenu">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            CornerRadius="4">
+                        <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="MenuItem">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="MenuItem">
+                    <Border x:Name="Border" Background="{TemplateBinding Background}" BorderThickness="0">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="26" SharedSizeGroup="MenuItemIconColumnGroup"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="17"/>
+                            </Grid.ColumnDefinitions>
+                            <!-- Icon column -->
+                            <Border x:Name="IconColumn" Grid.Column="0" Background="Transparent"/>
+                            <ContentPresenter x:Name="Icon" Grid.Column="0" Margin="4,0,6,0" VerticalAlignment="Center" ContentSource="Icon"/>
+                            <ContentPresenter Grid.Column="1" Margin="8,4" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Separator Style                              -->
+    <!-- ============================================ -->
+    <Style TargetType="Separator">
+        <Setter Property="Background" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="Margin" Value="0,4"/>
+        <Setter Property="Height" Value="1"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ToolTip Style                                -->
+    <!-- ============================================ -->
+    <Style TargetType="ToolTip">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderLightBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="10,8"/>
+    </Style>
+
+
+</ResourceDictionary>
+
+
diff --git a/Lite/Themes/DarkTheme.xaml b/Lite/Themes/DarkTheme.xaml
index ef8ef3d..2160b01 100644
--- a/Lite/Themes/DarkTheme.xaml
+++ b/Lite/Themes/DarkTheme.xaml
@@ -60,7 +60,7 @@
 
     <SolidColorBrush x:Key="ForegroundBrush" Color="{StaticResource ForegroundColor}"/>
     <SolidColorBrush x:Key="ForegroundDimBrush" Color="{StaticResource ForegroundDimColor}"/>
-    <SolidColorBrush x:Key="ForegroundMutedBrush" Color="{StaticResource ForegroundMutedColor}"/>
+    <SolidColorBrush x:Key="ForegroundMutedBrush" Color="{StaticResource ForegroundColor}"/>
 
     <SolidColorBrush x:Key="BorderBrush" Color="{StaticResource BorderColor}"/>
     <SolidColorBrush x:Key="BorderLightBrush" Color="{StaticResource BorderLightColor}"/>
@@ -401,6 +401,41 @@
         </Setter>
     </Style>
 
+    <!-- ============================================ -->
+    <!-- PasswordBox Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="PasswordBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Margin="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!-- ============================================ -->
     <!-- ComboBox Style                               -->
     <!-- ============================================ -->
@@ -497,14 +532,11 @@
                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsHighlighted" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
-                        </Trigger>
                         <Trigger Property="IsSelected" Value="True">
                             <Setter TargetName="Bd" Property="Background" Value="{StaticResource AccentBrush}"/>
                         </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/Lite/Themes/LightTheme.xaml b/Lite/Themes/LightTheme.xaml
new file mode 100644
index 0000000..dc2dab7
--- /dev/null
+++ b/Lite/Themes/LightTheme.xaml
@@ -0,0 +1,1209 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:helpers="clr-namespace:PerformanceMonitorLite.Helpers">
+
+    <!-- ============================================ -->
+    <!-- Darling Data Light Theme                      -->
+    <!-- Flat/Minimal Design                          -->
+    <!-- ============================================ -->
+
+    <!-- Brand Colors -->
+    <Color x:Key="AccentColor">#2eaef1</Color>
+    <Color x:Key="AccentHoverColor">#5bc4f5</Color>
+    <Color x:Key="AccentPressedColor">#1a9ae0</Color>
+
+    <!-- Background Colors -->
+    <Color x:Key="BackgroundDarkColor">#F0F2F5</Color>
+    <Color x:Key="AlternatingRowColor">#EDF1F7</Color>
+    <Color x:Key="BackgroundColor">#F5F7FA</Color>
+    <Color x:Key="BackgroundLightColor">#FFFFFF</Color>
+    <Color x:Key="BackgroundLighterColor">#E8ECF0</Color>
+
+    <!-- Text Colors (dark on light backgrounds) -->
+    <Color x:Key="ForegroundColor">#1A1D23</Color>
+    <Color x:Key="ForegroundDimColor">#4A5568</Color>
+    <Color x:Key="ForegroundMutedColor">#718096</Color>
+
+    <!-- Border Colors (subtle, low-contrast) -->
+    <Color x:Key="BorderColor">#DEE2E6</Color>
+    <Color x:Key="BorderLightColor">#CED4DA</Color>
+
+    <!-- Status Colors (Material Design 700 — visible against light backgrounds) -->
+    <Color x:Key="SuccessColor">#2E7D32</Color>
+    <Color x:Key="WarningColor">#F57F17</Color>
+    <Color x:Key="ErrorColor">#C62828</Color>
+    <Color x:Key="InfoColor">#2eaef1</Color>
+
+    <!-- Spacing Scale -->
+    <sys:Double x:Key="SpacingXS">2</sys:Double>
+    <sys:Double x:Key="SpacingSm">4</sys:Double>
+    <sys:Double x:Key="SpacingMd">8</sys:Double>
+    <sys:Double x:Key="SpacingLg">12</sys:Double>
+    <sys:Double x:Key="SpacingXL">16</sys:Double>
+
+    <!-- Corner Radius -->
+    <CornerRadius x:Key="CornerRadiusSm">2</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusMd">4</CornerRadius>
+    <CornerRadius x:Key="CornerRadiusLg">6</CornerRadius>
+
+    <!-- Brushes -->
+    <SolidColorBrush x:Key="AccentBrush" Color="{StaticResource AccentColor}"/>
+    <SolidColorBrush x:Key="AccentHoverBrush" Color="{StaticResource AccentHoverColor}"/>
+    <SolidColorBrush x:Key="AccentPressedBrush" Color="{StaticResource AccentPressedColor}"/>
+
+    <SolidColorBrush x:Key="BackgroundDarkBrush" Color="{StaticResource BackgroundDarkColor}"/>
+    <SolidColorBrush x:Key="AlternatingRowBrush" Color="{StaticResource AlternatingRowColor}"/>
+    <SolidColorBrush x:Key="BackgroundBrush" Color="{StaticResource BackgroundColor}"/>
+    <SolidColorBrush x:Key="BackgroundLightBrush" Color="{StaticResource BackgroundLightColor}"/>
+    <SolidColorBrush x:Key="BackgroundLighterBrush" Color="{StaticResource BackgroundLighterColor}"/>
+
+    <SolidColorBrush x:Key="ForegroundBrush" Color="{StaticResource ForegroundColor}"/>
+    <SolidColorBrush x:Key="ForegroundDimBrush" Color="{StaticResource ForegroundDimColor}"/>
+    <SolidColorBrush x:Key="ForegroundMutedBrush" Color="{StaticResource ForegroundColor}"/>
+
+    <SolidColorBrush x:Key="BorderBrush" Color="{StaticResource BorderColor}"/>
+    <SolidColorBrush x:Key="BorderLightBrush" Color="{StaticResource BorderLightColor}"/>
+
+    <SolidColorBrush x:Key="SuccessBrush" Color="{StaticResource SuccessColor}"/>
+    <SolidColorBrush x:Key="WarningBrush" Color="{StaticResource WarningColor}"/>
+    <SolidColorBrush x:Key="ErrorBrush" Color="{StaticResource ErrorColor}"/>
+    <SolidColorBrush x:Key="InfoBrush" Color="{StaticResource InfoColor}"/>
+
+    <!-- ============================================ -->
+    <!-- Window Style                                 -->
+    <!-- ============================================ -->
+    <Style TargetType="Window">
+        <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- TextBlock Style                              -->
+    <!-- ============================================ -->
+    <Style TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Label Style                                  -->
+    <!-- ============================================ -->
+    <Style TargetType="Label">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Button Style - Flat Design                   -->
+    <!-- ============================================ -->
+    <Style TargetType="Button">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="#1A1D23"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="12,6"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetName="border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="{StaticResource BackgroundLighterColor}" Duration="0:0:0.12"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetName="border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="{StaticResource BackgroundLightColor}" Duration="0:0:0.12"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentPressedBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Accent Button Style (for primary actions) -->
+    <Style x:Key="AccentButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentPressedBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- No Data Message Style (for empty DataGrids) -->
+    <Style x:Key="NoDataMessage" TargetType="TextBlock">
+        <Setter Property="Text" Value="No data for selected time range"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Visibility" Value="Collapsed"/>
+    </Style>
+
+    <!-- Alert Badge Styles -->
+    <Style x:Key="AlertBadge" TargetType="Border">
+        <Setter Property="Background" Value="#D97706"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="4,1"/>
+        <Setter Property="Margin" Value="6,0,0,0"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <Style x:Key="AlertBadgeCritical" TargetType="Border">
+        <Setter Property="Background" Value="#DC2626"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="4,1"/>
+        <Setter Property="Margin" Value="6,0,0,0"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+
+    <!-- ToggleButton Style (respects Background in all states) -->
+    <Style TargetType="ToggleButton">
+        <Setter Property="Background" Value="#E8ECF0"/>
+        <Setter Property="Foreground" Value="#1A1D23"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="12,5"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border x:Name="Border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            CornerRadius="2">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.85"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Border" Property="Opacity" Value="0.7"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Tab Close Button Style -->
+    <Style x:Key="TabCloseButton" TargetType="Button">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Width" Value="22"/>
+        <Setter Property="Height" Value="22"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="6,0,0,0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="FontSize" Value="15"/>
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="ToolTip" Value="Close tab"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="3"
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}">
+                        <TextBlock Text="×"
+                                   FontSize="{TemplateBinding FontSize}"
+                                   FontWeight="{TemplateBinding FontWeight}"
+                                   Foreground="{TemplateBinding Foreground}"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   Margin="0,-2,0,0"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#C42B1C"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#9A2316"/>
+                            <Setter Property="Foreground" Value="White"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Success Button Style (for Refresh) -->
+    <Style x:Key="SuccessButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Background" Value="{StaticResource SuccessBrush}"/>
+        <Setter Property="Foreground" Value="#E4E6EB"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#5DBF60"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#3D9140"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- TextBox Style                                -->
+    <!-- ============================================ -->
+
+    <!-- Named style for filter TextBoxes in DataGrid column headers -->
+    <Style x:Key="FilterTextBoxStyle" TargetType="TextBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="#1A1D23"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="4,2"/>
+        <Setter Property="CaretBrush" Value="#1A1D23"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+    </Style>
+
+    <!-- Column Filter Button Style - small button with filter icon -->
+    <Style x:Key="ColumnFilterButtonStyle" TargetType="Button">
+        <Setter Property="Width" Value="18"/>
+        <Setter Property="Height" Value="18"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Content" Value="&#xE71C;"/>
+        <Setter Property="FontFamily" Value="Segoe MDL2 Assets"/>
+        <Setter Property="FontSize" Value="11"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundDimBrush}"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <ContentPresenter HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- Column Filter Button Style when filter is active -->
+    <Style x:Key="ColumnFilterButtonActiveStyle" TargetType="Button" BasedOn="{StaticResource ColumnFilterButtonStyle}">
+        <Setter Property="Foreground" Value="#FFD700"/>
+        <Setter Property="Background" Value="#33FFD700"/>
+        <Setter Property="Content" Value="&#xE16E;"/>
+        <Setter Property="ToolTip" Value="Filter active — click to modify"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="#FFEC8B"/>
+                <Setter Property="Background" Value="#55FFD700"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="TextBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TextBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            TextElement.Foreground="{StaticResource ForegroundBrush}">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Background="{StaticResource BackgroundDarkBrush}"
+                                      Margin="{TemplateBinding Padding}"
+                                      Foreground="{StaticResource ForegroundBrush}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- PasswordBox Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="CaretBrush" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="PasswordBox">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Margin="{TemplateBinding Padding}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ComboBox Style                               -->
+    <!-- ============================================ -->
+    <ControlTemplate x:Key="ComboBoxToggleButton" TargetType="ToggleButton">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="20"/>
+            </Grid.ColumnDefinitions>
+            <Border x:Name="Border" Grid.ColumnSpan="2"
+                    Background="{StaticResource BackgroundDarkBrush}"
+                    BorderBrush="{StaticResource BorderBrush}"
+                    BorderThickness="1" CornerRadius="2"/>
+            <Border Grid.Column="0" Margin="1"
+                    Background="{StaticResource BackgroundDarkBrush}"
+                    BorderThickness="0"/>
+            <Path x:Name="Arrow" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
+                  Data="M 0 0 L 4 4 L 8 0 Z" Fill="{StaticResource ForegroundBrush}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style TargetType="ComboBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBox">
+                    <Grid>
+                        <ToggleButton x:Name="ToggleButton"
+                                      Template="{StaticResource ComboBoxToggleButton}"
+                                      Focusable="False"
+                                      IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                      ClickMode="Press"/>
+                        <ContentPresenter x:Name="ContentSite" IsHitTestVisible="False"
+                                          Content="{TemplateBinding SelectionBoxItem}"
+                                          ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                          Margin="6,4,23,4" VerticalAlignment="Center" HorizontalAlignment="Left">
+                            <ContentPresenter.Resources>
+                                <Style TargetType="TextBlock">
+                                    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+                                </Style>
+                            </ContentPresenter.Resources>
+                        </ContentPresenter>
+                        <TextBox x:Name="PART_EditableTextBox"
+                                 Style="{x:Null}"
+                                 HorizontalAlignment="Left" VerticalAlignment="Center"
+                                 Margin="6,4,23,4" Focusable="True"
+                                 Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                 Visibility="Hidden" IsReadOnly="{TemplateBinding IsReadOnly}"/>
+                        <Popup x:Name="Popup" Placement="Bottom" IsOpen="{TemplateBinding IsDropDownOpen}"
+                               AllowsTransparency="True" Focusable="False" PopupAnimation="Slide">
+                            <Grid x:Name="DropDown" SnapsToDevicePixels="True"
+                                  MinWidth="{TemplateBinding ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <Border x:Name="DropDownBorder"
+                                        Background="{StaticResource BackgroundDarkBrush}"
+                                        BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"/>
+                                <ScrollViewer Margin="1" SnapsToDevicePixels="True">
+                                    <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained"/>
+                                </ScrollViewer>
+                            </Grid>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="ComboBoxItem">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Padding" Value="6,4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBoxItem">
+                    <Border x:Name="Bd" Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Bd" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- TabControl Style                             -->
+    <!-- ============================================ -->
+    <Style TargetType="TabControl">
+        <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+    </Style>
+
+    <Style TargetType="TabItem">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundDimBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="12,8"/>
+        <Setter Property="Margin" Value="0,0,2,0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TabItem">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="0"
+                            CornerRadius="3,3,0,0"
+                            Padding="{TemplateBinding Padding}"
+                            Margin="{TemplateBinding Margin}">
+                        <ContentPresenter x:Name="contentPresenter"
+                                          ContentSource="Header"
+                                          HorizontalAlignment="Center"
+                                          VerticalAlignment="Center"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentBrush}"/>
+                            <Setter Property="Foreground" Value="#E4E6EB"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="True"/>
+                                <Condition Property="IsMouseOver" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- DataGrid Style                               -->
+    <!-- ============================================ -->
+    <Style TargetType="DataGrid">
+        <Setter Property="helpers:DataGridClipboardBehavior.FixHeaderCopy" Value="True"/>
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="ClipToBounds" Value="True"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="RowBackground" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="AlternatingRowBackground" Value="{StaticResource AlternatingRowBrush}"/>
+        <Setter Property="GridLinesVisibility" Value="Horizontal"/>
+        <Setter Property="HorizontalGridLinesBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="VerticalGridLinesBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="HeadersVisibility" Value="Column"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Visible"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Visible"/>
+    </Style>
+
+    <!-- Column header resize gripper -->
+    <Style x:Key="ColumnHeaderGripperStyle" TargetType="{x:Type Thumb}">
+        <Setter Property="Width" Value="8"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="SizeWE"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="DataGridColumnHeader">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0,0,1,1"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="FontWeight" Value="SemiBold"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridColumnHeader">
+                    <Grid>
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <ContentPresenter Grid.Column="0"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="Center"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                <Path x:Name="SortArrow"
+                                      Grid.Column="1"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      Width="8" Height="6"
+                                      Margin="4,0,2,0"
+                                      Stretch="Fill"
+                                      Opacity="0.7"
+                                      Fill="{StaticResource ForegroundDimBrush}"
+                                      RenderTransformOrigin="0.5,0.5"
+                                      Visibility="Collapsed"
+                                      Data="M 0,0 L 8,0 L 4,6 Z"/>
+                            </Grid>
+                        </Border>
+                        <Thumb x:Name="PART_LeftHeaderGripper"
+                               HorizontalAlignment="Left"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                        <Thumb x:Name="PART_RightHeaderGripper"
+                               HorizontalAlignment="Right"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="SortDirection" Value="Ascending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="SortArrow" Property="RenderTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="SortDirection" Value="Descending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Column header style when filter is active - subtle blue highlight -->
+    <Style x:Key="FilteredColumnHeaderStyle" TargetType="DataGridColumnHeader"
+           BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+        <Setter Property="Background" Value="#BBDEFB"/>
+    </Style>
+
+    <!-- Right-aligned text style for numeric DataGrid columns -->
+    <Style x:Key="NumericCell" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+        <Setter Property="TextAlignment" Value="Right"/>
+    </Style>
+
+    <Style TargetType="DataGridCell">
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridCell">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
+                <Setter Property="Foreground" Value="#E4E6EB"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="DataGridRow">
+        <Setter Property="Background" Value="Transparent"/>
+        <Style.Triggers>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{StaticResource AccentBrush}"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ListView Style                               -->
+    <!-- ============================================ -->
+    <Style TargetType="ListView">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+    </Style>
+
+    <Style TargetType="ListViewItem">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Padding" Value="8,6"/>
+        <Setter Property="Margin" Value="2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListViewItem">
+                    <Border x:Name="border"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}">
+                        <ContentPresenter/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                            <Setter TargetName="border" Property="BorderThickness" Value="1"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ScrollBar Style                              -->
+    <!-- ============================================ -->
+    <Style TargetType="ScrollBar">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Border Style for Panels                      -->
+    <!-- ============================================ -->
+    <Style x:Key="PanelBorder" TargetType="Border">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Padding" Value="10"/>
+    </Style>
+
+    <!-- Card Style for Chart Containers -->
+    <Style x:Key="ChartCard" TargetType="Border">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Margin" Value="5"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- DatePickerTextBox Style (internal control)   -->
+    <!-- ============================================ -->
+    <Style TargetType="DatePickerTextBox">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DatePickerTextBox">
+                    <Grid Background="{StaticResource BackgroundDarkBrush}">
+                        <Border x:Name="Border"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}">
+                            <ScrollViewer x:Name="PART_ContentHost" Background="{StaticResource BackgroundDarkBrush}"
+                                          HorizontalContentAlignment="Stretch"
+                                          VerticalContentAlignment="Center"/>
+                        </Border>
+                        <!-- Watermark: hidden via Visibility=Collapsed -->
+                        <ContentControl x:Name="PART_Watermark"
+                                        Focusable="False"
+                                        IsHitTestVisible="False"
+                                        Visibility="Collapsed"
+                                        Foreground="{StaticResource ForegroundMutedBrush}"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- DatePicker Style                             -->
+    <!-- ============================================ -->
+    <Style TargetType="DatePicker">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="4,2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DatePicker">
+                    <Border x:Name="OuterBorder"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3"
+                            Padding="{TemplateBinding Padding}">
+                        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <DatePickerTextBox x:Name="PART_TextBox"
+                                               Grid.Column="0"
+                                               Focusable="True"
+                                               HorizontalContentAlignment="Stretch"
+                                               VerticalContentAlignment="Center"
+                                               Background="Transparent"
+                                               Foreground="{StaticResource ForegroundBrush}"/>
+                            <Button x:Name="PART_Button"
+                                    Grid.Column="1"
+                                    Focusable="False"
+                                    Foreground="{StaticResource ForegroundBrush}"
+                                    Background="Transparent"
+                                    BorderThickness="0"
+                                    Padding="4,0">
+                                <Path Data="M0,0 L4,4 L8,0 Z"
+                                      Fill="{StaticResource ForegroundBrush}"
+                                      VerticalAlignment="Center"/>
+                            </Button>
+                            <Popup x:Name="PART_Popup"
+                                   AllowsTransparency="True"
+                                   Placement="Bottom"
+                                   PlacementTarget="{Binding ElementName=OuterBorder}"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Calendar Styles for DatePicker dropdown      -->
+    <!-- ============================================ -->
+
+    <!-- Calendar main style with full template -->
+    <Style TargetType="Calendar">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Calendar">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="3">
+                        <CalendarItem x:Name="PART_CalendarItem"
+                                      Background="{StaticResource BackgroundDarkBrush}"
+                                      BorderThickness="0"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- CalendarItem style (the container for month/year views) -->
+    <Style TargetType="CalendarItem">
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarItem">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+
+                            <!-- Header: Previous/Next buttons and Month/Year title -->
+                            <Grid Grid.Row="0" Background="{StaticResource BackgroundLightBrush}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+
+                                <Button x:Name="PART_PreviousButton" Grid.Column="0"
+                                        Content="&#x25C0;" FontWeight="Bold"
+                                        Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                        BorderThickness="0" Padding="10,5"
+                                        Cursor="Hand"/>
+
+                                <Button x:Name="PART_HeaderButton" Grid.Column="1"
+                                        HorizontalAlignment="Center"
+                                        Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                        BorderThickness="0" FontWeight="SemiBold" FontSize="14"
+                                        Padding="5" Cursor="Hand"/>
+
+                                <Button x:Name="PART_NextButton" Grid.Column="2"
+                                        Content="&#x25B6;" FontWeight="Bold"
+                                        Background="Transparent" Foreground="{StaticResource ForegroundBrush}"
+                                        BorderThickness="0" Padding="10,5"
+                                        Cursor="Hand"/>
+                            </Grid>
+
+                            <!-- Day grid or Month/Year grid -->
+                            <Grid Grid.Row="1" Background="{StaticResource BackgroundDarkBrush}">
+                                <Grid x:Name="PART_MonthView" Visibility="Visible">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+                                <Grid x:Name="PART_YearView" Visibility="Hidden">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                </Grid>
+                            </Grid>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- CalendarDayButton style (individual day cells) -->
+    <Style TargetType="CalendarDayButton">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="MinWidth" Value="32"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarDayButton">
+                    <Grid>
+                        <Border x:Name="Background" Background="Transparent" CornerRadius="3"/>
+                        <ContentPresenter x:Name="Content"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsToday" Value="True">
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                            <Setter TargetName="Background" Property="BorderThickness" Value="1"/>
+                        </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsBlackedOut" Value="True">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- CalendarButton style (month/year selection cells) -->
+    <Style TargetType="CalendarButton">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="MinWidth" Value="50"/>
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarButton">
+                    <Grid>
+                        <Border x:Name="Background" Background="Transparent" CornerRadius="3"/>
+                        <ContentPresenter x:Name="Content"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="HasSelectedDays" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- CheckBox Style                               -->
+    <!-- ============================================ -->
+    <Style TargetType="CheckBox">
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CheckBox">
+                    <BulletDecorator Background="Transparent" VerticalAlignment="Center">
+                        <BulletDecorator.Bullet>
+                            <Border x:Name="Border" Width="16" Height="16"
+                                    Background="{StaticResource BackgroundDarkBrush}"
+                                    BorderBrush="{StaticResource BorderBrush}"
+                                    BorderThickness="1" CornerRadius="2">
+                                <Path x:Name="CheckMark" Width="10" Height="10" Stretch="Fill"
+                                      Stroke="{StaticResource AccentBrush}" StrokeThickness="2"
+                                      Data="M 0,5 L 4,9 L 10,0" Visibility="Collapsed"
+                                      HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            </Border>
+                        </BulletDecorator.Bullet>
+                        <ContentPresenter Margin="6,0,0,0"
+                                          VerticalAlignment="Center"
+                                          HorizontalAlignment="Left"
+                                          RecognizesAccessKey="True"/>
+                    </BulletDecorator>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="CheckMark" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource ForegroundMutedBrush}"/>
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ContextMenu Style                            -->
+    <!-- ============================================ -->
+    <Style TargetType="ContextMenu">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderLightBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="2"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ContextMenu">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            CornerRadius="4">
+                        <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="MenuItem">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="MenuItem">
+                    <Border x:Name="Border" Background="{TemplateBinding Background}" BorderThickness="0">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="26" SharedSizeGroup="MenuItemIconColumnGroup"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="17"/>
+                            </Grid.ColumnDefinitions>
+                            <!-- Icon column -->
+                            <Border x:Name="IconColumn" Grid.Column="0" Background="Transparent"/>
+                            <ContentPresenter x:Name="Icon" Grid.Column="0" Margin="4,0,6,0" VerticalAlignment="Center" ContentSource="Icon"/>
+                            <ContentPresenter Grid.Column="1" Margin="8,4" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{StaticResource ForegroundMutedBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- Separator Style                              -->
+    <!-- ============================================ -->
+    <Style TargetType="Separator">
+        <Setter Property="Background" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="Margin" Value="0,4"/>
+        <Setter Property="Height" Value="1"/>
+    </Style>
+
+    <!-- ============================================ -->
+    <!-- ToolTip Style                                -->
+    <!-- ============================================ -->
+    <Style TargetType="ToolTip">
+        <Setter Property="Background" Value="{StaticResource BackgroundLightBrush}"/>
+        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderLightBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="10,8"/>
+    </Style>
+
+
+</ResourceDictionary>
diff --git a/Lite/Windows/AddServerDialog.xaml b/Lite/Windows/AddServerDialog.xaml
index 00aa751..d02d51d 100644
--- a/Lite/Windows/AddServerDialog.xaml
+++ b/Lite/Windows/AddServerDialog.xaml
@@ -1,19 +1,12 @@
 <Window x:Class="PerformanceMonitorLite.Windows.AddServerDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Add Server"
+        Title="Add SQL Server"
         SizeToContent="Height" Width="450"
         WindowStartupLocation="CenterOwner"
         ResizeMode="NoResize"
         Icon="/EDD.ico"
         Background="{DynamicResource BackgroundBrush}">
-    <Window.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Window.Resources>
     <Grid Margin="16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -27,19 +20,24 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
+        <!-- Header -->
+        <TextBlock Grid.Row="0" Text="Add SQL Server Connection" FontSize="18" FontWeight="Bold" Margin="0,0,0,15"
+                   Foreground="{DynamicResource ForegroundBrush}"/>
+
         <!-- Server Name -->
-        <TextBlock Grid.Row="0" Text="Server Name / Address" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <TextBox Grid.Row="1" x:Name="ServerNameBox" Margin="0,0,0,12"/>
+        <TextBlock Grid.Row="1" Text="Server Name / Address" FontWeight="Bold" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <TextBox Grid.Row="2" x:Name="ServerNameBox" Margin="0,0,0,12"/>
 
         <!-- Display Name -->
-        <TextBlock Grid.Row="2" Text="Display Name (optional)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <TextBox Grid.Row="3" x:Name="DisplayNameBox" Margin="0,0,0,12"/>
+        <TextBlock Grid.Row="3" Text="Display Name (optional)" FontWeight="Bold" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <TextBox Grid.Row="4" x:Name="DisplayNameBox" Margin="0,0,0,12"/>
 
         <!-- Authentication -->
-        <TextBlock Grid.Row="4" Text="Authentication" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <StackPanel Grid.Row="5" Margin="0,0,0,12">
+        <TextBlock Grid.Row="5" Text="Authentication" FontWeight="Bold" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <StackPanel Grid.Row="6" Margin="0,0,0,12">
             <RadioButton x:Name="WindowsAuthRadio" Content="Windows Authentication" Foreground="{DynamicResource ForegroundBrush}"
                          IsChecked="True" Checked="AuthMode_Changed" Margin="0,0,0,4"/>
             <RadioButton x:Name="SqlAuthRadio" Content="SQL Server Authentication" Foreground="{DynamicResource ForegroundBrush}"
@@ -50,25 +48,23 @@
         </StackPanel>
 
         <!-- SQL Auth Credentials -->
-        <StackPanel Grid.Row="6" x:Name="SqlCredentialsPanel" Visibility="Collapsed" Margin="0,0,0,12">
+        <StackPanel Grid.Row="7" x:Name="SqlCredentialsPanel" Visibility="Collapsed" Margin="0,0,0,12">
             <TextBlock Text="Username" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
             <TextBox x:Name="UsernameBox" Margin="0,0,0,8"/>
             <TextBlock Text="Password" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-            <PasswordBox x:Name="PasswordBox" Background="{DynamicResource BackgroundLightBrush}"
-                         Foreground="{DynamicResource ForegroundBrush}" BorderBrush="{DynamicResource BorderBrush}"
-                         Padding="6,4"/>
+            <PasswordBox x:Name="PasswordBox"/>
         </StackPanel>
 
         <!-- Entra MFA Credentials -->
-        <StackPanel Grid.Row="6" x:Name="EntraMfaPanel" Visibility="Collapsed" Margin="0,0,0,12">
+        <StackPanel Grid.Row="7" x:Name="EntraMfaPanel" Visibility="Collapsed" Margin="0,0,0,12">
             <TextBlock Text="Username (optional)" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
             <TextBox x:Name="EntraMfaUsernameBox" Margin="0,0,0,8"
                      ToolTip="Optional: Pre-populate the authentication dialog with this email"/>
         </StackPanel>
 
         <!-- Connection Options -->
-        <TextBlock Grid.Row="7" Text="Connection Options" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
-        <StackPanel Grid.Row="8" Margin="0,0,0,12">
+        <TextBlock Grid.Row="8" Text="Connection Options" FontWeight="Bold" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,4"/>
+        <StackPanel Grid.Row="9" Margin="0,0,0,12">
             <StackPanel Orientation="Horizontal" Margin="0,0,0,6">
                 <TextBlock Text="Encryption:" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center" Width="80"/>
                 <ComboBox x:Name="EncryptModeComboBox" Width="150" SelectedIndex="1">
@@ -77,11 +73,11 @@
                     <ComboBoxItem Content="Strict"/>
                 </ComboBox>
             </StackPanel>
-            <CheckBox x:Name="TrustCertCheckBox" Content="Trust server certificate"
+            <CheckBox x:Name="TrustCertCheckBox" Content="Trust server certificate (skip certificate validation)"
                       Foreground="{DynamicResource ForegroundBrush}" IsChecked="False"/>
             <CheckBox x:Name="EnabledCheckBox" Content="Enable data collection for this server"
                       Foreground="{DynamicResource ForegroundBrush}" IsChecked="True" Margin="0,6,0,0"/>
-            <CheckBox x:Name="FavoriteCheckBox" Content="Mark as favorite"
+            <CheckBox x:Name="FavoriteCheckBox" Content="Mark as favorite (appears at top of list)"
                       Foreground="{DynamicResource ForegroundBrush}" Margin="0,6,0,0"/>
             <StackPanel Orientation="Horizontal" Margin="0,6,0,0">
                 <TextBlock Text="Description:" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center" Width="80"/>
@@ -95,14 +91,14 @@
         </StackPanel>
 
         <!-- Status -->
-        <TextBlock Grid.Row="9" x:Name="StatusText" Foreground="{DynamicResource ForegroundMutedBrush}"
+        <TextBlock Grid.Row="10" x:Name="StatusText" Foreground="{DynamicResource ForegroundMutedBrush}"
                    TextWrapping="Wrap" VerticalAlignment="Bottom" Margin="0,0,0,8"/>
 
         <!-- Buttons -->
-        <StackPanel Grid.Row="10" Orientation="Horizontal" HorizontalAlignment="Right">
+        <StackPanel Grid.Row="11" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button x:Name="TestButton" Content="Test Connection" Click="TestButton_Click" Margin="0,0,8,0"/>
-            <Button x:Name="SaveButton" Content="Save" Click="SaveButton_Click" Style="{StaticResource AccentButton}" Margin="0,0,8,0"/>
-            <Button Content="Cancel" Click="CancelButton_Click"/>
+            <Button x:Name="SaveButton" Content="Save" Width="80" Height="30" Click="SaveButton_Click" Style="{StaticResource AccentButton}" Margin="0,0,8,0"/>
+            <Button Content="Cancel" Width="80" Height="30" Click="CancelButton_Click"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/Lite/Windows/AddServerDialog.xaml.cs b/Lite/Windows/AddServerDialog.xaml.cs
index 3e70d8a..84fa183 100644
--- a/Lite/Windows/AddServerDialog.xaml.cs
+++ b/Lite/Windows/AddServerDialog.xaml.cs
@@ -43,7 +43,7 @@ public AddServerDialog(ServerManager serverManager)
     /// </summary>
     public AddServerDialog(ServerManager serverManager, ServerConnection existing) : this(serverManager)
     {
-        Title = "Edit Server";
+        Title = "Edit SQL Server";
         ServerNameBox.Text = existing.ServerName;
         DisplayNameBox.Text = existing.DisplayName;
         EnabledCheckBox.IsChecked = existing.IsEnabled;
@@ -330,7 +330,7 @@ private async void SaveButton_Click(object sender, RoutedEventArgs e)
 
         try
         {
-            if (AddedServer != null && Title == "Edit Server")
+            if (AddedServer != null && Title == "Edit SQL Server")
             {
                 /* Editing existing server */
                 AddedServer.ServerName = serverName;
diff --git a/Lite/Windows/CollectionLogWindow.xaml b/Lite/Windows/CollectionLogWindow.xaml
index 4ee2e2d..845c5f0 100644
--- a/Lite/Windows/CollectionLogWindow.xaml
+++ b/Lite/Windows/CollectionLogWindow.xaml
@@ -3,13 +3,10 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Collection History" Height="600" Width="1100"
         WindowStartupLocation="CenterOwner"
-        Background="{StaticResource BackgroundBrush}">
+        Background="{DynamicResource BackgroundBrush}">
 
     <Window.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click">
                     <MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
@@ -36,7 +33,7 @@
         </Grid.RowDefinitions>
 
         <!-- Header -->
-        <Border Grid.Row="0" Background="{StaticResource BackgroundLightBrush}" Padding="10" Margin="10,10,10,0" CornerRadius="4">
+        <Border Grid.Row="0" Background="{DynamicResource BackgroundLightBrush}" Padding="10" Margin="10,10,10,0" CornerRadius="4">
             <StackPanel>
                 <TextBlock x:Name="CollectorNameText" FontSize="16" FontWeight="Bold"/>
                 <TextBlock x:Name="SummaryText" Margin="0,5,0,0"/>
@@ -92,7 +89,7 @@
         </DataGrid>
 
         <!-- Footer -->
-        <Border Grid.Row="2" Background="{StaticResource BackgroundLightBrush}" Padding="10" Margin="10,0,10,10" CornerRadius="4">
+        <Border Grid.Row="2" Background="{DynamicResource BackgroundLightBrush}" Padding="10" Margin="10,0,10,10" CornerRadius="4">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                 <Button Content="Close" Width="100" Height="30" Click="Close_Click"/>
             </StackPanel>
diff --git a/Lite/Windows/ManageServersWindow.xaml b/Lite/Windows/ManageServersWindow.xaml
index 2eec7b4..0060bd7 100644
--- a/Lite/Windows/ManageServersWindow.xaml
+++ b/Lite/Windows/ManageServersWindow.xaml
@@ -8,9 +8,6 @@
         Background="{DynamicResource BackgroundBrush}">
     <Window.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click">
                     <MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
diff --git a/Lite/Windows/ProcedureHistoryWindow.xaml b/Lite/Windows/ProcedureHistoryWindow.xaml
index a0de3c9..6729202 100644
--- a/Lite/Windows/ProcedureHistoryWindow.xaml
+++ b/Lite/Windows/ProcedureHistoryWindow.xaml
@@ -1,16 +1,13 @@
-<Window x:Class="PerformanceMonitorLite.Windows.ProcedureHistoryWindow"
+<Window x:Class="PerformanceMonitorLite.Windows.ProcedureHistoryWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:scottplot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
         Title="Procedure Execution History" Width="1200" Height="800"
         WindowStartupLocation="CenterOwner"
-        Background="{StaticResource BackgroundBrush}">
+        Background="{DynamicResource BackgroundBrush}">
 
     <Window.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click">
                     <MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
@@ -40,14 +37,14 @@
         <!-- Header -->
         <StackPanel Grid.Row="0" Margin="0,0,0,10">
             <TextBlock x:Name="ProcIdentifierText" FontSize="16" FontWeight="Bold"
-                       Foreground="{StaticResource ForegroundBrush}"/>
+                       Foreground="{DynamicResource ForegroundBrush}"/>
             <TextBlock x:Name="SummaryText" FontSize="12" Margin="0,4,0,0"
-                       Foreground="{StaticResource ForegroundDimBrush}"/>
+                       Foreground="{DynamicResource ForegroundDimBrush}"/>
         </StackPanel>
 
         <!-- Chart -->
-        <Border Grid.Row="1" Background="{StaticResource BackgroundLightBrush}"
-                BorderBrush="{StaticResource BorderBrush}" BorderThickness="1" CornerRadius="3">
+        <Border Grid.Row="1" Background="{DynamicResource BackgroundLightBrush}"
+                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" CornerRadius="3">
             <Grid>
                 <ComboBox x:Name="MetricSelector" Width="180" Height="26"
                           VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,6,10,0"
diff --git a/Lite/Windows/ProcedureHistoryWindow.xaml.cs b/Lite/Windows/ProcedureHistoryWindow.xaml.cs
index cf7948b..4f94966 100644
--- a/Lite/Windows/ProcedureHistoryWindow.xaml.cs
+++ b/Lite/Windows/ProcedureHistoryWindow.xaml.cs
@@ -44,6 +44,8 @@ public ProcedureHistoryWindow(LocalDataService dataService, int serverId, string
         var fullName = string.IsNullOrEmpty(schemaName) ? objectName : $"{schemaName}.{objectName}";
         ProcIdentifierText.Text = $"Procedure History: {fullName} in [{databaseName}]";
         Loaded += async (_, _) => await LoadHistoryAsync();
+        Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
+        Closed += (s, e) => Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
     }
 
     private async System.Threading.Tasks.Task LoadHistoryAsync()
@@ -100,7 +102,7 @@ private void UpdateChart()
         scatter.LegendText = label;
 
         HistoryChart.Plot.Axes.DateTimeTicksBottom();
-        ApplyDarkTheme(HistoryChart);
+        ApplyTheme(HistoryChart);
 
         HistoryChart.Refresh();
     }
@@ -118,20 +120,42 @@ private void UpdateChart()
 
     private void MetricSelector_SelectionChanged(object sender, SelectionChangedEventArgs e) { if (IsLoaded) UpdateChart(); }
 
-    private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
+    private static void ApplyTheme(ScottPlot.WPF.WpfPlot chart)
     {
-        var darkBg = ScottPlot.Color.FromHex("#22252b");
-        var darkerBg = ScottPlot.Color.FromHex("#111217");
-        var text = ScottPlot.Color.FromHex("#9DA5B4");
-        var grid = ScottPlot.Colors.White.WithAlpha(40);
-
-        chart.Plot.FigureBackground.Color = darkBg;
-        chart.Plot.DataBackground.Color = darkerBg;
-        chart.Plot.Axes.Color(text);
-        chart.Plot.Grid.MajorLineColor = grid;
-
-        chart.Plot.Axes.Bottom.TickLabelStyle.ForeColor = text;
-        chart.Plot.Axes.Left.TickLabelStyle.ForeColor = text;
+        ScottPlot.Color figureBackground, dataBackground, textColor, gridColor;
+        if (Helpers.ThemeManager.CurrentTheme == "CoolBreeze")
+        {
+            figureBackground = ScottPlot.Color.FromHex("#EEF4FA");
+            dataBackground   = ScottPlot.Color.FromHex("#DAE6F0");
+            textColor        = ScottPlot.Color.FromHex("#1A2A3A");
+            gridColor        = ScottPlot.Colors.Black.WithAlpha(20);
+        }
+        else if (Helpers.ThemeManager.HasLightBackground)
+        {
+            figureBackground = ScottPlot.Color.FromHex("#FFFFFF");
+            dataBackground   = ScottPlot.Color.FromHex("#F5F7FA");
+            textColor        = ScottPlot.Color.FromHex("#4A5568");
+            gridColor        = ScottPlot.Colors.Black.WithAlpha(20);
+        }
+        else
+        {
+            figureBackground = ScottPlot.Color.FromHex("#22252b");
+            dataBackground   = ScottPlot.Color.FromHex("#111217");
+            textColor        = ScottPlot.Color.FromHex("#9DA5B4");
+            gridColor        = ScottPlot.Colors.White.WithAlpha(40);
+        }
+        chart.Plot.FigureBackground.Color = figureBackground;
+        chart.Plot.DataBackground.Color = dataBackground;
+        chart.Plot.Axes.Color(textColor);
+        chart.Plot.Grid.MajorLineColor = gridColor;
+        chart.Plot.Axes.Bottom.TickLabelStyle.ForeColor = textColor;
+        chart.Plot.Axes.Left.TickLabelStyle.ForeColor = textColor;
+    }
+
+    private void OnThemeChanged(string _)
+    {
+        ApplyTheme(HistoryChart);
+        HistoryChart.Refresh();
     }
 
     private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
@@ -178,3 +202,4 @@ private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
 
     private void Close_Click(object sender, RoutedEventArgs e) => Close();
 }
+
diff --git a/Lite/Windows/QueryStatsHistoryWindow.xaml b/Lite/Windows/QueryStatsHistoryWindow.xaml
index 5026e0d..11158bd 100644
--- a/Lite/Windows/QueryStatsHistoryWindow.xaml
+++ b/Lite/Windows/QueryStatsHistoryWindow.xaml
@@ -1,16 +1,13 @@
-<Window x:Class="PerformanceMonitorLite.Windows.QueryStatsHistoryWindow"
+<Window x:Class="PerformanceMonitorLite.Windows.QueryStatsHistoryWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:scottplot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
         Title="Query Stats History" Width="1400" Height="800"
         WindowStartupLocation="CenterOwner"
-        Background="{StaticResource BackgroundBrush}">
+        Background="{DynamicResource BackgroundBrush}">
 
     <Window.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click">
                     <MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
@@ -40,14 +37,14 @@
         <!-- Header -->
         <StackPanel Grid.Row="0" Margin="0,0,0,10">
             <TextBlock x:Name="QueryIdentifierText" FontSize="16" FontWeight="Bold"
-                       Foreground="{StaticResource ForegroundBrush}"/>
+                       Foreground="{DynamicResource ForegroundBrush}"/>
             <TextBlock x:Name="SummaryText" FontSize="12" Margin="0,4,0,0"
-                       Foreground="{StaticResource ForegroundDimBrush}"/>
+                       Foreground="{DynamicResource ForegroundDimBrush}"/>
         </StackPanel>
 
         <!-- Chart -->
-        <Border Grid.Row="1" Background="{StaticResource BackgroundLightBrush}"
-                BorderBrush="{StaticResource BorderBrush}" BorderThickness="1" CornerRadius="3">
+        <Border Grid.Row="1" Background="{DynamicResource BackgroundLightBrush}"
+                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" CornerRadius="3">
             <Grid>
                 <ComboBox x:Name="MetricSelector" Width="180" Height="26"
                           VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,6,10,0"
diff --git a/Lite/Windows/QueryStatsHistoryWindow.xaml.cs b/Lite/Windows/QueryStatsHistoryWindow.xaml.cs
index 709e147..c78c005 100644
--- a/Lite/Windows/QueryStatsHistoryWindow.xaml.cs
+++ b/Lite/Windows/QueryStatsHistoryWindow.xaml.cs
@@ -41,6 +41,8 @@ public QueryStatsHistoryWindow(LocalDataService dataService, int serverId, strin
 
         QueryIdentifierText.Text = $"Query Stats History: {queryHash} in [{databaseName}]";
         Loaded += async (_, _) => await LoadHistoryAsync();
+        Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
+        Closed += (s, e) => Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
     }
 
     private async System.Threading.Tasks.Task LoadHistoryAsync()
@@ -97,7 +99,7 @@ private void UpdateChart()
         scatter.LegendText = label;
 
         HistoryChart.Plot.Axes.DateTimeTicksBottom();
-        ApplyDarkTheme(HistoryChart);
+        ApplyTheme(HistoryChart);
 
         HistoryChart.Refresh();
     }
@@ -175,20 +177,42 @@ private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
         }
     }
 
-    private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
+    private static void ApplyTheme(ScottPlot.WPF.WpfPlot chart)
     {
-        var darkBg = ScottPlot.Color.FromHex("#22252b");
-        var darkerBg = ScottPlot.Color.FromHex("#111217");
-        var text = ScottPlot.Color.FromHex("#9DA5B4");
-        var grid = ScottPlot.Colors.White.WithAlpha(40);
-
-        chart.Plot.FigureBackground.Color = darkBg;
-        chart.Plot.DataBackground.Color = darkerBg;
-        chart.Plot.Axes.Color(text);
-        chart.Plot.Grid.MajorLineColor = grid;
-
-        chart.Plot.Axes.Bottom.TickLabelStyle.ForeColor = text;
-        chart.Plot.Axes.Left.TickLabelStyle.ForeColor = text;
+        ScottPlot.Color figureBackground, dataBackground, textColor, gridColor;
+        if (Helpers.ThemeManager.CurrentTheme == "CoolBreeze")
+        {
+            figureBackground = ScottPlot.Color.FromHex("#EEF4FA");
+            dataBackground   = ScottPlot.Color.FromHex("#DAE6F0");
+            textColor        = ScottPlot.Color.FromHex("#1A2A3A");
+            gridColor        = ScottPlot.Colors.Black.WithAlpha(20);
+        }
+        else if (Helpers.ThemeManager.HasLightBackground)
+        {
+            figureBackground = ScottPlot.Color.FromHex("#FFFFFF");
+            dataBackground   = ScottPlot.Color.FromHex("#F5F7FA");
+            textColor        = ScottPlot.Color.FromHex("#4A5568");
+            gridColor        = ScottPlot.Colors.Black.WithAlpha(20);
+        }
+        else
+        {
+            figureBackground = ScottPlot.Color.FromHex("#22252b");
+            dataBackground   = ScottPlot.Color.FromHex("#111217");
+            textColor        = ScottPlot.Color.FromHex("#9DA5B4");
+            gridColor        = ScottPlot.Colors.White.WithAlpha(40);
+        }
+        chart.Plot.FigureBackground.Color = figureBackground;
+        chart.Plot.DataBackground.Color = dataBackground;
+        chart.Plot.Axes.Color(textColor);
+        chart.Plot.Grid.MajorLineColor = gridColor;
+        chart.Plot.Axes.Bottom.TickLabelStyle.ForeColor = textColor;
+        chart.Plot.Axes.Left.TickLabelStyle.ForeColor = textColor;
+    }
+
+    private void OnThemeChanged(string _)
+    {
+        ApplyTheme(HistoryChart);
+        HistoryChart.Refresh();
     }
 
     private void CopyCell_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyCell(sender);
@@ -198,3 +222,4 @@ private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
 
     private void Close_Click(object sender, RoutedEventArgs e) => Close();
 }
+
diff --git a/Lite/Windows/QueryStoreHistoryWindow.xaml b/Lite/Windows/QueryStoreHistoryWindow.xaml
index 004e78b..4d520d2 100644
--- a/Lite/Windows/QueryStoreHistoryWindow.xaml
+++ b/Lite/Windows/QueryStoreHistoryWindow.xaml
@@ -1,16 +1,13 @@
-<Window x:Class="PerformanceMonitorLite.Windows.QueryStoreHistoryWindow"
+<Window x:Class="PerformanceMonitorLite.Windows.QueryStoreHistoryWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:scottplot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
         Title="Query Store History" Width="1200" Height="800"
         WindowStartupLocation="CenterOwner"
-        Background="{StaticResource BackgroundBrush}">
+        Background="{DynamicResource BackgroundBrush}">
 
     <Window.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click">
                     <MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
@@ -40,14 +37,14 @@
         <!-- Header -->
         <StackPanel Grid.Row="0" Margin="0,0,0,10">
             <TextBlock x:Name="QueryIdentifierText" FontSize="16" FontWeight="Bold"
-                       Foreground="{StaticResource ForegroundBrush}"/>
+                       Foreground="{DynamicResource ForegroundBrush}"/>
             <TextBlock x:Name="SummaryText" FontSize="12" Margin="0,4,0,0"
-                       Foreground="{StaticResource ForegroundDimBrush}"/>
+                       Foreground="{DynamicResource ForegroundDimBrush}"/>
         </StackPanel>
 
         <!-- Chart -->
-        <Border Grid.Row="1" Background="{StaticResource BackgroundLightBrush}"
-                BorderBrush="{StaticResource BorderBrush}" BorderThickness="1" CornerRadius="3">
+        <Border Grid.Row="1" Background="{DynamicResource BackgroundLightBrush}"
+                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" CornerRadius="3">
             <Grid>
                 <ComboBox x:Name="MetricSelector" Width="180" Height="26"
                           VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,6,10,0"
diff --git a/Lite/Windows/QueryStoreHistoryWindow.xaml.cs b/Lite/Windows/QueryStoreHistoryWindow.xaml.cs
index 99ad5a4..d3ccf71 100644
--- a/Lite/Windows/QueryStoreHistoryWindow.xaml.cs
+++ b/Lite/Windows/QueryStoreHistoryWindow.xaml.cs
@@ -45,6 +45,8 @@ public QueryStoreHistoryWindow(LocalDataService dataService, int serverId, strin
         QueryIdentifierText.Text = $"Query Store History: Query {queryId}, Plan {planId} in [{databaseName}]";
         SummaryText.Text = displayText;
         Loaded += async (_, _) => await LoadHistoryAsync();
+        Helpers.ThemeManager.ThemeChanged += OnThemeChanged;
+        Closed += (s, e) => Helpers.ThemeManager.ThemeChanged -= OnThemeChanged;
     }
 
     private async System.Threading.Tasks.Task LoadHistoryAsync()
@@ -100,7 +102,7 @@ private void UpdateChart()
         scatter.LegendText = label;
 
         HistoryChart.Plot.Axes.DateTimeTicksBottom();
-        ApplyDarkTheme(HistoryChart);
+        ApplyTheme(HistoryChart);
 
         HistoryChart.Refresh();
     }
@@ -156,20 +158,42 @@ private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
         }
     }
 
-    private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
+    private static void ApplyTheme(ScottPlot.WPF.WpfPlot chart)
     {
-        var darkBg = ScottPlot.Color.FromHex("#22252b");
-        var darkerBg = ScottPlot.Color.FromHex("#111217");
-        var text = ScottPlot.Color.FromHex("#9DA5B4");
-        var grid = ScottPlot.Colors.White.WithAlpha(40);
-
-        chart.Plot.FigureBackground.Color = darkBg;
-        chart.Plot.DataBackground.Color = darkerBg;
-        chart.Plot.Axes.Color(text);
-        chart.Plot.Grid.MajorLineColor = grid;
-
-        chart.Plot.Axes.Bottom.TickLabelStyle.ForeColor = text;
-        chart.Plot.Axes.Left.TickLabelStyle.ForeColor = text;
+        ScottPlot.Color figureBackground, dataBackground, textColor, gridColor;
+        if (Helpers.ThemeManager.CurrentTheme == "CoolBreeze")
+        {
+            figureBackground = ScottPlot.Color.FromHex("#EEF4FA");
+            dataBackground   = ScottPlot.Color.FromHex("#DAE6F0");
+            textColor        = ScottPlot.Color.FromHex("#1A2A3A");
+            gridColor        = ScottPlot.Colors.Black.WithAlpha(20);
+        }
+        else if (Helpers.ThemeManager.HasLightBackground)
+        {
+            figureBackground = ScottPlot.Color.FromHex("#FFFFFF");
+            dataBackground   = ScottPlot.Color.FromHex("#F5F7FA");
+            textColor        = ScottPlot.Color.FromHex("#4A5568");
+            gridColor        = ScottPlot.Colors.Black.WithAlpha(20);
+        }
+        else
+        {
+            figureBackground = ScottPlot.Color.FromHex("#22252b");
+            dataBackground   = ScottPlot.Color.FromHex("#111217");
+            textColor        = ScottPlot.Color.FromHex("#9DA5B4");
+            gridColor        = ScottPlot.Colors.White.WithAlpha(40);
+        }
+        chart.Plot.FigureBackground.Color = figureBackground;
+        chart.Plot.DataBackground.Color = dataBackground;
+        chart.Plot.Axes.Color(textColor);
+        chart.Plot.Grid.MajorLineColor = gridColor;
+        chart.Plot.Axes.Bottom.TickLabelStyle.ForeColor = textColor;
+        chart.Plot.Axes.Left.TickLabelStyle.ForeColor = textColor;
+    }
+
+    private void OnThemeChanged(string _)
+    {
+        ApplyTheme(HistoryChart);
+        HistoryChart.Refresh();
     }
 
     private void CopyCell_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyCell(sender);
@@ -179,3 +203,4 @@ private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
 
     private void Close_Click(object sender, RoutedEventArgs e) => Close();
 }
+
diff --git a/Lite/Windows/SettingsWindow.xaml b/Lite/Windows/SettingsWindow.xaml
index 934b4a0..4412f02 100644
--- a/Lite/Windows/SettingsWindow.xaml
+++ b/Lite/Windows/SettingsWindow.xaml
@@ -10,9 +10,6 @@
         Background="{DynamicResource BackgroundBrush}">
     <Window.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
-            </ResourceDictionary.MergedDictionaries>
             <ContextMenu x:Key="DataGridContextMenu">
                 <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
                 <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
@@ -117,6 +114,25 @@
                                FontSize="11" FontStyle="Italic" Foreground="{DynamicResource ForegroundMutedBrush}"
                                VerticalAlignment="Center" Margin="6,0,0,0" x:Name="CsvSeparatorHint"/>
                 </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
+                    <TextBlock Text="Show timestamps in:" VerticalAlignment="Center"
+                               Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,8,0"/>
+                    <ComboBox x:Name="TimeDisplayModeCombo" Width="140" VerticalAlignment="Center">
+                        <ComboBoxItem Content="Server Time" Tag="ServerTime"/>
+                        <ComboBoxItem Content="Local Time" Tag="LocalTime"/>
+                        <ComboBoxItem Content="UTC" Tag="UTC"/>
+                    </ComboBox>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
+                    <TextBlock Text="Color theme:" VerticalAlignment="Center"
+                               Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,8,0"/>
+                    <ComboBox x:Name="ColorThemeCombo" Width="140" VerticalAlignment="Center"
+                              SelectionChanged="ColorThemeCombo_SelectionChanged">
+                        <ComboBoxItem Content="Dark" Tag="Dark"/>
+                        <ComboBoxItem Content="Light" Tag="Light"/>
+                        <ComboBoxItem Content="Cool Breeze" Tag="CoolBreeze"/>
+                    </ComboBox>
+                </StackPanel>
             </StackPanel>
         </Border>
 
diff --git a/Lite/Windows/SettingsWindow.xaml.cs b/Lite/Windows/SettingsWindow.xaml.cs
index 2fd865b..8876420 100644
--- a/Lite/Windows/SettingsWindow.xaml.cs
+++ b/Lite/Windows/SettingsWindow.xaml.cs
@@ -40,6 +40,8 @@ public SettingsWindow(
         LoadDefaultTimeRange();
         LoadConnectionTimeout();
         LoadCsvSeparator();
+        LoadColorTheme();
+        LoadTimeDisplayMode();
         LoadAlertSettings();
         LoadSmtpSettings();
     }
@@ -113,9 +115,13 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
         SaveDefaultTimeRange();
         SaveConnectionTimeout();
         SaveCsvSeparator();
+        SaveColorTheme();
+        SaveTimeDisplayMode();
         SaveAlertSettings();
         SaveSmtpSettings();
 
+        _saved = true;
+
         var message = mcpChanged
             ? "Settings saved. MCP changes take effect after restarting the application."
             : "Settings saved.";
@@ -307,6 +313,114 @@ private void SaveCsvSeparator()
         }
     }
 
+    private bool _isLoadingTheme;
+    private readonly string _originalTheme = Helpers.ThemeManager.CurrentTheme;
+    private bool _saved;
+
+    private void ColorThemeCombo_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (_isLoadingTheme) return;
+        if (ColorThemeCombo.SelectedItem is ComboBoxItem selected && selected.Tag is string theme)
+            Helpers.ThemeManager.Apply(theme);
+    }
+
+    private void LoadColorTheme()
+    {
+        _isLoadingTheme = true;
+        foreach (ComboBoxItem item in ColorThemeCombo.Items)
+        {
+            if (item.Tag?.ToString() == App.ColorTheme)
+            {
+                ColorThemeCombo.SelectedItem = item;
+                break;
+            }
+        }
+        if (ColorThemeCombo.SelectedItem == null)
+            ColorThemeCombo.SelectedIndex = 0;
+        _isLoadingTheme = false;
+    }
+
+    private void SaveColorTheme()
+    {
+        if (ColorThemeCombo.SelectedItem is ComboBoxItem selected && selected.Tag is string theme)
+        {
+            App.ColorTheme = theme;
+            Helpers.ThemeManager.Apply(theme);
+        }
+
+        var settingsPath = Path.Combine(App.ConfigDirectory, "settings.json");
+        try
+        {
+            JsonNode? root;
+            if (File.Exists(settingsPath))
+            {
+                var json = File.ReadAllText(settingsPath);
+                root = JsonNode.Parse(json) ?? new JsonObject();
+            }
+            else
+            {
+                root = new JsonObject();
+            }
+
+            root["color_theme"] = App.ColorTheme;
+
+            var options = new JsonSerializerOptions { WriteIndented = true };
+            File.WriteAllText(settingsPath, root.ToJsonString(options));
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Error("Settings", $"Failed to save color theme: {ex.Message}");
+        }
+    }
+
+    private void LoadTimeDisplayMode()
+    {
+        foreach (ComboBoxItem item in TimeDisplayModeCombo.Items)
+        {
+            if (item.Tag?.ToString() == App.TimeDisplayMode)
+            {
+                TimeDisplayModeCombo.SelectedItem = item;
+                break;
+            }
+        }
+        if (TimeDisplayModeCombo.SelectedItem == null)
+            TimeDisplayModeCombo.SelectedIndex = 0;
+    }
+
+    private void SaveTimeDisplayMode()
+    {
+        if (TimeDisplayModeCombo.SelectedItem is ComboBoxItem selected && selected.Tag is string mode)
+        {
+            App.TimeDisplayMode = mode;
+            if (System.Enum.TryParse<Helpers.TimeDisplayMode>(mode, out var tdm))
+                ServerTimeHelper.CurrentDisplayMode = tdm;
+        }
+
+        var settingsPath = Path.Combine(App.ConfigDirectory, "settings.json");
+        try
+        {
+            JsonNode? root;
+            if (File.Exists(settingsPath))
+            {
+                var json = File.ReadAllText(settingsPath);
+                root = JsonNode.Parse(json) ?? new JsonObject();
+            }
+            else
+            {
+                root = new JsonObject();
+            }
+
+            root["time_display_mode"] = App.TimeDisplayMode;
+
+            var options = new JsonSerializerOptions { WriteIndented = true };
+            File.WriteAllText(settingsPath, root.ToJsonString(options));
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Error("Settings", $"Failed to save time display mode: {ex.Message}");
+        }
+    }
+
     private void LoadAlertSettings()
     {
         MinimizeToTrayCheckBox.IsChecked = App.MinimizeToTray;
@@ -620,6 +734,15 @@ private async void TestEmailButton_Click(object sender, RoutedEventArgs e)
 
     private void CloseButton_Click(object sender, RoutedEventArgs e)
     {
+        if (!_saved)
+            Helpers.ThemeManager.Apply(_originalTheme);
         Close();
     }
+
+    protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
+    {
+        if (!_saved)
+            Helpers.ThemeManager.Apply(_originalTheme);
+        base.OnClosing(e);
+    }
 }
diff --git a/README.md b/README.md
index 9e37523..6b383ad 100644
--- a/README.md
+++ b/README.md
@@ -1,116 +1,127 @@
 # SQL Server Performance Monitor
 
-Free, open-source SQL Server performance monitoring in two editions. Built for DBAs, consultants, and developers who want real insight without enterprise complexity.
+**Free, open-source monitoring that replaces the tools charging you thousands per server per year.** 30+ collectors, real-time alerts, built-in MCP server for AI analysis. Nothing phones home. Your data stays on your server and your machine.
 
-**Supported SQL Servers:** SQL Server 2016, 2017, 2019, 2022, 2025 | Azure SQL Managed Instance | AWS RDS for SQL Server | Azure SQL Database (Lite only)
+**Supported:** SQL Server 2016–2025 | Azure SQL Managed Instance | AWS RDS for SQL Server | Azure SQL Database (Lite only)
+
+![Dashboard landing page with server health cards](Screenshots/Screenshot%20Dashboard%20landing%20page%20with%20server%20health%20cards.jpg)
 
-**Dashboard/Lite requires:** Windows 10 or later, Windows Server 2016 or later | [.NET 8 Desktop Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
 
-**Download ready-to-run executables from the [Releases page](https://github.com/erikdarlingdata/PerformanceMonitor/releases).** No build steps required — download the `.zip` for the edition you want, extract it to any folder, and run the `.exe` inside. See [Getting Started](#getting-started) for setup details.
+![Full Dashboard — Resource Overview](Screenshots/Full%20Dashboard%20%E2%80%94%20Resource%20Overview.jpg)
 
 ---
 
-## Screenshots
+## Download
 
-### Full Dashboard — Landing Page
-![Dashboard landing page with server health cards](Screenshots/Screenshot%20Dashboard%20landing%20page%20with%20server%20health%20cards.jpg)
+**👉 Not sure which edition to pick? [Start with Lite.](https://github.com/erikdarlingdata/PerformanceMonitor/releases/latest)** One download, nothing installed on your server, data flowing in under 5 minutes.
 
-### Full Dashboard — Resource Overview
-![Full Dashboard — Resource Overview](Screenshots/Full%20Dashboard%20%E2%80%94%20Resource%20Overview.jpg)
+| | **[Full Edition](https://github.com/erikdarlingdata/PerformanceMonitor/releases/latest)** | **[Lite Edition](https://github.com/erikdarlingdata/PerformanceMonitor/releases/latest)** |
+|---|---|---|
+| **What it does** | Installs a `PerformanceMonitor` database with 30 T-SQL collectors running via SQL Agent. Separate dashboard app connects to view everything. | Single desktop app that monitors remotely. Stores data locally in DuckDB + Parquet. Nothing touches your server. |
+| **Best for** | Production 24/7 monitoring, long-term baselining | Quick triage, Azure SQL DB, locked-down servers, consultants, firefighting |
+| **Requires** | sysadmin + SQL Agent running | `VIEW SERVER STATE` (that's it) |
+| **Get started** | Run the installer, open the dashboard | Download, run, add a server, done |
 
-### Lite Edition — Query Performance
-![Lite Edition — Query Performance](Screenshots/Lite%20Edition%20%E2%80%94%20Query%20Performance.jpg)
+Both editions include real-time alerts (system tray + email), charts and graphs, dark and light themes, CSV export, and a built-in MCP server for AI-powered analysis with tools like Claude.
 
-### Graphical Plan Viewer
-![Graphical plan viewer with missing index suggestions and operator analysis](Screenshots/New%20Query%20Plan%20Viewer.jpg)
+---
 
-### Alert Notifications
-![Alert notification](Screenshots/Screenshot%20alert%20notification%20or%20email.jpg)
+## What People Are Saying
 
-### MCP Server — AI-Powered Analysis
-![MCP server analysis](Screenshots/Screenshot%20MCP%20server%20analysis.jpg)
+> *"You guys make us DBAs look like absolute rockstars. I'm over here getting showered with praise, and all I do is use your scripts and follow your advice."*
 
----
+> *"replaced SentryOne and had it running in 10 minutes"*
 
-### Support, Licensing & Professional Services
+> *"I've had enough time to gather data and converse with Claude on this. It helped a lot to zone in on CPU starvation from the hypervisor on which the VM runs. IT team currently investigating the host configuration."* 
 
-**This project is free and open source under the MIT License.** The software is fully functional with no features withheld — every user gets the same tool, same collectors, same MCP integration.
+---
 
-However, some organizations have procurement or compliance policies that require a formal vendor relationship, a support agreement, or an invoice on file before software can be deployed to production. If that sounds familiar, two commercial support tiers are available:
+## What You Get
 
-| Tier | Annual Cost | What You Get |
-|------|-------------|--------------|
-| **Supported** | $500/year | Email support (2-business-day response), compatibility guarantees for new SQL Server versions, vendor agreement and invoices for compliance, unlimited instances |
-| **Priority** | $2,500/year | Next-business-day email response, quarterly live Q&A sessions, early access to new features, roadmap input, unlimited instances |
+🔍 **32 specialized T-SQL collectors** running on configurable schedules — wait stats, query performance, blocking chains, deadlock graphs, memory grants, file I/O, tempdb, perfmon counters, and more. Query text and execution plan collection can be disabled per-collector for sensitive environments.
 
-Both tiers cover unlimited SQL Server instances. The software itself is identical — commercial support is about the relationship, not a feature gate.
+🚨 **Real-time alerts** for blocking, deadlocks, and high CPU — system tray notifications plus styled HTML emails with full XML attachments for offline analysis
 
-**[Read more about the free tool and commercial options](https://erikdarling.com/free-sql-server-performance-monitoring/)** | **[Purchase a support subscription](https://training.erikdarling.com/sql-monitoring)**
+📊 **NOC-style dashboard** with green/yellow/red health cards, auto-refresh, configurable time ranges, and dark/light themes
 
----
+📋 **Graphical plan viewer** with native ShowPlan rendering, 30-rule PlanAnalyzer, operator-level cost breakdown, and a standalone mode for opening `.sqlplan` files without a server connection
 
-**Other ways to support this project:**
+🤖 **Built-in MCP server** with 27-31 read-only tools for AI analysis — ask Claude Code or Cursor "what are the top wait types on my server?" and get answers from your actual monitoring data
 
-| | |
-|---|---|
-| **Sponsor on GitHub** | [Become a sponsor](https://github.com/sponsors/erikdarlingdata) to fund new features, ongoing maintenance, and SQL Server version support. |
-| **Consulting Services** | Need help analyzing the data this tool collects? Want expert assistance fixing the issues it uncovers? [Hire me](https://training.erikdarling.com/sqlconsulting) for hands-on consulting. |
+🧰 **Community tools installed automatically** — sp_WhoIsActive, sp_BlitzLock, sp_HealthParser, sp_HumanEventsBlockViewer
 
-None of this is required — use the tool freely. Sponsorship, support subscriptions, and consulting keep this project alive.
+🔒 **Your data never leaves** — no telemetry, no cloud dependency, no phoning home. Credentials stored in Windows Credential Manager with OS-level encryption.
 
 ---
 
-## Two Editions
+## More Screenshots
 
-### Full Edition (Server-Installed)
+### Lite Edition — Query Performance
+![Lite Edition — Query Performance](Screenshots/Lite%20Edition%20%E2%80%94%20Query%20Performance.jpg)
 
-Installs a `PerformanceMonitor` database with 30 collector stored procedures and SQL Agent jobs directly on each monitored server. A separate WPF Dashboard application connects to view the data.
+### Graphical Plan Viewer
+![Graphical plan viewer with missing index suggestions and operator analysis](Screenshots/New%20Query%20Plan%20Viewer.jpg)
 
-**Best for:** Production 24/7 monitoring, long-term baselining, maximum data fidelity.
+### Alert Notifications
+![Alert notification](Screenshots/Screenshot%20alert%20notification%20or%20email.jpg)
 
-**Requirements:** Windows 10+ / Server 2016+ (Dashboard), sysadmin on target server (or equivalent on managed platforms), SQL Server Agent running.
+### MCP Server — AI-Powered Analysis
+![MCP server analysis](Screenshots/Screenshot%20MCP%20server%20analysis.jpg)
 
-### Lite Edition (Desktop Application)
+---
 
-A single WPF desktop application that monitors SQL Server instances remotely. Queries DMVs directly over the network and stores data locally in DuckDB with automatic Parquet archival. Nothing is installed on the target server.
+## Quick Start — Lite Edition
 
-**Best for:** Quick triage, Azure SQL Database, locked-down servers, consultants, firefighting.
+1. Download and extract **[PerformanceMonitorLite](https://github.com/erikdarlingdata/PerformanceMonitor/releases/latest)** (requires [.NET 8 Desktop Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/8.0))
+2. Run `PerformanceMonitorLite.exe`
+3. Click **+ Add Server**, enter connection details, test, save
+4. Double-click the server in the sidebar to connect
 
-**Requirements:** Windows 10+ / Server 2016+, `VIEW SERVER STATE` on target server (`VIEW DATABASE STATE` for Query Store).
+Data starts flowing within 1–5 minutes. That's it. No installation on your server, no Agent jobs, no sysadmin required.
 
-### Comparison
+### Lite Collectors
 
-| Capability | Full | Lite |
-|------------|------|------|
-| Target server installation | Required | None |
-| SQL Server Agent | Required | Not needed |
-| Azure SQL Managed Instance | Supported | Supported |
-| AWS RDS for SQL Server | Supported | Supported |
-| Azure SQL Database | Not supported | Supported |
-| Multi-server from one seat | Per-server install | Built-in |
-| Collectors | 30 | 20 |
-| Agent job monitoring | Duration vs historical avg/p95 | Duration vs historical avg/p95 |
-| Data storage | SQL Server (on target) | DuckDB + Parquet (local) |
-| Execution plans | Collected and stored | Download on demand |
-| Graphical plan viewer | Built-in with analysis rules | Built-in with analysis rules |
-| Community tools (sp_WhoIsActive, sp_BlitzLock) | Installed automatically | Not needed |
-| Alerts (tray + email) | Blocking, deadlocks, CPU | Blocking, deadlocks, CPU |
-| Dashboard | Separate app | Built-in |
-| Portability | Server-bound | Single executable |
-| MCP server (LLM integration) | Built into Dashboard (27 tools) | Built-in (31 tools) |
+20 collectors run on independent, configurable schedules:
 
----
+| Collector | Default | Source |
+|---|---|---|
+| query_snapshots | 1 min | `sys.dm_exec_requests` + `sys.dm_exec_sessions` |
+| blocked_process_report | 1 min | XE ring buffer session |
+| waiting_tasks | 1 min | `sys.dm_os_waiting_tasks` |
+| wait_stats | 1 min | `sys.dm_os_wait_stats` (deltas) |
+| query_stats | 1 min | `sys.dm_exec_query_stats` (deltas) |
+| procedure_stats | 1 min | `sys.dm_exec_procedure_stats` (deltas) |
+| cpu_utilization | 1 min | `sys.dm_os_ring_buffers` scheduler monitor |
+| file_io_stats | 1 min | `sys.dm_io_virtual_file_stats` (deltas) |
+| memory_stats | 1 min | `sys.dm_os_sys_memory` + memory counters |
+| memory_grant_stats | 1 min | `sys.dm_exec_query_memory_grants` |
+| tempdb_stats | 1 min | `sys.dm_db_file_space_usage` |
+| perfmon_stats | 1 min | `sys.dm_os_performance_counters` (deltas) |
+| deadlocks | 1 min | `system_health` Extended Events session |
+| memory_clerks | 5 min | `sys.dm_os_memory_clerks` |
+| query_store | 5 min | Query Store DMVs (per database) |
+| running_jobs | 5 min | `msdb` job history with duration vs avg/p95 |
+| server_config | On connect | `sys.configurations` |
+| database_config | On connect | `sys.databases` |
+| database_scoped_config | On connect | Database-scoped configurations |
+| trace_flags | On connect | `DBCC TRACESTATUS` |
 
-## Getting Started
+### Lite Data Storage
 
-1. Install the [.NET 8 Desktop Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) if you don't already have it (look for ".NET Desktop Runtime 8.0.x" — not the ASP.NET Core or Server runtime)
-2. Go to the [Releases page](https://github.com/erikdarlingdata/PerformanceMonitor/releases) and download the `.zip` for the edition you want:
-   - **`PerformanceMonitorLite`** — standalone desktop app, no server install needed
-   - **`PerformanceMonitorInstaller`** — sets up the PerformanceMonitor database and SQL Agent jobs on your server
-   - **`PerformanceMonitorDashboard`** — desktop app that connects to the database created by the Installer
-3. Extract the `.zip` to any folder and run the `.exe` inside
+- **Hot data** in DuckDB (7–90 days, configurable)
+- **Archive** to Parquet with ZSTD compression (~10x reduction, 30–180 days configurable)
+- Typical size: ~50–200 MB per server per week
 
-For the **Full Edition**, run the Installer first (see below), then open the Dashboard. For the **Lite Edition**, just run the app — no installation step required.
+### Lite Configuration
+
+All configuration lives in the `config/` folder:
+
+| File | Purpose |
+|---|---|
+| `servers.json` | Server connections (passwords in Windows Credential Manager) |
+| `settings.json` | Retention, MCP server, startup behavior, alert thresholds, SMTP configuration |
+| `collection_schedule.json` | Per-collector enable/disable and frequency |
+| `ignored_wait_types.json` | 144 benign wait types excluded by default |
 
 ---
 
@@ -119,46 +130,48 @@ For the **Full Edition**, run the Installer first (see below), then open the Das
 ### Install
 
 Windows Authentication:
-```cmd
+
+```
 PerformanceMonitorInstaller.exe YourServerName
 ```
 
 SQL Authentication:
-```cmd
+
+```
 PerformanceMonitorInstaller.exe YourServerName sa YourPassword
 ```
 
 Clean reinstall (drops existing database and all collected data):
-```cmd
+
+```
 PerformanceMonitorInstaller.exe YourServerName --reinstall
 PerformanceMonitorInstaller.exe YourServerName sa YourPassword --reinstall
 ```
 
-The installer automatically tests the connection, detects existing installations and applies upgrade scripts if needed, executes SQL scripts, downloads community dependencies, creates SQL Agent jobs, and runs initial data collection.
-
-A GUI installer (`PerformanceMonitorInstallerGui.exe`) is also included in the release with the same functionality — same upgrade detection, same scripts, same results, with a graphical interface.
+The installer automatically tests the connection, executes SQL scripts, downloads community dependencies, creates SQL Agent jobs, and runs initial data collection. A GUI installer (`InstallerGui/`) is also available with the same functionality.
 
 ### CLI Installer Options
 
 | Option | Description |
-|--------|-------------|
+|---|---|
 | `SERVER` | SQL Server instance name (positional, required) |
 | `USERNAME PASSWORD` | SQL Authentication credentials (positional, optional) |
 | `--reinstall` | Drop existing database and perform clean install |
-| `--reset-schedule` | Reset collection schedule to recommended defaults during upgrade |
+| `--preserve-jobs` | Keep existing SQL Agent job schedules during upgrade |
 | `--encrypt=optional\|mandatory\|strict` | Connection encryption level (default: mandatory) |
 | `--trust-cert` | Trust server certificate without validation (default: require valid cert) |
+| `--help` | Show usage information and exit |
 
 **Environment variable:** Set `PM_SQL_PASSWORD` to avoid passing the password on the command line.
 
 ### Exit Codes
 
 | Code | Meaning |
-|------|---------|
+|---|---|
 | `0` | Success |
 | `1` | Invalid arguments |
 | `2` | Connection failed |
-| `3` | Critical file failed (scripts 01-03) |
+| `3` | Critical file failed (scripts 01–03) |
 | `4` | Partial installation (non-critical failures) |
 | `5` | Version check failed |
 | `6` | SQL files not found |
@@ -181,7 +194,8 @@ ORDER BY collection_time DESC;
 ### What Gets Installed
 
 - **PerformanceMonitor database** with collection tables and reporting views
-- **30 collector stored procedures** for gathering metrics (including SQL Agent job monitoring)
+- **32 collector stored procedures** for gathering metrics (including SQL Agent job monitoring)
+- **Configurable collection** — query text and execution plan capture can be disabled per-collector via `config.collection_schedule` (`collect_query`, `collect_plan` columns) for sensitive or high-volume environments
 - **Delta framework** for calculating per-second rates from cumulative DMVs
 - **Community dependencies:** sp_WhoIsActive, sp_HealthParser, sp_HumanEventsBlockViewer, sp_BlitzLock
 - **SQL Agent jobs:** Collection (every 1 minute), Data Retention (daily at 2:00 AM), and Hung Job Monitor (collection job watchdog, every 5 minutes)
@@ -189,16 +203,16 @@ ORDER BY collection_time DESC;
 
 ### Data Retention
 
-Default: 30 days (configurable per collector via `retention_days` in `config.collection_schedule`).
+Default: 30 days (configurable per table in `config.retention_settings`).
 
-Storage estimates: 5-10 GB per week, 20-40 GB per month.
+Storage estimates: 5–10 GB per week, 20–40 GB per month.
 
 ### Managed Platform Support
 
 The Full Edition supports Azure SQL Managed Instance and AWS RDS for SQL Server with some limitations:
 
 | Feature | On-Premises | Azure SQL MI | AWS RDS |
-|---------|-------------|--------------|---------|
+|---|---|---|---|
 | All core collectors | Yes | Yes | Yes |
 | Default trace collectors | Yes | Disabled automatically | Yes |
 | System health XE (file target) | Yes | Disabled automatically | Yes |
@@ -225,6 +239,7 @@ The Full Edition supports Azure SQL Managed Instance and AWS RDS for SQL Server
 3. Search for `blocked process threshold (s)` and set it to `5` (seconds)
 4. Apply the parameter group to your RDS instance (may require a reboot if the parameter is static)
 5. Verify it took effect:
+
    ```sql
    SELECT
        c.name,
@@ -239,61 +254,28 @@ The Full Edition supports Azure SQL Managed Instance and AWS RDS for SQL Server
 
 ---
 
-## Quick Start — Lite Edition
-
-### Install
-
-1. Download and extract `PerformanceMonitorLite`
-2. Run `PerformanceMonitorLite.exe`
-3. Click **+ Add Server**, enter connection details, test, save
-4. Double-click the server in the sidebar to connect
-
-Data starts flowing within 1-5 minutes depending on collector schedules.
+## Edition Comparison
 
-### Lite Collectors
-
-20 collectors run on independent, configurable schedules:
-
-| Collector | Default | Source |
-|-----------|---------|--------|
-| query_snapshots | 1 min | `sys.dm_exec_requests` + `sys.dm_exec_sessions` |
-| blocked_process_report | 1 min | XE ring buffer session |
-| waiting_tasks | 1 min | `sys.dm_os_waiting_tasks` |
-| wait_stats | 1 min | `sys.dm_os_wait_stats` (deltas) |
-| query_stats | 1 min | `sys.dm_exec_query_stats` (deltas) |
-| procedure_stats | 1 min | `sys.dm_exec_procedure_stats` (deltas) |
-| cpu_utilization | 1 min | `sys.dm_os_ring_buffers` scheduler monitor |
-| file_io_stats | 1 min | `sys.dm_io_virtual_file_stats` (deltas) |
-| memory_stats | 1 min | `sys.dm_os_sys_memory` + memory counters |
-| memory_grant_stats | 1 min | `sys.dm_exec_query_memory_grants` |
-| tempdb_stats | 1 min | `sys.dm_db_file_space_usage` |
-| perfmon_stats | 1 min | `sys.dm_os_performance_counters` (deltas) |
-| deadlocks | 1 min | `system_health` Extended Events session |
-| memory_clerks | 5 min | `sys.dm_os_memory_clerks` |
-| query_store | 5 min | Query Store DMVs (per database) |
-| running_jobs | 5 min | `msdb` job history with duration vs avg/p95 |
-| server_config | On connect | `sys.configurations` |
-| database_config | On connect | `sys.databases` |
-| database_scoped_config | On connect | Database-scoped configurations |
-| trace_flags | On connect | `DBCC TRACESTATUS` |
-
-### Lite Data Storage
-
-- **Hot data** in DuckDB (7-90 days, configurable)
-- **Automatic maintenance** — when DuckDB reaches 512 MB, all data is archived to Parquet and the database reinitializes, keeping inserts fast and preventing bloat
-- **Archive** to Parquet with ZSTD compression (~10x reduction, 30-180 days configurable)
-- Typical size: ~50-200 MB per server per week
-
-### Lite Configuration
-
-All configuration lives in the `config/` folder:
-
-| File | Purpose |
-|------|---------|
-| `servers.json` | Server connections (passwords in Windows Credential Manager) |
-| `settings.json` | Retention, MCP server, startup behavior, alert thresholds, SMTP configuration |
-| `collection_schedule.json` | Per-collector enable/disable and frequency |
-| `ignored_wait_types.json` | 144 benign wait types excluded by default |
+| Capability | Full | Lite |
+|---|---|---|
+| Target server installation | Required | None |
+| SQL Server Agent | Required | Not needed |
+| Azure SQL Managed Instance | Supported | Supported |
+| AWS RDS for SQL Server | Supported | Supported |
+| Azure SQL Database | Not supported | Supported |
+| Multi-server from one seat | Per-server install | Built-in |
+| Collectors | 32 | 20 |
+| Agent job monitoring | Duration vs historical avg/p95 | Duration vs historical avg/p95 |
+| Data storage | SQL Server (on target) | DuckDB + Parquet (local) |
+| Execution plans | Collected and stored (can be disabled per-collector) | Download on demand |
+| Graphical plan viewer | Built-in with 30-rule PlanAnalyzer | Built-in with 30-rule PlanAnalyzer |
+| Standalone plan viewer | Open/paste/drag `.sqlplan` files | Open/paste/drag `.sqlplan` files |
+| Community tools (sp_WhoIsActive, sp_BlitzLock) | Installed automatically | Not needed |
+| Alerts (tray + email) | Blocking, deadlocks, CPU | Blocking, deadlocks, CPU |
+| Dashboard | Separate app | Built-in |
+| Themes | Dark and light | Dark and light |
+| Portability | Server-bound | Single executable |
+| MCP server (LLM integration) | Built into Dashboard (27 tools) | Built-in (31 tools) |
 
 ---
 
@@ -302,12 +284,12 @@ All configuration lives in the `config/` folder:
 ### Full Edition Dashboard
 
 | Tab | Contents |
-|-----|----------|
+|---|---|
 | **Overview** | Resource overview, daily summary, critical issues, server config changes, database config changes, trace flag changes, collection health |
-| **Performance** | Performance trends, expensive queries, active queries (with interactive "Run Now"), query stats, procedure stats, Query Store, Query Store regressions, query trace patterns, graphical plan viewer with analysis rules |
-| **Resource Metrics** | Server trends, wait stats, TempDB, file I/O latency & throughput, perfmon counters (with auto-select packs), CPU scheduler pressure, default trace events, trace analysis, session stats, latch stats, spinlock stats |
+| **Performance** | Performance trends, expensive queries, active queries, query stats, procedure stats, Query Store, Query Store regressions, query trace patterns |
+| **Resource Metrics** | Server trends, wait stats, TempDB, file I/O latency, perfmon counters, default trace events, trace analysis, session stats, latch stats, spinlock stats |
 | **Memory** | Memory overview, grants, clerks, plan cache, memory pressure events |
-| **Locking** | Blocking chains, deadlocks, blocking/deadlock trends, current waits |
+| **Locking** | Blocking chains, deadlocks, blocking/deadlock trends |
 | **System Events** | Corruption events, contention, errors, I/O issues, scheduler issues, memory conditions |
 
 Plus a NOC-style landing page with server health cards (green/yellow/red severity indicators).
@@ -315,19 +297,19 @@ Plus a NOC-style landing page with server health cards (green/yellow/red severit
 ### Lite Edition Dashboard
 
 | Tab | Contents |
-|-----|----------|
-| **Active Queries** | Running queries with session details, wait types, blocking, DOP, memory grants, interactive "Run Now" button, graphical plan viewer with analysis rules |
+|---|---|
+| **Active Queries** | Running queries with session details, wait types, blocking, DOP, memory grants |
 | **Wait Stats** | Filterable wait statistics chart with delta calculations |
-| **CPU** | SQL Server CPU vs Other Processes over time, CPU scheduler pressure |
-| **Memory** | Physical memory overview, SQL Server memory trend, memory clerk breakdown, memory grant details |
+| **CPU** | SQL Server CPU vs Other Processes over time |
+| **Memory** | Physical memory overview, SQL Server memory trend, memory clerk breakdown |
 | **Queries** | Performance trends, top queries and procedures by duration, Query Store integration |
-| **File I/O** | Read/write I/O trends, file-level latency & throughput per database file |
+| **File I/O** | Read/write I/O trends per database file |
 | **TempDB** | Space usage breakdown and TempDB file I/O |
-| **Blocking** | Blocking/deadlock trends, blocked process reports, deadlock history, current waits |
-| **Perfmon** | Selectable SQL Server performance counters with auto-select packs (General Throughput, Memory Pressure, CPU/Compilation, I/O Pressure, TempDB Pressure, Lock/Blocking) |
+| **Blocking** | Blocking/deadlock trends, blocked process reports, deadlock history |
+| **Perfmon** | Selectable SQL Server performance counters over time |
 | **Configuration** | Server configuration, database configuration, scoped configuration, trace flags |
 
-Both editions feature auto-refresh, configurable time ranges, right-click CSV export, system tray integration, and dark theme.
+Both editions feature auto-refresh, configurable time ranges, right-click CSV export, system tray integration, dark and light themes, and timezone display options (server time, local time, or UTC).
 
 ---
 
@@ -338,7 +320,7 @@ Both editions include a real-time alert engine that monitors for performance iss
 ### Alert Types
 
 | Metric | Default Threshold | Description |
-|--------|-------------------|-------------|
+|---|---|---|
 | **Blocking** | 30 seconds (Full), 5 seconds (Lite) | Fires when the longest blocked session exceeds the threshold |
 | **Deadlocks** | 1 | Fires when new deadlocks are detected since the last check |
 | **High CPU** | 90% (Full), 80% (Lite) | Fires when total CPU (SQL + other) exceeds the threshold |
@@ -373,7 +355,7 @@ Alert emails include:
 Both editions monitor currently running SQL Agent jobs and flag jobs that are running longer than expected.
 
 | Metric | How It Works |
-|--------|-------------|
+|---|---|
 | **Current duration** | Elapsed time since the job started |
 | **Average duration** | Historical mean from successful completions in `msdb.dbo.sysjobhistory` |
 | **p95 duration** | 95th percentile from historical completions |
@@ -393,9 +375,11 @@ Both editions include an embedded [Model Context Protocol](https://modelcontextp
 
 1. Enable the MCP server in Settings (checkbox + port, default `5151`)
 2. Register with Claude Code:
+
 ```
 claude mcp add --transport http --scope user sql-monitor http://localhost:5151/
 ```
+
 3. Open a new Claude Code session and ask questions like:
    - "What servers are being monitored?"
    - "What are the top wait types on my server?"
@@ -408,7 +392,7 @@ claude mcp add --transport http --scope user sql-monitor http://localhost:5151/
 Full Edition exposes 27 tools, Lite Edition exposes 31. Core tools are shared across both editions.
 
 | Category | Tools |
-|----------|-------|
+|---|---|
 | Discovery | `list_servers` |
 | Health | `get_server_summary`\*, `get_daily_summary`\*\*, `get_collection_health` |
 | Alerts | `get_alert_history`, `get_alert_settings` |
@@ -430,17 +414,6 @@ The MCP server binds to `localhost` only and does not accept remote connections.
 
 ---
 
-## Credential Storage
-
-Both editions use Windows Credential Manager to store SQL Server passwords:
-
-- Credentials are never saved to disk in plain text
-- Windows Credential Manager provides OS-level encryption (DPAPI)
-- Credentials persist across application sessions
-- Manage stored credentials in Control Panel > Credential Manager (look for `PerformanceMonitor_` entries)
-
----
-
 ## Performance Impact
 
 ### On Monitored Servers
@@ -452,7 +425,7 @@ Both editions use Windows Credential Manager to store SQL Server passwords:
 
 ### Local Resources (Lite)
 
-- DuckDB: ~50-200 MB per server per week
+- DuckDB: ~50–200 MB per server per week
 - Parquet archives: ~10x compression with ZSTD
 - ScottPlot charts use hardware-accelerated rendering
 
@@ -465,7 +438,7 @@ Both editions use Windows Credential Manager to store SQL Server passwords:
 Two diagnostic scripts in the `install/` folder:
 
 | Script | Purpose |
-|--------|---------|
+|---|---|
 | `99_installer_troubleshooting.sql` | Quick health checks: collection log errors, schedule status, Agent job status, table row counts |
 | `99_user_troubleshooting.sql` | Comprehensive diagnostics: runs collectors with `@debug = 1`, detailed timing and row counts |
 
@@ -484,7 +457,8 @@ ORDER BY collection_time DESC;
 Application logs are written to the `logs/` folder. Collection success/failure is also logged to the `collection_log` table in DuckDB.
 
 Common issues:
-1. **No data after connecting** — Wait for the first collection cycle (1-5 minutes). Check logs for connection errors.
+
+1. **No data after connecting** — Wait for the first collection cycle (1–5 minutes). Check logs for connection errors.
 2. **Query Store tab empty** — Query Store must be enabled on the target database (`ALTER DATABASE [YourDB] SET QUERY_STORE = ON`).
 3. **Blocked process reports empty** — Both editions attempt to auto-configure the blocked process threshold to 5 seconds via `sp_configure`. On **AWS RDS**, `sp_configure` is not available — you must set `blocked process threshold (s)` through an RDS Parameter Group (see "AWS RDS Parameter Group Configuration" above). On **Azure SQL Database**, the threshold is fixed at 20 seconds and cannot be changed. If you still see no data on other platforms, verify the login has `ALTER SETTINGS` permission.
 4. **Connection failures** — Verify network connectivity, firewall rules, and that the login has `VIEW SERVER STATE`.
@@ -497,7 +471,7 @@ Common issues:
 Monitor/
 │
 │   Full Edition (server-installed collectors + separate dashboard)
-├── install/          # 55 SQL installation scripts
+├── install/          # 54 SQL installation scripts
 ├── upgrades/         # Version-specific upgrade scripts
 ├── Installer/        # CLI installer for Full Edition database (C#)
 ├── InstallerGui/     # GUI installer for Full Edition database (WPF)
@@ -516,7 +490,7 @@ Monitor/
 
 All projects target .NET 8.0.
 
-```cmd
+```
 # Full Edition Dashboard
 dotnet build Dashboard/Dashboard.csproj
 
@@ -526,23 +500,39 @@ dotnet build Lite/PerformanceMonitorLite.csproj
 # CLI Installer (self-contained)
 dotnet publish Installer/PerformanceMonitorInstaller.csproj -c Release
 
-# GUI Installer (self-contained)
-dotnet publish InstallerGui/InstallerGui.csproj -c Release
+# GUI Installer
+dotnet publish InstallerGui/InstallerGui.csproj -c Release -r win-x64 --self-contained
 ```
 
 ---
 
+## Support & Sponsorship
+
+**This project is free and open source.** If you find it valuable, consider supporting continued development:
+
+| | |
+|---|---|
+| **Sponsor on GitHub** | [Become a sponsor](https://github.com/sponsors/erikdarlingdata) to fund new features, ongoing maintenance, and SQL Server version support. |
+| **Consulting Services** | [Hire me](https://training.erikdarling.com/sqlconsulting) for hands-on consulting if you need help analyzing the data this tool collects? Want expert assistance fixing the issues it uncovers?  |
+
+Neither is required — use the tool freely. Sponsorship and consulting keep this project alive.
+
+---
+
 ## Third-Party Components
 
 ### sp_WhoIsActive
+
 - **Author:** Adam Machanic | **License:** GPLv3
 - **Repository:** https://github.com/amachanic/sp_whoisactive
 
 ### DarlingData
+
 - **Author:** Erik Darling (Darling Data, LLC) | **License:** MIT
 - **Repository:** https://github.com/erikdarlingdata/DarlingData
 
 ### SQL Server First Responder Kit
+
 - **Author:** Brent Ozar Unlimited | **License:** MIT
 - **Repository:** https://github.com/BrentOzarULTD/SQL-Server-First-Responder-Kit
 
diff --git a/Screenshots/New Query Plan Viewer.jpg b/Screenshots/New Query Plan Viewer.jpg
index 6bfae79..3251dcc 100644
Binary files a/Screenshots/New Query Plan Viewer.jpg and b/Screenshots/New Query Plan Viewer.jpg differ
diff --git a/collection_schedule.json b/collection_schedule.json
new file mode 100644
index 0000000..ab6b3d8
--- /dev/null
+++ b/collection_schedule.json
@@ -0,0 +1,144 @@
+{
+  "collectors": [
+    {
+      "name": "wait_stats",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 30,
+      "description": "Wait statistics from sys.dm_os_wait_stats"
+    },
+    {
+      "name": "query_stats",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 30,
+      "description": "Query statistics from sys.dm_exec_query_stats"
+    },
+    {
+      "name": "procedure_stats",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 30,
+      "description": "Stored procedure statistics from sys.dm_exec_procedure_stats"
+    },
+    {
+      "name": "query_store",
+      "enabled": true,
+      "frequency_minutes": 5,
+      "retention_days": 30,
+      "description": "Query Store data (top 100 queries per database)"
+    },
+    {
+      "name": "query_snapshots",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 7,
+      "description": "Currently running queries snapshot"
+    },
+    {
+      "name": "cpu_utilization",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 30,
+      "description": "CPU utilization from ring buffer"
+    },
+    {
+      "name": "file_io_stats",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 30,
+      "description": "File I/O statistics from sys.dm_io_virtual_file_stats"
+    },
+    {
+      "name": "memory_stats",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 30,
+      "description": "Memory statistics from sys.dm_os_sys_memory and performance counters"
+    },
+    {
+      "name": "memory_clerks",
+      "enabled": true,
+      "frequency_minutes": 5,
+      "retention_days": 30,
+      "description": "Memory clerk allocations from sys.dm_os_memory_clerks"
+    },
+    {
+      "name": "tempdb_stats",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 30,
+      "description": "TempDB space usage from sys.dm_db_file_space_usage"
+    },
+    {
+      "name": "perfmon_stats",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 30,
+      "description": "Key performance counters from sys.dm_os_performance_counters"
+    },
+    {
+      "name": "deadlocks",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 30,
+      "description": "Deadlocks from system_health extended event session"
+    },
+    {
+      "name": "server_config",
+      "enabled": true,
+      "frequency_minutes": 0,
+      "retention_days": 30,
+      "description": "Server configuration (on-load only)"
+    },
+    {
+      "name": "database_config",
+      "enabled": true,
+      "frequency_minutes": 0,
+      "retention_days": 30,
+      "description": "Database configuration (on-load only)"
+    },
+    {
+      "name": "memory_grant_stats",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 30,
+      "description": "Memory grant statistics from sys.dm_exec_query_memory_grants"
+    },
+    {
+      "name": "waiting_tasks",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 7,
+      "description": "Point-in-time waiting tasks from sys.dm_os_waiting_tasks"
+    },
+    {
+      "name": "blocked_process_report",
+      "enabled": true,
+      "frequency_minutes": 1,
+      "retention_days": 30,
+      "description": "Blocked process reports from XE ring buffer session (opt-out)"
+    },
+    {
+      "name": "database_scoped_config",
+      "enabled": true,
+      "frequency_minutes": 0,
+      "retention_days": 30,
+      "description": "Database-scoped configurations (on-load only)"
+    },
+    {
+      "name": "trace_flags",
+      "enabled": true,
+      "frequency_minutes": 0,
+      "retention_days": 30,
+      "description": "Active trace flags via DBCC TRACESTATUS (on-load only)"
+    },
+    {
+      "name": "running_jobs",
+      "enabled": true,
+      "frequency_minutes": 5,
+      "retention_days": 7,
+      "description": "Currently running SQL Agent jobs with duration comparison"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/install/08_collect_query_stats.sql b/install/08_collect_query_stats.sql
index df0163c..b264867 100644
--- a/install/08_collect_query_stats.sql
+++ b/install/08_collect_query_stats.sql
@@ -292,6 +292,7 @@ BEGIN
         INNER JOIN sys.databases AS d
           ON pa.dbid = d.database_id
         WHERE qs.last_execution_time >= @cutoff_time
+        AND   d.state = 0 /*ONLINE only — skip RESTORING databases (mirroring/AG secondary)*/
         AND   pa.dbid NOT IN
         (
             1, 2, 3, 4, 32761, 32767,
diff --git a/install/09_collect_query_store.sql b/install/09_collect_query_store.sql
index f8a13b2..769ccfd 100644
--- a/install/09_collect_query_store.sql
+++ b/install/09_collect_query_store.sql
@@ -145,16 +145,16 @@ BEGIN
         END;
 
         /*
-        First run detection - collect 3 days of history if this is the first execution
+        First run detection - collect last 1 hour of history if this is the first execution
         */
         IF NOT EXISTS (SELECT 1/0 FROM collect.query_store_data)
         AND NOT EXISTS (SELECT 1/0 FROM config.collection_log WHERE collector_name = N'query_store_collector')
         BEGIN
-            SET @cutoff_time = TODATETIMEOFFSET(DATEADD(DAY, -3, SYSUTCDATETIME()), 0);
+            SET @cutoff_time = TODATETIMEOFFSET(DATEADD(HOUR, -1, SYSUTCDATETIME()), 0);
 
             IF @debug = 1
             BEGIN
-                RAISERROR(N'First run detected - collecting last 3 days of Query Store data', 0, 1) WITH NOWAIT;
+                RAISERROR(N'First run detected - collecting last 1 hour of Query Store data', 0, 1) WITH NOWAIT;
             END;
         END;
         ELSE
@@ -200,6 +200,19 @@ BEGIN
             RAISERROR(@debug_msg, 0, 1) WITH NOWAIT;
         END;
 
+        /*
+        Read collection flags for query text and plans
+        */
+        DECLARE
+            @collect_query bit = 1,
+            @collect_plan bit = 1;
+
+        SELECT
+            @collect_query = cs.collect_query,
+            @collect_plan = cs.collect_plan
+        FROM config.collection_schedule AS cs
+        WHERE cs.collector_name = N'query_store_collector';
+
         /*
         Create temp table to hold Query Store data from all databases
         */
@@ -286,11 +299,19 @@ BEGIN
             SELECT
                 d.name
             FROM sys.databases AS d
+            LEFT JOIN sys.dm_hadr_database_replica_states AS drs
+                ON d.database_id = drs.database_id
+                AND drs.is_local = 1
             WHERE d.state_desc = N'ONLINE'
             AND   d.database_id > 4
             AND   d.is_read_only = 0
             AND   d.name <> N'PerformanceMonitor'
             AND   d.database_id < 32761 /*exclude contained AG system databases*/
+            AND
+            (
+                drs.database_id IS NULL          /*not in any AG*/
+                OR drs.is_primary_replica = 1    /*primary replica*/
+            )
             OPTION(RECOMPILE);
 
         OPEN @db_check_cursor;
@@ -391,8 +412,20 @@ BEGIN
                         WHEN q.object_id > 0
                         AND  o.object_id IS NOT NULL
                         THEN o.object_name
-                    END,
-                query_sql_text = qt.query_sql_text,
+                    END,';
+
+            IF @collect_query = 1
+            BEGIN
+                SET @sql += N'
+                query_sql_text = qt.query_sql_text,';
+            END;
+            ELSE
+            BEGIN
+                SET @sql += N'
+                query_sql_text = NULL,';
+            END;
+
+            SET @sql += N'
                 query_hash = q.query_hash,
                 count_executions = rs.count_executions,
                 avg_duration = rs.avg_duration,
@@ -484,8 +517,20 @@ BEGIN
                 is_forced_plan = p.is_forced_plan,
                 p.force_failure_count,
                 p.last_force_failure_reason_desc,
-                p.compatibility_level,
-                query_plan_text = CONVERT(nvarchar(max), p.query_plan),
+                p.compatibility_level,';
+
+            IF @collect_plan = 1
+            BEGIN
+                SET @sql += N'
+                query_plan_text = CONVERT(nvarchar(max), p.query_plan),';
+            END;
+            ELSE
+            BEGIN
+                SET @sql += N'
+                query_plan_text = NULL,';
+            END;
+
+            SET @sql += N'
                 compilation_metrics =
                     (
                         SELECT
diff --git a/install/10_collect_procedure_stats.sql b/install/10_collect_procedure_stats.sql
index e2dd106..7f8e411 100644
--- a/install/10_collect_procedure_stats.sql
+++ b/install/10_collect_procedure_stats.sql
@@ -239,9 +239,10 @@ BEGIN
             FROM sys.dm_exec_plan_attributes(ps.plan_handle) AS pa
             WHERE pa.attribute = N'dbid'
         ) AS pa
-        LEFT JOIN sys.databases AS d
+        INNER JOIN sys.databases AS d
           ON pa.dbid = d.database_id
         WHERE ps.last_execution_time >= @cutoff_time
+        AND   d.state = 0 /*ONLINE only — skip RESTORING databases (mirroring/AG secondary)*/
         AND   pa.dbid NOT IN
         (
             1, 3, 4, 32761, 32767,
@@ -402,9 +403,10 @@ BEGIN
             FROM sys.dm_exec_plan_attributes(ts.plan_handle) AS pa
             WHERE pa.attribute = N'dbid'
         ) AS pa
-        LEFT JOIN sys.databases AS d
+        INNER JOIN sys.databases AS d
           ON pa.dbid = d.database_id
         WHERE ts.last_execution_time >= @cutoff_time
+        AND   d.state = 0 /*ONLINE only — skip RESTORING databases (mirroring/AG secondary)*/
         AND   pa.dbid NOT IN
         (
             1, 3, 4, 32761, 32767,
@@ -460,9 +462,10 @@ BEGIN
             FROM sys.dm_exec_plan_attributes(fs.plan_handle) AS pa
             WHERE pa.attribute = N'dbid'
         ) AS pa
-        LEFT JOIN sys.databases AS d
+        INNER JOIN sys.databases AS d
           ON pa.dbid = d.database_id
         WHERE fs.last_execution_time >= @cutoff_time
+        AND   d.state = 0 /*ONLINE only — skip RESTORING databases (mirroring/AG secondary)*/
         AND   pa.dbid NOT IN
         (
             1, 3, 4, 32761, 32767,
diff --git a/install/11_collect_query_snapshots.sql b/install/11_collect_query_snapshots.sql
index 4977d2c..e61046b 100644
--- a/install/11_collect_query_snapshots.sql
+++ b/install/11_collect_query_snapshots.sql
@@ -196,6 +196,10 @@ BEGIN
 
         /*
         Collect currently executing queries using sp_WhoIsActive
+        sp_WhoIsActive inserts by ordinal position, not column name.
+        If sp_WhoIsActive was updated and column order changed,
+        existing daily tables will have a schema mismatch.
+        Detect this and recreate the table if needed.
         */
         SET @sql = N'
         EXECUTE ' + QUOTENAME(@whoisactive_database) + N'.dbo.sp_WhoIsActive
@@ -208,8 +212,83 @@ BEGIN
             @get_memory_info = 1,
             @destination_table = ''' + @full_table_name + N''';';
 
-        EXECUTE sys.sp_executesql
-            @sql;
+        BEGIN TRY
+            EXECUTE sys.sp_executesql
+                @sql;
+        END TRY
+        BEGIN CATCH
+            IF ERROR_NUMBER() = 257 /*Implicit conversion = column order mismatch*/
+            BEGIN
+                IF @debug = 1
+                BEGIN
+                    RAISERROR(N'Schema mismatch detected on %s, recreating table', 0, 1, @full_table_name) WITH NOWAIT;
+                END;
+
+                /*Drop the mismatched table*/
+                SET @sql =
+                    N'DROP TABLE ' +
+                    @full_table_name +
+                    N';';
+
+                EXECUTE sys.sp_executesql
+                    @sql;
+
+                /*Recreate from current sp_WhoIsActive schema*/
+                SET @schema = N'';
+
+                SET @sql = N'
+                EXECUTE ' + QUOTENAME(@whoisactive_database) + N'.dbo.sp_WhoIsActive
+                    @get_transaction_info = 1,
+                    @get_outer_command = 1,
+                    @get_plans = 1,
+                    @get_task_info = 2,
+                    @get_additional_info = 1,
+                    @find_block_leaders = 1,
+                    @get_memory_info = 1,
+                    @not_filter_type = ''database'',
+                    @not_filter = ''PerformanceMonitor'',
+                    @return_schema = 1,
+                    @schema = @schema OUTPUT;';
+
+                EXECUTE sys.sp_executesql
+                    @sql,
+                    N'@schema nvarchar(max) OUTPUT',
+                    @schema = @schema OUTPUT;
+
+                SET @schema =
+                    REPLACE
+                    (
+                        @schema,
+                        N'<table_name>',
+                        @full_table_name
+                    );
+
+                EXECUTE sys.sp_executesql
+                    @schema;
+
+                /*Retry the insert*/
+                SET @sql = N'
+                EXECUTE ' + QUOTENAME(@whoisactive_database) + N'.dbo.sp_WhoIsActive
+                    @get_transaction_info = 1,
+                    @get_outer_command = 1,
+                    @get_plans = 1,
+                    @get_task_info = 2,
+                    @get_additional_info = 1,
+                    @find_block_leaders = 1,
+                    @get_memory_info = 1,
+                    @destination_table = ''' + @full_table_name + N''';';
+
+                EXECUTE sys.sp_executesql
+                    @sql;
+
+                /*Recreate views for new schema*/
+                EXECUTE collect.query_snapshots_create_views;
+            END;
+            ELSE
+            BEGIN
+                THROW;
+            END;
+        END CATCH;
 
         /*
         Get row count from last insertion
diff --git a/install/20_collect_file_io_stats.sql b/install/20_collect_file_io_stats.sql
index 1cf5db0..d2e3f7f 100644
--- a/install/20_collect_file_io_stats.sql
+++ b/install/20_collect_file_io_stats.sql
@@ -133,7 +133,7 @@ BEGIN
             database_name =
                 ISNULL
                 (
-                    DB_NAME(vfs.database_id),
+                    d.name,
                     N'UNKNOWN'
                 ),
             file_id = vfs.file_id,
@@ -162,6 +162,8 @@ BEGIN
             io_stall_queued_write_ms = vfs.io_stall_queued_write_ms,
             sample_ms = vfs.sample_ms
         FROM sys.dm_io_virtual_file_stats(NULL, NULL) AS vfs
+        LEFT JOIN sys.databases AS d
+          ON  d.database_id = vfs.database_id
         LEFT JOIN sys.master_files AS mf
           ON  mf.database_id = vfs.database_id
           AND mf.file_id = vfs.file_id
diff --git a/install/23_process_blocked_process_xml.sql b/install/23_process_blocked_process_xml.sql
index c8090bd..6def84c 100644
--- a/install/23_process_blocked_process_xml.sql
+++ b/install/23_process_blocked_process_xml.sql
@@ -52,6 +52,9 @@ BEGIN
         @rows_marked bigint = 0,
         @rows_parsed bigint = 0,
         @start_time datetime2(7) = SYSDATETIME(),
+        @utc_offset_minutes integer = DATEDIFF(MINUTE, GETUTCDATE(), SYSDATETIME()),
+        @start_date_local datetime2(7) = NULL,
+        @end_date_local datetime2(7) = NULL,
         @error_message nvarchar(4000),
         @error_number integer,
         @blockviewer_database sysname = NULL,
@@ -136,23 +139,44 @@ BEGIN
                 AND   bx.event_time IS NOT NULL
                 OPTION(RECOMPILE);
 
+                /*
+                Convert UTC event_time to local time for sp_HumanEventsBlockViewer
+                The proc expects local time inputs and converts to UTC internally
+                Raw table event_time is UTC (from XE @timestamp attribute)
+                */
+                SELECT
+                    @start_date_local = DATEADD(MINUTE, @utc_offset_minutes, @start_date),
+                    @end_date_local = DATEADD(MINUTE, @utc_offset_minutes, @end_date);
+
                 IF @debug = 1
                 BEGIN
-                    SET @debug_msg = N'Derived date range from unprocessed rows: ' + ISNULL(CONVERT(nvarchar(30), @start_date, 121), N'NULL') + N' to ' + ISNULL(CONVERT(nvarchar(30), @end_date, 121), N'NULL');
+                    SET @debug_msg = N'Derived date range (UTC): ' + ISNULL(CONVERT(nvarchar(30), @start_date, 121), N'NULL') + N' to ' + ISNULL(CONVERT(nvarchar(30), @end_date, 121), N'NULL');
+                    RAISERROR(@debug_msg, 0, 1) WITH NOWAIT;
+                    SET @debug_msg = N'Converted to local: ' + ISNULL(CONVERT(nvarchar(30), @start_date_local, 121), N'NULL') + N' to ' + ISNULL(CONVERT(nvarchar(30), @end_date_local, 121), N'NULL');
                     RAISERROR(@debug_msg, 0, 1) WITH NOWAIT;
                 END;
             END;
+            ELSE
+            BEGIN
+                /*
+                User provided explicit dates (assumed local time)
+                No conversion needed — pass through directly
+                */
+                SELECT
+                    @start_date_local = @start_date,
+                    @end_date_local = @end_date;
+            END;
 
             /*
             Delete existing parsed blocking events for the time range to prevent duplicates
             sp_HumanEventsBlockViewer will re-insert fresh parsed data
             */
-            IF @start_date IS NOT NULL AND @end_date IS NOT NULL
+            IF @start_date_local IS NOT NULL AND @end_date_local IS NOT NULL
             BEGIN
                 DELETE b
                 FROM collect.blocking_BlockedProcessReport AS b
-                WHERE b.event_time >= @start_date
-                AND   b.event_time <= @end_date;
+                WHERE b.event_time >= @start_date_local
+                AND   b.event_time <= @end_date_local;
 
                 SELECT
                     @rows_deleted = ROWCOUNT_BIG();
@@ -192,19 +216,20 @@ BEGIN
                 N'@log_retention_days integer, @max_events_to_process integer, @start_date datetime2(7), @end_date datetime2(7), @debug bit',
                 @log_retention_days = @log_retention_days,
                 @max_events_to_process = @max_events_to_process,
-                @start_date = @start_date,
-                @end_date = @end_date,
+                @start_date = @start_date_local,
+                @end_date = @end_date_local,
                 @debug = @debug;
 
             /*
             Verify sp_HumanEventsBlockViewer produced parsed results before marking rows as processed
             If no results were inserted, leave rows unprocessed so they are retried next run
+            Parsed results use local time (sp_HumanEventsBlockViewer converts UTC to local)
             */
             SELECT
                 @rows_parsed = COUNT_BIG(*)
             FROM collect.blocking_BlockedProcessReport AS b
-            WHERE b.event_time >= @start_date
-            AND   b.event_time <= @end_date
+            WHERE b.event_time >= @start_date_local
+            AND   b.event_time <= @end_date_local
             OPTION(RECOMPILE);
 
             IF @rows_parsed > 0
diff --git a/install/37_collect_waiting_tasks.sql b/install/37_collect_waiting_tasks.sql
index 7d17a9d..34b0ecf 100644
--- a/install/37_collect_waiting_tasks.sql
+++ b/install/37_collect_waiting_tasks.sql
@@ -146,7 +146,7 @@ BEGIN
             blocking_session_id = ISNULL(wt.blocking_session_id, 0),
             resource_description = NULL,
             database_id = NULL,
-            database_name = DB_NAME(der.database_id),
+            database_name = d.name,
             query_text = NULL,
             statement_text = NULL,
             query_plan = NULL,
@@ -162,6 +162,8 @@ BEGIN
         FROM sys.dm_os_waiting_tasks AS wt
         LEFT JOIN sys.dm_exec_requests AS der
           ON der.session_id = wt.session_id
+        LEFT JOIN sys.databases AS d
+          ON d.database_id = der.database_id
         OUTER APPLY sys.dm_exec_sql_text(der.sql_handle) AS dest
         OUTER APPLY sys.dm_exec_text_query_plan
         (
diff --git a/install/39_collect_database_configuration.sql b/install/39_collect_database_configuration.sql
index 199f155..f6a4202 100644
--- a/install/39_collect_database_configuration.sql
+++ b/install/39_collect_database_configuration.sql
@@ -161,10 +161,18 @@ BEGIN
                 database_id = d.database_id,
                 database_name = d.name
             FROM sys.databases AS d
+            LEFT JOIN sys.dm_hadr_database_replica_states AS drs
+                ON d.database_id = drs.database_id
+                AND drs.is_local = 1
             WHERE d.database_id > 4
             AND   d.name != DB_NAME()
             AND   d.state_desc = N'ONLINE'
             AND   d.database_id < 32761 /*exclude contained AG system databases*/
+            AND
+            (
+                drs.database_id IS NULL          /*not in any AG*/
+                OR drs.is_primary_replica = 1    /*primary replica*/
+            )
             ORDER BY
                 d.name
             OPTION (RECOMPILE);
diff --git a/servers.json b/servers.json
new file mode 100644
index 0000000..6dc91e0
--- /dev/null
+++ b/servers.json
@@ -0,0 +1,3 @@
+{
+  "Servers": []
+}
\ No newline at end of file
diff --git a/upgrades/2.0.0-to-2.1.0/01_collection_schedule_optional_text.sql b/upgrades/2.0.0-to-2.1.0/01_collection_schedule_optional_text.sql
new file mode 100644
index 0000000..57164df
--- /dev/null
+++ b/upgrades/2.0.0-to-2.1.0/01_collection_schedule_optional_text.sql
@@ -0,0 +1,65 @@
+/*
+Copyright 2026 Darling Data, LLC
+https://www.erikdarling.com/
+
+Upgrade from 2.0.0 to 2.1.0
+Adds collect_query and collect_plan columns to config.collection_schedule
+for optional query text and execution plan collection (#337).
+Both default to 1 (enabled) to preserve existing behavior.
+*/
+
+SET ANSI_NULLS ON;
+SET ANSI_PADDING ON;
+SET ANSI_WARNINGS ON;
+SET ARITHABORT ON;
+SET CONCAT_NULL_YIELDS_NULL ON;
+SET QUOTED_IDENTIFIER ON;
+SET NUMERIC_ROUNDABORT OFF;
+SET IMPLICIT_TRANSACTIONS OFF;
+SET STATISTICS TIME, IO OFF;
+GO
+
+USE PerformanceMonitor;
+GO
+
+/* Add collect_query column for optional query text collection */
+IF NOT EXISTS
+(
+    SELECT
+        1/0
+    FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'config.collection_schedule')
+    AND   name = N'collect_query'
+)
+BEGIN
+    ALTER TABLE
+        config.collection_schedule
+    ADD
+        collect_query bit NOT NULL
+            CONSTRAINT DF_collection_schedule_collect_query
+            DEFAULT CONVERT(bit, 'true');
+
+    PRINT 'Added collect_query to config.collection_schedule';
+END;
+GO
+
+/* Add collect_plan column for optional execution plan collection */
+IF NOT EXISTS
+(
+    SELECT
+        1/0
+    FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'config.collection_schedule')
+    AND   name = N'collect_plan'
+)
+BEGIN
+    ALTER TABLE
+        config.collection_schedule
+    ADD
+        collect_plan bit NOT NULL
+            CONSTRAINT DF_collection_schedule_collect_plan
+            DEFAULT CONVERT(bit, 'true');
+
+    PRINT 'Added collect_plan to config.collection_schedule';
+END;
+GO
diff --git a/upgrades/2.0.0-to-2.1.0/02_default_trace_events_new_columns.sql b/upgrades/2.0.0-to-2.1.0/02_default_trace_events_new_columns.sql
new file mode 100644
index 0000000..1e28811
--- /dev/null
+++ b/upgrades/2.0.0-to-2.1.0/02_default_trace_events_new_columns.sql
@@ -0,0 +1,40 @@
+/*
+Copyright 2026 Darling Data, LLC
+https://www.erikdarling.com/
+
+Add duration_us and end_time columns to collect.default_trace_events
+These columns were added in the 2.1.0 install scripts for the default trace collector
+*/
+
+USE PerformanceMonitor;
+GO
+
+IF NOT EXISTS
+(
+    SELECT
+        1/0
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = N'collect'
+    AND   TABLE_NAME = N'default_trace_events'
+    AND   COLUMN_NAME = N'duration_us'
+)
+BEGIN
+    ALTER TABLE collect.default_trace_events
+        ADD duration_us bigint NULL;
+END;
+GO
+
+IF NOT EXISTS
+(
+    SELECT
+        1/0
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = N'collect'
+    AND   TABLE_NAME = N'default_trace_events'
+    AND   COLUMN_NAME = N'end_time'
+)
+BEGIN
+    ALTER TABLE collect.default_trace_events
+        ADD end_time datetime2(7) NULL;
+END;
+GO
diff --git a/upgrades/2.0.0-to-2.1.0/upgrade.txt b/upgrades/2.0.0-to-2.1.0/upgrade.txt
new file mode 100644
index 0000000..0d1781e
--- /dev/null
+++ b/upgrades/2.0.0-to-2.1.0/upgrade.txt
@@ -0,0 +1,2 @@
+01_collection_schedule_optional_text.sql
+02_default_trace_events_new_columns.sql