diff --git a/AI_HANDOFF.md b/AI_HANDOFF.md
index bb71c35..283d5cb 100644
--- a/AI_HANDOFF.md
+++ b/AI_HANDOFF.md
@@ -1,5 +1,97 @@
 # Project State & Handoff
 
+## 2026-08-13 GitHub upload (complete)
+
+- User authorized uploading the complete current verified worktree, including the WPF redesign and installer-experience hardening. Scope is this repository only.
+- Remote audit after `fetch --prune --tags` found local `main` and `origin/main` identical with no other pre-existing branches. Initial source commit `66b6498` was pushed to `agent/ui-installer-experience`; Draft PR #10 targets `main`: https://github.com/nojackno2-ctrl/WinBat-Lens/pull/10
+- GitHub connector PR creation returned `403 Resource not accessible by integration`; the authenticated host `gh pr create` fallback succeeded. A final handoff-only commit records the completed remote state on the same PR branch.
+- This authorization does not include a GitHub Release, tag, installer execution, or installed-application update.
+
+## 2026-08-13 installer experience hardening (complete, uncommitted)
+
+- Scope is limited to `installer/WinBatLens.iss` and a new installer contract test; the concurrent uncommitted WPF redesign remains preserved and untouched.
+- Start Menu application/uninstall shortcuts are now always created with a stable AppUserModelID and `{app}` working directory. Desktop and Windows-startup choices now default unchecked, and upgrades continue to restore previous task choices.
+- Added GitHub support/update metadata, installed README registration, setup/uninstall logging, explicit uninstall identity/version fields, narrowed Restart Manager filtering from every executable to `WinBatLens.exe`, and matching README guidance for manual Start/Taskbar pinning.
+- First test compile failed only because the new standalone contract test omitted the repository's explicit `using Xunit`; the import was added before the successful rerun. No product or installer failure was observed in that attempt.
+- Verification after correction: tests passed 22/22 with no warnings; changed-file `dotnet format --verify-no-changes --no-restore` and `git diff --check` passed; .NET 10 self-contained publish, portable packaging, and Inno Setup 6.7.3 compilation succeeded. Final installer: `dist/WinBatLens_v1.1.7_Setup_x64.exe`, 80,174,427 bytes, SHA-256 `9918D06B8EB4B43B94FD635E789A80B2AFC7ED30EF47B9AFB66631BE4CB10DBC`, file version 1.1.7. The full-solution format check still reports pre-existing whitespace in unrelated files, so only the new test was used as the scoped format gate. Inno's existing, documented admin/HKCU startup warning remains expected.
+- No installer was executed, no installed application was updated, and no commit/push/release was performed.
+
+## 2026-08-13 UI redesign baseline and design audit
+
+- Scope is a preserve-mode redesign of the active WPF application. The legacy
+  Electron prototype under `src/` is not part of the shipped .NET build and is
+  not being treated as the product UI.
+- Baseline before edits: clean `main` at `6c4d5b2`, tracking `origin/main`, with
+  no uncommitted diff. `AGENTS.md`, this handoff, the latest five commits,
+  `App.xaml`, `MainWindow.xaml`, localization wiring, and the relevant code-behind
+  state transitions were reviewed.
+- Design read: dense Windows battery and hardware monitoring for laptop users,
+  with a precise, quiet, instrument-like dark UI. Native WPF remains the only UI
+  system and no dependency will be added.
+- Dials: `DESIGN_VARIANCE 4`, `MOTION_INTENSITY 2`, `VISUAL_DENSITY 8`.
+  Redesign mode is `Redesign - Preserve / targeted evolution`.
+- Preserve: all six information areas, control names and event handlers, report
+  and history data, measured-versus-unavailable telemetry boundaries, the shared
+  physical watt scale, and semantic power colours. The historical compact-layout
+  constraint remains: recover space from padding and chrome before reducing type.
+- Retire: scattered one-off colours, emoji-dependent labels, weak or missing
+  keyboard focus/disabled/pressed states, inconsistent radii and nested-card
+  contrast, and blank data surfaces with no empty-state explanation.
+- Planned design system: one cyan interaction accent; graphite neutral surfaces;
+  red/green/blue/amber reserved only for real telemetry and health semantics;
+  Segoe UI Variable/Segoe UI with tabular numerals for measurements; 10 px cards,
+  6 px controls, and pill radii only for semantic status badges.
+- No hardware/UI runtime result is claimed yet. Release build, tests, formatting,
+  `git diff --check`, XAML parsing/build validation, and safe visual QA remain to
+  be completed. No commit, push, release, deployment, or installed-app update is
+  authorized.
+
+### Implementation milestone
+
+- `App.xaml` now defines one graphite instrument-dark token system, one cyan
+  interaction accent, shared card/data-row/status shapes, and complete hover,
+  pressed, keyboard-focus, selected, and disabled states for buttons, tabs,
+  checkboxes, list rows, headers, and progress bars.
+- `MainWindow.xaml` keeps the existing 1200x780 compact architecture and six
+  information areas, but replaces scattered one-off surfaces with the shared
+  system, gives the primary measured-power card slightly more weight, uses
+  tabular numerals on live measurements and axes, and adds contextual empty
+  states plus a focused report-loading surface.
+- Emoji-dependent product labels were removed from the window and bilingual
+  localization. Runtime dGPU/tip text follows the same rule. Visible range text
+  now uses regular hyphens instead of typographic dash separators.
+- New bilingual strings cover hardware-source labels, empty states, and loading
+  states. Existing names, handlers, bindings, report content, history data, and
+  measured/unavailable telemetry decisions remain intact.
+- Validation has started; no build, test, render, or live hardware result is
+  claimed at this milestone.
+
+### Final validation
+
+- The first Release solution build with the repository's normal self-contained
+  settings and `--no-restore` failed before compilation with `NETSDK1112` because
+  this local restore state lacks the .NET 10 `win-x64` runtime packs. No product
+  or XAML error was reported. To validate source without downloading anything,
+  the build was rerun with `SelfContained=false` and an empty
+  `RuntimeIdentifier`; it passed with 0 warnings and 0 errors.
+- Release tests passed 20/20. Changed-file `dotnet format
+  --verify-no-changes` passed for `MainWindow.xaml.cs` and
+  `Services/LocalizationService.cs` after applying its whitespace fixes.
+- Both XAML files parse as XML, WPF XAML compilation passed as part of the
+  Release build, `git diff --check` passed, and scans found no emoji in the
+  redesigned window/runtime/localization labels and no em/en dash in visible
+  C# strings.
+- No live UI screenshot or hardware smoke test was performed. An installed
+  monitor may already own the single-instance mutex, so launching this build
+  could foreground the old installed UI and produce false evidence or disturb
+  ongoing monitoring. Visual QA is therefore limited to source audit plus
+  successful WPF compilation; live layout, focus appearance, and min-size
+  behaviour remain unverified.
+- Final working tree intentionally contains only `App.xaml`,
+  `MainWindow.xaml`, `MainWindow.xaml.cs`, `Services/LocalizationService.cs`,
+  and this handoff. No commit, push, release, deployment, or installed-app
+  update was performed.
+
 ## 2026-08-12 v1.1.7 publication and installed update
 
 - Published GitHub Release `v1.1.7` from `66e4f3f147fad925841a09528f8a73f9cd2d0cf6`; branch CI and tag Release succeeded. Downloaded server digests: portable EXE `352B0A73...BC9497`, ZIP `3FB557F0...82D17`, Setup `1CD18AEC...B16AA`.
@@ -1338,3 +1430,11 @@ Verified on a live AMD iGPU + NVIDIA RTX 3060 dGPU laptop.
 - **No automated tests.** Every verification in this file is a manual measurement;
   the parser (`BatteryReportParser`) in particular is regex-heavy and would
   benefit from unit tests over the two saved sample reports.
+
+## 2026-08-13 installed software update verification
+
+- Silently updated the current-user installation with `dist\WinBatLens_v1.1.7_Setup_x64.exe`; the elevated installer returned exit code `0` and did not request a reboot.
+- Installed executable: `%LOCALAPPDATA%\Programs\WinBat Lens\WinBatLens.exe`; FileVersion `1.1.7.0`, ProductVersion `1.1.7+6c4d5b22e196ca3f17333d35f141184bbab706a9`, SHA-256 `D1477D4783758F820A6535E793B3E9F8890B3CA544C9A57F826DCBFC9772F4E7`. It is byte-for-byte identical to the current publish output.
+- Verified the registered version, install location, uninstall command, project/issues/update URLs, and the Start Menu launch/uninstall shortcuts. Removed the stale duplicate English uninstall shortcut; the current localized uninstall shortcut remains valid.
+- Launched the installed build with `--background`; PID `2196` reported `Responding=True`. This verifies launch and process responsiveness, not every hardware reading or UI state.
+- The user's authorization in this milestone covers updating installed software; this handoff entry is not yet committed or pushed.
diff --git a/App.xaml b/App.xaml
index 8193933..87e2a56 100644
--- a/App.xaml
+++ b/App.xaml
@@ -5,63 +5,126 @@
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
-            <!-- Grades a health percentage into its colour; "Badge" returns the
-                 translucent fill for the pill behind it. -->
             <local:HealthGradeBrushConverter x:Key="HealthGradeBrush"/>
-            <!-- Theme Colors -->
-            <SolidColorBrush x:Key="BgDark" Color="#090D16"/>
-            <SolidColorBrush x:Key="BgCard" Color="#121A2C"/>
-            <SolidColorBrush x:Key="BgCardHover" Color="#1C2740"/>
-            <SolidColorBrush x:Key="BorderColor" Color="#20FFFFFF"/>
-            
-            <SolidColorBrush x:Key="AccentCyan" Color="#38BDF8"/>
-            <SolidColorBrush x:Key="AccentBlue" Color="#6366F1"/>
-            <SolidColorBrush x:Key="AccentPurple" Color="#A855F7"/>
-            <SolidColorBrush x:Key="AccentEmerald" Color="#10B981"/>
-            <SolidColorBrush x:Key="AccentAmber" Color="#F59E0B"/>
-            <SolidColorBrush x:Key="AccentRose" Color="#F43F5E"/>
-
-            <!-- Semantic power colours: one colour per meaning, used by the
-                 headline cards, the waveform, the hardware rows and the tray
-                 icon alike, so the same idea never changes colour between them.
-                   red   = the machine is spending power (discharging, heavy load)
-                   green = the machine is gaining or saving power (charging, idle)
-                   blue  = the discrete GPU series
-                   amber = battery figures that are neither (stored energy, runtime) -->
-            <SolidColorBrush x:Key="PowerDischarge" Color="#F43F5E"/>
-            <SolidColorBrush x:Key="PowerCharge" Color="#10B981"/>
-            <SolidColorBrush x:Key="PowerGpu" Color="#3B82F6"/>
-            <SolidColorBrush x:Key="PowerNeutral" Color="#F59E0B"/>
-
-            <!-- Health grades, on the same 80% / 60% cuts BatteryReportParser
-                 uses for the status label, so colour and wording always agree. -->
-            <SolidColorBrush x:Key="HealthGood" Color="#10B981"/>
-            <SolidColorBrush x:Key="HealthWarn" Color="#F59E0B"/>
-            <SolidColorBrush x:Key="HealthDanger" Color="#F43F5E"/>
-
-            <SolidColorBrush x:Key="TextMain" Color="#F8FAFC"/>
-            <SolidColorBrush x:Key="TextMuted" Color="#94A3B8"/>
-            <SolidColorBrush x:Key="TextDim" Color="#64748B"/>
-
-            <!-- Rounded Primary Button Style -->
+
+            <!-- Instrument-dark design tokens. Cyan is the only interaction
+                 accent. Power and health colours below are semantic data, not
+                 decorative accents, and retain their established meanings. -->
+            <SolidColorBrush x:Key="BgDark" Color="#0A0E13"/>
+            <SolidColorBrush x:Key="BgCard" Color="#111820"/>
+            <SolidColorBrush x:Key="BgCardHover" Color="#1A2530"/>
+            <SolidColorBrush x:Key="BgRaised" Color="#17212B"/>
+            <SolidColorBrush x:Key="BgInset" Color="#0D131A"/>
+            <SolidColorBrush x:Key="BgControl" Color="#18232D"/>
+            <SolidColorBrush x:Key="BorderColor" Color="#2B3946"/>
+            <SolidColorBrush x:Key="BorderStrong" Color="#425362"/>
+
+            <SolidColorBrush x:Key="AccentCyan" Color="#55C2E8"/>
+            <SolidColorBrush x:Key="AccentTint" Color="#1E55C2E8"/>
+            <SolidColorBrush x:Key="AccentTintStrong" Color="#3055C2E8"/>
+
+            <SolidColorBrush x:Key="PowerDischarge" Color="#FB7185"/>
+            <SolidColorBrush x:Key="PowerCharge" Color="#34D399"/>
+            <SolidColorBrush x:Key="PowerGpu" Color="#60A5FA"/>
+            <SolidColorBrush x:Key="PowerNeutral" Color="#FBBF24"/>
+
+            <SolidColorBrush x:Key="HealthGood" Color="#34D399"/>
+            <SolidColorBrush x:Key="HealthWarn" Color="#FBBF24"/>
+            <SolidColorBrush x:Key="HealthDanger" Color="#FB7185"/>
+
+            <SolidColorBrush x:Key="TextMain" Color="#F3F6F8"/>
+            <SolidColorBrush x:Key="TextMuted" Color="#A9B6C1"/>
+            <SolidColorBrush x:Key="TextDim" Color="#82919E"/>
+
+            <Style x:Key="KeyboardFocusStyle">
+                <Setter Property="Control.Template">
+                    <Setter.Value>
+                        <ControlTemplate>
+                            <Border BorderBrush="{StaticResource AccentCyan}"
+                                    BorderThickness="2"
+                                    CornerRadius="7"
+                                    Margin="-3"/>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+            <Style x:Key="PanelCardStyle" TargetType="Border">
+                <Setter Property="Background" Value="{StaticResource BgCard}"/>
+                <Setter Property="BorderBrush" Value="{StaticResource BorderColor}"/>
+                <Setter Property="BorderThickness" Value="1"/>
+                <Setter Property="CornerRadius" Value="10"/>
+                <Setter Property="SnapsToDevicePixels" Value="True"/>
+            </Style>
+
+            <Style x:Key="MetricCardStyle" TargetType="Border">
+                <Setter Property="Background" Value="{StaticResource BgRaised}"/>
+                <Setter Property="BorderBrush" Value="{StaticResource BorderColor}"/>
+                <Setter Property="BorderThickness" Value="1"/>
+                <Setter Property="CornerRadius" Value="10"/>
+                <Setter Property="Padding" Value="12,10"/>
+                <Setter Property="SnapsToDevicePixels" Value="True"/>
+            </Style>
+
+            <Style x:Key="DataRowStyle" TargetType="Border">
+                <Setter Property="Background" Value="{StaticResource BgInset}"/>
+                <Setter Property="BorderBrush" Value="{StaticResource BorderColor}"/>
+                <Setter Property="BorderThickness" Value="1"/>
+                <Setter Property="CornerRadius" Value="6"/>
+                <Setter Property="Padding" Value="10,7"/>
+                <Setter Property="SnapsToDevicePixels" Value="True"/>
+            </Style>
+
+            <Style x:Key="DataSurfaceStyle" TargetType="Border">
+                <Setter Property="Background" Value="{StaticResource BgInset}"/>
+                <Setter Property="BorderBrush" Value="{StaticResource BorderColor}"/>
+                <Setter Property="BorderThickness" Value="1"/>
+                <Setter Property="CornerRadius" Value="6"/>
+                <Setter Property="SnapsToDevicePixels" Value="True"/>
+            </Style>
+
+            <Style x:Key="StatusPillStyle" TargetType="Border">
+                <Setter Property="CornerRadius" Value="999"/>
+                <Setter Property="BorderThickness" Value="1"/>
+                <Setter Property="Padding" Value="9,3"/>
+            </Style>
+
             <Style x:Key="PrimaryButtonStyle" TargetType="Button">
-                <Setter Property="Background" Value="#38BDF8"/>
-                <Setter Property="Foreground" Value="#090D16"/>
+                <Setter Property="Background" Value="{StaticResource AccentCyan}"/>
+                <Setter Property="BorderBrush" Value="{StaticResource AccentCyan}"/>
+                <Setter Property="BorderThickness" Value="1"/>
+                <Setter Property="Foreground" Value="#081117"/>
                 <Setter Property="FontSize" Value="12"/>
-                <Setter Property="FontWeight" Value="Bold"/>
-                <Setter Property="Padding" Value="11,5"/>
+                <Setter Property="FontWeight" Value="SemiBold"/>
+                <Setter Property="MinHeight" Value="32"/>
+                <Setter Property="Padding" Value="12,5"/>
                 <Setter Property="Cursor" Value="Hand"/>
+                <Setter Property="FocusVisualStyle" Value="{StaticResource KeyboardFocusStyle}"/>
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="Button">
-                            <Border Background="{TemplateBinding Background}"
+                            <Border x:Name="ButtonChrome"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
                                     CornerRadius="6"
-                                    Padding="{TemplateBinding Padding}">
-                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    Padding="{TemplateBinding Padding}"
+                                    SnapsToDevicePixels="True">
+                                <ContentPresenter HorizontalAlignment="Center"
+                                                  VerticalAlignment="Center"
+                                                  RecognizesAccessKey="True"/>
                             </Border>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Background" Value="#60A5FA"/>
+                                    <Setter TargetName="ButtonChrome" Property="Background" Value="#78D2EF"/>
+                                    <Setter TargetName="ButtonChrome" Property="BorderBrush" Value="#A6E2F4"/>
+                                </Trigger>
+                                <Trigger Property="IsPressed" Value="True">
+                                    <Setter TargetName="ButtonChrome" Property="Background" Value="#3EA9CF"/>
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter TargetName="ButtonChrome" Property="Opacity" Value="0.45"/>
+                                    <Setter Property="Cursor" Value="Arrow"/>
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -69,26 +132,82 @@
                 </Setter>
             </Style>
 
-            <!-- Secondary Button Style -->
-            <Style x:Key="SecondaryButtonStyle" TargetType="Button">
-                <Setter Property="Background" Value="#1E293B"/>
-                <Setter Property="Foreground" Value="#F8FAFC"/>
-                <Setter Property="FontSize" Value="12"/>
+            <Style x:Key="SecondaryButtonStyle" TargetType="Button" BasedOn="{StaticResource PrimaryButtonStyle}">
+                <Setter Property="Background" Value="{StaticResource BgControl}"/>
+                <Setter Property="BorderBrush" Value="{StaticResource BorderStrong}"/>
+                <Setter Property="Foreground" Value="{StaticResource TextMain}"/>
                 <Setter Property="FontWeight" Value="SemiBold"/>
-                <Setter Property="Padding" Value="11,5"/>
-                <Setter Property="Cursor" Value="Hand"/>
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="Button">
-                            <Border Background="{TemplateBinding Background}"
-                                    BorderBrush="#334155" BorderThickness="1"
+                            <Border x:Name="ButtonChrome"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
                                     CornerRadius="6"
-                                    Padding="{TemplateBinding Padding}">
-                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    Padding="{TemplateBinding Padding}"
+                                    SnapsToDevicePixels="True">
+                                <ContentPresenter HorizontalAlignment="Center"
+                                                  VerticalAlignment="Center"
+                                                  RecognizesAccessKey="True"/>
                             </Border>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Background" Value="#334155"/>
+                                    <Setter TargetName="ButtonChrome" Property="Background" Value="{StaticResource BgCardHover}"/>
+                                    <Setter TargetName="ButtonChrome" Property="BorderBrush" Value="{StaticResource AccentCyan}"/>
+                                </Trigger>
+                                <Trigger Property="IsPressed" Value="True">
+                                    <Setter TargetName="ButtonChrome" Property="Background" Value="{StaticResource BgInset}"/>
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter TargetName="ButtonChrome" Property="Opacity" Value="0.45"/>
+                                    <Setter Property="Cursor" Value="Arrow"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+            <Style TargetType="CheckBox">
+                <Setter Property="Foreground" Value="{StaticResource TextMain}"/>
+                <Setter Property="FontSize" Value="12"/>
+                <Setter Property="FontWeight" Value="SemiBold"/>
+                <Setter Property="Cursor" Value="Hand"/>
+                <Setter Property="FocusVisualStyle" Value="{StaticResource KeyboardFocusStyle}"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="CheckBox">
+                            <Grid Background="Transparent">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <Border x:Name="CheckBoxChrome" Width="18" Height="18"
+                                        Background="{StaticResource BgInset}"
+                                        BorderBrush="{StaticResource BorderStrong}"
+                                        BorderThickness="1" CornerRadius="4"
+                                        VerticalAlignment="Center">
+                                    <TextBlock x:Name="CheckGlyph" Text="✓" Visibility="Collapsed"
+                                               Foreground="#081117" FontSize="13" FontWeight="Bold"
+                                               HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                </Border>
+                                <ContentPresenter Grid.Column="1" Margin="7,0,0,0"
+                                                  VerticalAlignment="Center"
+                                                  RecognizesAccessKey="True"/>
+                            </Grid>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter TargetName="CheckBoxChrome" Property="BorderBrush" Value="{StaticResource AccentCyan}"/>
+                                </Trigger>
+                                <Trigger Property="IsChecked" Value="True">
+                                    <Setter TargetName="CheckBoxChrome" Property="Background" Value="{StaticResource AccentCyan}"/>
+                                    <Setter TargetName="CheckBoxChrome" Property="BorderBrush" Value="{StaticResource AccentCyan}"/>
+                                    <Setter TargetName="CheckGlyph" Property="Visibility" Value="Visible"/>
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter Property="Opacity" Value="0.45"/>
+                                    <Setter Property="Cursor" Value="Arrow"/>
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -96,67 +215,63 @@
                 </Setter>
             </Style>
 
-            <!-- Global High-Contrast TabItem Style -->
             <Style TargetType="TabItem">
-                <Setter Property="Foreground" Value="#94A3B8"/>
-                <Setter Property="FontSize" Value="12"/>
+                <Setter Property="Foreground" Value="{StaticResource TextMuted}"/>
+                <Setter Property="FontSize" Value="11"/>
                 <Setter Property="FontWeight" Value="SemiBold"/>
-                <Setter Property="Padding" Value="10,6"/>
-                <Setter Property="Margin" Value="0,0,5,0"/>
+                <Setter Property="Padding" Value="10,8"/>
+                <Setter Property="Margin" Value="0,0,2,0"/>
                 <Setter Property="Cursor" Value="Hand"/>
+                <Setter Property="FocusVisualStyle" Value="{StaticResource KeyboardFocusStyle}"/>
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="TabItem">
-                            <Border x:Name="Border" 
-                                    Background="#1A2438" 
-                                    BorderBrush="#334155" 
-                                    BorderThickness="1" 
-                                    CornerRadius="8,8,0,0" 
-                                    Padding="{TemplateBinding Padding}" 
+                            <Border x:Name="TabChrome"
+                                    Background="Transparent"
+                                    BorderBrush="Transparent"
+                                    BorderThickness="0,0,0,2"
+                                    CornerRadius="6,6,0,0"
+                                    Padding="{TemplateBinding Padding}"
                                     Margin="{TemplateBinding Margin}">
-                                <ContentPresenter x:Name="ContentSite"
-                                                  VerticalAlignment="Center"
+                                <ContentPresenter VerticalAlignment="Center"
                                                   HorizontalAlignment="Center"
                                                   ContentSource="Header"
                                                   RecognizesAccessKey="True"/>
                             </Border>
                             <ControlTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Setter TargetName="TabChrome" Property="Background" Value="{StaticResource BgCardHover}"/>
+                                    <Setter Property="Foreground" Value="{StaticResource TextMain}"/>
+                                </Trigger>
                                 <Trigger Property="IsSelected" Value="True">
-                                    <Setter TargetName="Border" Property="Background" Value="#38BDF8"/>
-                                    <Setter TargetName="Border" Property="BorderBrush" Value="#38BDF8"/>
-                                    <Setter Property="Foreground" Value="#090D16"/>
-                                    <Setter Property="FontWeight" Value="Bold"/>
+                                    <Setter TargetName="TabChrome" Property="Background" Value="{StaticResource AccentTint}"/>
+                                    <Setter TargetName="TabChrome" Property="BorderBrush" Value="{StaticResource AccentCyan}"/>
+                                    <Setter Property="Foreground" Value="{StaticResource TextMain}"/>
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter Property="Opacity" Value="0.45"/>
                                 </Trigger>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="IsSelected" Value="False"/>
-                                        <Condition Property="IsMouseOver" Value="True"/>
-                                    </MultiTrigger.Conditions>
-                                    <Setter TargetName="Border" Property="Background" Value="#2D3B55"/>
-                                    <Setter Property="Foreground" Value="#F8FAFC"/>
-                                </MultiTrigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
                     </Setter.Value>
                 </Setter>
             </Style>
 
-            <!-- Global High-Contrast ListView Header & Item Style -->
             <Style TargetType="GridViewColumnHeader">
-                <Setter Property="Background" Value="#1E293B"/>
-                <Setter Property="Foreground" Value="#38BDF8"/>
-                <Setter Property="FontWeight" Value="Bold"/>
-                <Setter Property="FontSize" Value="12"/>
-                <Setter Property="Padding" Value="8,5"/>
+                <Setter Property="Background" Value="{StaticResource BgControl}"/>
+                <Setter Property="Foreground" Value="{StaticResource TextMuted}"/>
+                <Setter Property="FontWeight" Value="SemiBold"/>
+                <Setter Property="FontSize" Value="11"/>
+                <Setter Property="Padding" Value="9,7"/>
                 <Setter Property="HorizontalContentAlignment" Value="Left"/>
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="GridViewColumnHeader">
-                            <Border Background="{TemplateBinding Background}" 
-                                    BorderBrush="#334155" 
-                                    BorderThickness="0,0,1,1" 
+                            <Border Background="{TemplateBinding Background}"
+                                    BorderBrush="{StaticResource BorderColor}"
+                                    BorderThickness="0,0,1,1"
                                     Padding="{TemplateBinding Padding}">
-                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                                   VerticalAlignment="Center"/>
                             </Border>
                         </ControlTemplate>
@@ -165,26 +280,32 @@
             </Style>
 
             <Style TargetType="ListViewItem">
-                <Setter Property="Foreground" Value="#F8FAFC"/>
+                <Setter Property="Foreground" Value="{StaticResource TextMain}"/>
                 <Setter Property="FontSize" Value="12"/>
-                <Setter Property="Padding" Value="6,4"/>
+                <Setter Property="Padding" Value="8,6"/>
                 <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                <Setter Property="FocusVisualStyle" Value="{StaticResource KeyboardFocusStyle}"/>
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="ListViewItem">
-                            <Border x:Name="Bd" 
-                                    Background="{TemplateBinding Background}" 
-                                    BorderBrush="#10FFFFFF" 
-                                    BorderThickness="0,0,0,1" 
+                            <Border x:Name="RowChrome"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{StaticResource BorderColor}"
+                                    BorderThickness="0,0,0,1"
                                     Padding="{TemplateBinding Padding}">
                                 <GridViewRowPresenter Columns="{TemplateBinding GridView.ColumnCollection}"/>
                             </Border>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter TargetName="Bd" Property="Background" Value="#15FFFFFF"/>
+                                    <Setter TargetName="RowChrome" Property="Background" Value="{StaticResource BgCardHover}"/>
                                 </Trigger>
                                 <Trigger Property="IsSelected" Value="True">
-                                    <Setter TargetName="Bd" Property="Background" Value="#2038BDF8"/>
+                                    <Setter TargetName="RowChrome" Property="Background" Value="{StaticResource AccentTintStrong}"/>
+                                    <Setter TargetName="RowChrome" Property="BorderBrush" Value="{StaticResource AccentCyan}"/>
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter Property="Opacity" Value="0.45"/>
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -192,6 +313,29 @@
                 </Setter>
             </Style>
 
+            <Style TargetType="ProgressBar">
+                <Setter Property="Height" Value="8"/>
+                <Setter Property="Background" Value="{StaticResource BgDark}"/>
+                <Setter Property="BorderBrush" Value="{StaticResource BorderColor}"/>
+                <Setter Property="BorderThickness" Value="1"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="ProgressBar">
+                            <Border Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="4" ClipToBounds="True">
+                                <Grid x:Name="PART_Track">
+                                    <Border x:Name="PART_Indicator"
+                                            Background="{TemplateBinding Foreground}"
+                                            CornerRadius="3"
+                                            HorizontalAlignment="Left"/>
+                                </Grid>
+                            </Border>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 0ceda8d..cb75bc2 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -6,18 +6,22 @@
         WindowStartupLocation="CenterScreen"
         Background="{StaticResource BgDark}"
         Foreground="{StaticResource TextMain}"
+        FontFamily="Segoe UI Variable Text, Segoe UI"
+        FontSize="12"
+        UseLayoutRounding="True"
+        SnapsToDevicePixels="True"
+        TextOptions.TextFormattingMode="Display"
         Icon="pack://application:,,,/app_icon.png">
 
-    <Grid Margin="10">
+    <Grid Margin="12">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
         <!-- Top Header Bar -->
-        <Border Grid.Row="0" Background="{StaticResource BgCard}" 
-                BorderBrush="{StaticResource BorderColor}" BorderThickness="1"
-                CornerRadius="10" Padding="12,8" Margin="0,0,0,10">
+        <Border Grid.Row="0" Style="{StaticResource PanelCardStyle}"
+                Padding="13,9" Margin="0,0,0,10">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
@@ -26,8 +30,11 @@
                 </Grid.ColumnDefinitions>
 
                 <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
-                    <Border Width="30" Height="30" CornerRadius="8" Background="Transparent" Margin="0,0,9,0">
-                        <Image Source="pack://application:,,,/app_icon.png" Width="28" Height="28"/>
+                    <Border Width="34" Height="34" CornerRadius="6"
+                            Background="{StaticResource BgInset}"
+                            BorderBrush="{StaticResource BorderColor}"
+                            BorderThickness="1" Margin="0,0,10,0">
+                        <Image Source="pack://application:,,,/app_icon.png" Width="26" Height="26"/>
                     </Border>
                     <StackPanel VerticalAlignment="Center">
                         <StackPanel Orientation="Horizontal">
@@ -35,9 +42,10 @@
                             <!-- Version badge. The text is filled in from the
                                  assembly at startup; the value here is only so
                                  the designer shows the right width. -->
-                            <Border x:Name="BadgeAppVersion" CornerRadius="6" Background="#14FFFFFF"
-                                    BorderBrush="{StaticResource BorderColor}" BorderThickness="1"
-                                    Padding="6,1" Margin="8,0,0,0" VerticalAlignment="Center">
+                            <Border x:Name="BadgeAppVersion" Style="{StaticResource StatusPillStyle}"
+                                    Background="{StaticResource BgControl}"
+                                    BorderBrush="{StaticResource BorderColor}"
+                                    Padding="7,1" Margin="8,0,0,0" VerticalAlignment="Center">
                                 <TextBlock x:Name="TxtAppVersion" Text="v1.1.2" FontSize="11" FontWeight="SemiBold" Foreground="{StaticResource TextMuted}"/>
                             </Border>
                         </StackPanel>
@@ -47,14 +55,14 @@
 
                 <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center">
                     <!-- Language Switcher Button -->
-                    <Button x:Name="BtnLanguageToggle" Content="🌐 English" Style="{StaticResource SecondaryButtonStyle}" Margin="0,0,8,0" Padding="9,4" Click="BtnLanguageToggle_Click"/>
+                    <Button x:Name="BtnLanguageToggle" Content="English" Style="{StaticResource SecondaryButtonStyle}" Margin="0,0,8,0" Padding="10,4" Click="BtnLanguageToggle_Click"/>
 
                     <!-- Auto Startup Toggle CheckBox -->
-                    <CheckBox x:Name="ChkAutoStart" Content="🚀 開機自動啟動" Foreground="{StaticResource TextMain}" FontSize="12" FontWeight="SemiBold" VerticalAlignment="Center" Margin="0,0,10,0" Cursor="Hand" Click="ChkAutoStart_Click"/>
+                    <CheckBox x:Name="ChkAutoStart" Content="開機自動啟動" VerticalAlignment="Center" Margin="0,0,12,0" Click="ChkAutoStart_Click"/>
 
-                    <Button x:Name="BtnOpenReport" Content="📁 開啟 HTML 報告" Style="{StaticResource SecondaryButtonStyle}" Margin="0,0,6,0" Click="BtnOpenReport_Click"/>
-                    <Button x:Name="BtnGenerateReport" Content="⚡ 執行電池檢測" Style="{StaticResource PrimaryButtonStyle}" Margin="0,0,6,0" Click="BtnGenerateReport_Click"/>
-                    <Button x:Name="BtnExportData" Content="📥 匯出 JSON" Style="{StaticResource SecondaryButtonStyle}" Click="BtnExportData_Click"/>
+                    <Button x:Name="BtnOpenReport" Content="開啟 HTML 報告" Style="{StaticResource SecondaryButtonStyle}" Margin="0,0,6,0" Click="BtnOpenReport_Click"/>
+                    <Button x:Name="BtnGenerateReport" Content="執行電池檢測" Style="{StaticResource PrimaryButtonStyle}" Margin="0,0,6,0" Click="BtnGenerateReport_Click"/>
+                    <Button x:Name="BtnExportData" Content="匯出 JSON" Style="{StaticResource SecondaryButtonStyle}" Click="BtnExportData_Click"/>
                 </StackPanel>
             </Grid>
         </Border>
@@ -77,8 +85,8 @@
                 </Grid.RowDefinitions>
 
                 <!-- Health Gauge Card -->
-                <Border Grid.Row="0" Background="{StaticResource BgCard}" BorderBrush="{StaticResource BorderColor}"
-                        BorderThickness="1" CornerRadius="10" Padding="12,9" Margin="0,0,0,9">
+                <Border Grid.Row="0" Style="{StaticResource PanelCardStyle}"
+                        Padding="13,10" Margin="0,0,0,9">
                     <StackPanel HorizontalAlignment="Center">
                         <TextBlock x:Name="TxtHealthCardTitle" Text="電池健康度 (Health Score)" FontSize="11" Foreground="{StaticResource TextMuted}" HorizontalAlignment="Center"/>
 
@@ -88,7 +96,7 @@
                              the status wording uses. The arc is rotated so it
                              starts at twelve o'clock instead of three. -->
                         <Grid Margin="0,6">
-                            <Ellipse Width="84" Height="84" Stroke="#1E293B" StrokeThickness="8"/>
+                            <Ellipse Width="84" Height="84" Stroke="{StaticResource BgControl}" StrokeThickness="8"/>
                             <Ellipse x:Name="RingHealthProgress" Width="84" Height="84" Stroke="{StaticResource HealthGood}" StrokeThickness="8" StrokeDashArray="0,1000" RenderTransformOrigin="0.5,0.5">
                                 <Ellipse.RenderTransform>
                                     <RotateTransform Angle="-90"/>
@@ -103,7 +111,7 @@
                         </Grid>
 
                         <!-- Status Badge -->
-                        <Border x:Name="BadgeStatus" CornerRadius="10" Background="#2010B981" BorderBrush="{StaticResource HealthGood}" BorderThickness="1" Padding="9,2" HorizontalAlignment="Center">
+                        <Border x:Name="BadgeStatus" Style="{StaticResource StatusPillStyle}" Background="#2034D399" BorderBrush="{StaticResource HealthGood}" HorizontalAlignment="Center">
                             <TextBlock x:Name="TxtStatusLabel" Text="--" FontWeight="Bold" FontSize="11" Foreground="{StaticResource HealthGood}"/>
                         </Border>
 
@@ -113,10 +121,10 @@
                 </Border>
 
                 <!-- Battery Specs Card -->
-                <Border Grid.Row="1" Background="{StaticResource BgCard}" BorderBrush="{StaticResource BorderColor}"
-                        BorderThickness="1" CornerRadius="10" Padding="12,9" Margin="0,0,0,9">
+                <Border Grid.Row="1" Style="{StaticResource PanelCardStyle}"
+                        Padding="13,10" Margin="0,0,0,9">
                     <StackPanel>
-                        <TextBlock x:Name="TxtBatterySpecsTitle" Text="🔋 電池規格參數" FontSize="13" FontWeight="Bold" Foreground="{StaticResource TextMain}" Margin="0,0,0,7"/>
+                        <TextBlock x:Name="TxtBatterySpecsTitle" Text="電池規格參數" FontSize="13" FontWeight="SemiBold" Foreground="{StaticResource TextMain}" Margin="0,0,0,8"/>
                             
                         <Grid Margin="0,1">
                             <TextBlock x:Name="LblSpecName" Text="電池名稱" Foreground="{StaticResource TextMuted}" FontSize="12"/>
@@ -160,7 +168,7 @@
 
                         <Grid Margin="0,1">
                             <TextBlock x:Name="LblSpecLoss" Text="容量損耗" Foreground="{StaticResource TextMuted}" FontSize="12"/>
-                            <TextBlock x:Name="TxtSpecLoss" Text="-- mWh" Foreground="{StaticResource AccentRose}" FontWeight="SemiBold" FontSize="12" HorizontalAlignment="Right"/>
+                            <TextBlock x:Name="TxtSpecLoss" Text="-- mWh" Foreground="{StaticResource PowerDischarge}" FontWeight="SemiBold" FontSize="12" HorizontalAlignment="Right" Typography.NumeralAlignment="Tabular"/>
                         </Grid>
                         <Separator Background="#10FFFFFF" Margin="0,2"/>
 
@@ -173,8 +181,8 @@
 
                 <!-- Capacity Degradation History Card: fills the leftover sidebar
                      height so its bottom edge matches the right panel exactly. -->
-                <Border Grid.Row="2" Background="{StaticResource BgCard}" BorderBrush="{StaticResource BorderColor}"
-                        BorderThickness="1" CornerRadius="10" Padding="11,9" Margin="0">
+                <Border Grid.Row="2" Style="{StaticResource PanelCardStyle}"
+                        Padding="12,10" Margin="0">
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
@@ -182,14 +190,14 @@
                             <RowDefinition Height="*"/>
                         </Grid.RowDefinitions>
                         <Grid Grid.Row="0" Margin="0,0,0,7">
-                            <TextBlock x:Name="TxtCapacityHistoryTitle" Text="📈 容量歷史紀錄" FontSize="13" FontWeight="Bold" Foreground="{StaticResource TextMain}"/>
+                            <TextBlock x:Name="TxtCapacityHistoryTitle" Text="容量歷史紀錄" FontSize="13" FontWeight="SemiBold" Foreground="{StaticResource TextMain}"/>
                             <TextBlock x:Name="TxtReportTime" Text="尚未載入" FontSize="11" Foreground="{StaticResource TextMuted}" HorizontalAlignment="Right" VerticalAlignment="Center"/>
                         </Grid>
 
                         <!-- Table Header Row. The right margin matches the data
                              list's always-visible scrollbar so both grids use the
                              same usable width and the columns line up exactly. -->
-                        <Border Grid.Row="1" Background="#101B2E" CornerRadius="6" Padding="8,4" Margin="0,0,17,4">
+                        <Border Grid.Row="1" Background="{StaticResource BgControl}" CornerRadius="6" Padding="8,5" Margin="0,0,17,4">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="150"/>
@@ -209,7 +217,7 @@
                             <ItemsControl x:Name="LvCapacityHistory">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate>
-                                        <Border Background="#0C1322" BorderBrush="#182338" BorderThickness="1" CornerRadius="6" Padding="7,4" Margin="0,0,0,3">
+                                        <Border Style="{StaticResource DataRowStyle}" Padding="7,5" Margin="0,0,0,3">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="150"/>
@@ -218,12 +226,12 @@
                                                     <ColumnDefinition Width="*"/>
                                                 </Grid.ColumnDefinitions>
                                                 <TextBlock Text="{Binding Period}" FontSize="11" Foreground="{StaticResource TextMain}" VerticalAlignment="Center" Grid.Column="0" TextTrimming="CharacterEllipsis"/>
-                                                <TextBlock Text="{Binding FullChargeCapacity}" FontSize="11" FontWeight="SemiBold" Foreground="{StaticResource AccentCyan}" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Column="1" Margin="0,0,5,0"/>
+                                                <TextBlock Text="{Binding FullChargeCapacity}" FontSize="11" FontWeight="SemiBold" Foreground="{StaticResource AccentCyan}" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Column="1" Margin="0,0,5,0" Typography.NumeralAlignment="Tabular"/>
                                                 <TextBlock Text="{Binding DesignCapacity}" FontSize="11" Foreground="{StaticResource TextMuted}" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Column="2" Margin="0,0,8,0"/>
                                                 <!-- Each row is graded on its own percentage, so a period
                                                      where the pack dropped below a grade boundary stands
                                                      out from the rows around it. -->
-                                                <Border Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Center" CornerRadius="8" Padding="5,1"
+                                                <Border Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Center" CornerRadius="999" Padding="6,1"
                                                         Background="{Binding HealthPercent, Converter={StaticResource HealthGradeBrush}, ConverterParameter=Badge}"
                                                         BorderBrush="{Binding HealthPercent, Converter={StaticResource HealthGradeBrush}}" BorderThickness="1">
                                                     <StackPanel Orientation="Horizontal">
@@ -246,31 +254,30 @@
             </Grid>
 
             <!-- RIGHT PANEL: Full-Height Real-Time Monitoring Dashboard -->
-            <Border Grid.Column="1" Background="{StaticResource BgCard}" BorderBrush="{StaticResource BorderColor}"
-                    BorderThickness="1" CornerRadius="10" Padding="12">
+            <Border Grid.Column="1" Style="{StaticResource PanelCardStyle}" Padding="12">
                 <TabControl x:Name="TabMainControl" Background="Transparent" BorderThickness="0" Foreground="{StaticResource TextMain}">
                     
                     <!-- TAB 1: Full System Real-Time Power Monitor -->
-                    <TabItem x:Name="TabRealTime" Header=" ⚡ 全系統硬體功耗分佈 ">
+                    <TabItem x:Name="TabRealTime" Header=" 全系統硬體功耗分佈 ">
                         <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="0,8,0,0">
                             <StackPanel>
                                 <!-- Power Discharge & Time Cards -->
                                 <Grid Margin="0,0,0,9">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="1.2*"/>
+                                        <ColumnDefinition Width="0.9*"/>
+                                        <ColumnDefinition Width="0.9*"/>
                                     </Grid.ColumnDefinitions>
 
                                     <!-- Live Discharge Rate Card -->
-                                    <Border Grid.Column="0" Background="#182338" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" CornerRadius="8" Padding="11,9" Margin="0,0,5,0">
+                                    <Border Grid.Column="0" Style="{StaticResource MetricCardStyle}" Margin="0,0,5,0">
                                         <StackPanel>
-                                            <TextBlock x:Name="TxtCardTotalPower" Text="⚡ 電池總放電 / AC 變壓器總供電功率" FontSize="12" Foreground="{StaticResource TextMuted}" TextTrimming="CharacterEllipsis"/>
+                                            <TextBlock x:Name="TxtCardTotalPower" Text="電池充放電功率 (實測)" FontSize="12" Foreground="{StaticResource TextMuted}" TextTrimming="CharacterEllipsis"/>
                                             <!-- Repainted every tick: red while discharging, green while
                                                  charging. Red is the resting state because the app is
                                                  opened on battery far more often than on AC. -->
-                                            <TextBlock x:Name="TxtLiveDischargeRate" Text="-- W" FontSize="24" FontWeight="ExtraBold" Foreground="{StaticResource PowerDischarge}" Margin="0,3"/>
-                                            <Border x:Name="BadgeLiveAcState" Background="#20F43F5E" BorderBrush="{StaticResource PowerDischarge}" BorderThickness="1" CornerRadius="10" Padding="8,2" HorizontalAlignment="Left">
+                                            <TextBlock x:Name="TxtLiveDischargeRate" Text="-- W" FontSize="25" FontWeight="Bold" Foreground="{StaticResource PowerDischarge}" Margin="0,4,0,3" Typography.NumeralAlignment="Tabular"/>
+                                            <Border x:Name="BadgeLiveAcState" Style="{StaticResource StatusPillStyle}" Background="#20FB7185" BorderBrush="{StaticResource PowerDischarge}" HorizontalAlignment="Left">
                                                 <TextBlock x:Name="TxtLiveAcState" Text="電源狀態讀取中..." FontSize="11" FontWeight="SemiBold" Foreground="{StaticResource PowerDischarge}"/>
                                             </Border>
                                             <!-- Windows' own verdict on the attached charger. Windows exposes
@@ -283,33 +290,33 @@
                                     </Border>
 
                                     <!-- Live Remaining Battery Time Card -->
-                                    <Border Grid.Column="1" Background="#182338" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" CornerRadius="8" Padding="11,9" Margin="3,0,3,0">
+                                    <Border Grid.Column="1" Style="{StaticResource MetricCardStyle}" Margin="3,0,3,0">
                                         <StackPanel>
-                                            <TextBlock x:Name="TxtCardEstTime" Text="⏱️ 電腦估算剩餘續航時間" FontSize="12" Foreground="{StaticResource TextMuted}" TextTrimming="CharacterEllipsis"/>
+                                            <TextBlock x:Name="TxtCardEstTime" Text="電腦估算剩餘續航時間" FontSize="12" Foreground="{StaticResource TextMuted}" TextTrimming="CharacterEllipsis"/>
                                             <!-- Amber, not green: green is reserved for charging, and a
                                                  runtime estimate is neither charge nor discharge. -->
-                                            <TextBlock x:Name="TxtLiveRemainingTime" Text="--" FontSize="21" FontWeight="Bold" Foreground="{StaticResource PowerNeutral}" Margin="0,4"/>
-                                            <TextBlock x:Name="TxtLiveBatteryPercent" Text="目前電量: --%" FontSize="12" Foreground="{StaticResource TextMuted}"/>
+                                            <TextBlock x:Name="TxtLiveRemainingTime" Text="--" FontSize="22" FontWeight="Bold" Foreground="{StaticResource PowerNeutral}" Margin="0,5,0,4" Typography.NumeralAlignment="Tabular"/>
+                                            <TextBlock x:Name="TxtLiveBatteryPercent" Text="目前電量: --%" FontSize="12" Foreground="{StaticResource TextMuted}" Typography.NumeralAlignment="Tabular"/>
                                         </StackPanel>
                                     </Border>
 
                                     <!-- Live Battery Hardware Telemetry Card -->
-                                    <Border Grid.Column="2" Background="#182338" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" CornerRadius="8" Padding="11,9" Margin="5,0,0,0">
+                                    <Border Grid.Column="2" Style="{StaticResource MetricCardStyle}" Margin="5,0,0,0">
                                         <StackPanel>
-                                            <TextBlock x:Name="TxtCardTelemetry" Text="🔋 電池物理狀態 (電壓 / 電流)" FontSize="12" Foreground="{StaticResource TextMuted}" TextTrimming="CharacterEllipsis"/>
+                                            <TextBlock x:Name="TxtCardTelemetry" Text="電池物理狀態 (電壓 / 電流)" FontSize="12" Foreground="{StaticResource TextMuted}" TextTrimming="CharacterEllipsis"/>
                                             <!-- Also repainted per tick: current flowing out of the pack
                                                  is red, current flowing into it is green. -->
-                                            <TextBlock x:Name="TxtLiveBatteryTelemetry" Text="-- V | -- A" FontSize="19" FontWeight="Bold" Foreground="{StaticResource PowerDischarge}" Margin="0,5,0,4"/>
+                                            <TextBlock x:Name="TxtLiveBatteryTelemetry" Text="-- V | -- A" FontSize="20" FontWeight="Bold" Foreground="{StaticResource PowerDischarge}" Margin="0,6,0,4" Typography.NumeralAlignment="Tabular"/>
                                             <TextBlock x:Name="TxtLiveBatteryTelemetrySub" Text="WMI &amp; ACPI 即時硬體感測" FontSize="11" Foreground="{StaticResource TextMuted}"/>
                                         </StackPanel>
                                     </Border>
                                 </Grid>
 
                                 <!-- Task Manager Style Real-Time Waveform Chart Card -->
-                                <Border Background="#182338" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" CornerRadius="8" Padding="11,9" Margin="0,0,0,9">
+                                <Border Style="{StaticResource MetricCardStyle}" Margin="0,0,0,9">
                                     <StackPanel>
                                         <Grid Margin="0,0,0,7">
-                                            <TextBlock x:Name="TxtWaveformTitle" Text="📈 60 秒即時動態走勢波形圖 (Task Manager Style Live Graph)" FontSize="13" FontWeight="Bold" Foreground="{StaticResource TextMain}"/>
+                                            <TextBlock x:Name="TxtWaveformTitle" Text="60 秒即時功率走勢" FontSize="13" FontWeight="SemiBold" Foreground="{StaticResource TextMain}"/>
                                             
                                             <!-- Legend -->
                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
@@ -328,7 +335,7 @@
                                         </Grid>
 
                                         <!-- Waveform Canvas Box with Y-Axis Wattage Coordinates -->
-                                        <Border Height="136" Background="#060910" BorderBrush="#1E293B" BorderThickness="1" CornerRadius="6" ClipToBounds="True">
+                                        <Border Height="142" Style="{StaticResource DataSurfaceStyle}" ClipToBounds="True">
                                             <Grid x:Name="GridChartContainer" SizeChanged="GridChartContainer_SizeChanged">
                                                 <!-- Background Gridlines -->
                                                 <Canvas x:Name="CanvasGridlines"/>
@@ -343,11 +350,11 @@
                                                         <RowDefinition Height="Auto"/>
                                                     </Grid.RowDefinitions>
                                                     
-                                                    <TextBlock x:Name="TxtYAxis100" Grid.Row="0" Text="35 W (100%)" FontSize="10" Foreground="#94A3B8" FontFamily="Consolas, Segoe UI" VerticalAlignment="Top"/>
-                                                    <TextBlock x:Name="TxtYAxis75" Grid.Row="1" Text="26 W (75%)" FontSize="10" Foreground="#94A3B8" FontFamily="Consolas, Segoe UI" VerticalAlignment="Top"/>
-                                                    <TextBlock x:Name="TxtYAxis50" Grid.Row="2" Text="18 W (50%)" FontSize="10" Foreground="#94A3B8" FontFamily="Consolas, Segoe UI" VerticalAlignment="Top"/>
-                                                    <TextBlock x:Name="TxtYAxis25" Grid.Row="3" Text="9 W (25%)" FontSize="10" Foreground="#94A3B8" FontFamily="Consolas, Segoe UI" VerticalAlignment="Top"/>
-                                                    <TextBlock x:Name="TxtYAxis0" Grid.Row="4" Text="0 W (0%)" FontSize="10" Foreground="#94A3B8" FontFamily="Consolas, Segoe UI" VerticalAlignment="Bottom"/>
+                                                    <TextBlock x:Name="TxtYAxis100" Grid.Row="0" Text="35 W (100%)" FontSize="10" Foreground="{StaticResource TextMuted}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Top" Typography.NumeralAlignment="Tabular"/>
+                                                    <TextBlock x:Name="TxtYAxis75" Grid.Row="1" Text="26 W (75%)" FontSize="10" Foreground="{StaticResource TextMuted}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Top" Typography.NumeralAlignment="Tabular"/>
+                                                    <TextBlock x:Name="TxtYAxis50" Grid.Row="2" Text="18 W (50%)" FontSize="10" Foreground="{StaticResource TextMuted}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Top" Typography.NumeralAlignment="Tabular"/>
+                                                    <TextBlock x:Name="TxtYAxis25" Grid.Row="3" Text="9 W (25%)" FontSize="10" Foreground="{StaticResource TextMuted}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Top" Typography.NumeralAlignment="Tabular"/>
+                                                    <TextBlock x:Name="TxtYAxis0" Grid.Row="4" Text="0 W (0%)" FontSize="10" Foreground="{StaticResource TextMuted}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Bottom" Typography.NumeralAlignment="Tabular"/>
                                                 </Grid>
 
                                                 <!-- Discharge, charge and dGPU share this single wattage
@@ -363,12 +370,12 @@
                                 </Border>
 
                                 <!-- Hardware Resource Load Breakdown Card -->
-                                <Border Background="#182338" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" CornerRadius="8" Padding="11,9" Margin="0,0,0,9">
+                                <Border Style="{StaticResource MetricCardStyle}" Margin="0,0,0,9">
                                     <StackPanel>
-                                        <TextBlock x:Name="TxtHardwareTitle" Text="💻 全系統各硬體元件功耗明細 (Full System Hardware Power Breakdown)" FontSize="13" FontWeight="Bold" Foreground="{StaticResource TextMain}" Margin="0,0,0,8"/>
+                                        <TextBlock x:Name="TxtHardwareTitle" Text="硬體實測功耗" FontSize="13" FontWeight="SemiBold" Foreground="{StaticResource TextMain}" Margin="0,0,0,8"/>
 
                                         <!-- Battery Hardware Telemetry Row -->
-                                        <Border Background="#0C1322" BorderBrush="#1A2438" BorderThickness="1" CornerRadius="7" Padding="10,6" Margin="0,0,0,6">
+                                        <Border Style="{StaticResource DataRowStyle}" Margin="0,0,0,6">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="238"/>
@@ -376,20 +383,20 @@
                                                     <ColumnDefinition Width="150"/>
                                                 </Grid.ColumnDefinitions>
                                                 <StackPanel Grid.Column="0" VerticalAlignment="Center">
-                                                    <TextBlock x:Name="LblHwBatteryTelemetry" Text="🔋 電池物理狀態 (電壓 / 電流)" Foreground="{StaticResource TextMain}" FontWeight="SemiBold" FontSize="12"/>
+                                                    <TextBlock x:Name="LblHwBatteryTelemetry" Text="電池物理狀態 (電壓 / 電流)" Foreground="{StaticResource TextMain}" FontWeight="SemiBold" FontSize="12"/>
                                                     <!-- Voltage comes from the battery driver IOCTL, not WMI,
                                                          which the old subtitle here claimed. -->
                                                     <TextBlock x:Name="TxtTelemetrySub" Text="電池驅動 IOCTL 即時電氣感測" Foreground="{StaticResource PowerDischarge}" FontSize="11" Margin="0,1,0,0"/>
                                                 </StackPanel>
-                                                <TextBlock x:Name="TxtHwTelemetryVal" Grid.Column="1" Text="-- V  |  -- A" Foreground="{StaticResource PowerDischarge}" FontWeight="Bold" FontSize="12" VerticalAlignment="Center" Margin="8,0"/>
-                                                <TextBlock Text="ACPI 感測器運作中" Grid.Column="2" Foreground="{StaticResource TextMain}" FontWeight="SemiBold" FontSize="12" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                                                <TextBlock x:Name="TxtHwTelemetryVal" Grid.Column="1" Text="-- V  |  -- A" Foreground="{StaticResource PowerDischarge}" FontWeight="Bold" FontSize="12" VerticalAlignment="Center" Margin="8,0" Typography.NumeralAlignment="Tabular"/>
+                                                <TextBlock x:Name="TxtHwTelemetrySource" Text="Battery class driver" Grid.Column="2" Foreground="{StaticResource TextMuted}" FontSize="11" HorizontalAlignment="Right" VerticalAlignment="Center"/>
                                             </Grid>
                                         </Border>
 
                                         <!-- Battery Energy & Capacity Row. Hidden on a pack whose
                                              driver reports no capacity, or reports it in relative
                                              units that cannot honestly be called watt-hours. -->
-                                        <Border x:Name="RowHwEnergy" Background="#0C1322" BorderBrush="#1A2438" BorderThickness="1" CornerRadius="7" Padding="10,6" Margin="0,0,0,6">
+                                        <Border x:Name="RowHwEnergy" Style="{StaticResource DataRowStyle}" Margin="0,0,0,6">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="238"/>
@@ -397,7 +404,7 @@
                                                     <ColumnDefinition Width="150"/>
                                                 </Grid.ColumnDefinitions>
                                                 <StackPanel Grid.Column="0" VerticalAlignment="Center">
-                                                    <TextBlock x:Name="LblHwEnergy" Text="🔋 電池蓄電量 (Wh)" Foreground="{StaticResource TextMain}" FontWeight="SemiBold" FontSize="12"/>
+                                                    <TextBlock x:Name="LblHwEnergy" Text="電池蓄電量 (Wh)" Foreground="{StaticResource TextMain}" FontWeight="SemiBold" FontSize="12"/>
                                                     <!-- Stored energy is neither spending nor saving power,
                                                          so it takes the neutral amber rather than borrowing
                                                          a colour that means something else. -->
@@ -409,7 +416,7 @@
                                         </Border>
 
                                         <!-- Windows Power Scheme Row -->
-                                        <Border Background="#0C1322" BorderBrush="#1A2438" BorderThickness="1" CornerRadius="7" Padding="10,6" Margin="0,0,0,6">
+                                        <Border Style="{StaticResource DataRowStyle}" Margin="0,0,0,6">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="238"/>
@@ -417,14 +424,14 @@
                                                     <ColumnDefinition Width="150"/>
                                                 </Grid.ColumnDefinitions>
                                                 <StackPanel Grid.Column="0" VerticalAlignment="Center">
-                                                    <TextBlock x:Name="LblHwPowerPlan" Text="⚙️ Windows 運作電源計劃" Foreground="{StaticResource TextMain}" FontWeight="SemiBold" FontSize="12"/>
+                                                    <TextBlock x:Name="LblHwPowerPlan" Text="Windows 運作電源計劃" Foreground="{StaticResource TextMain}" FontWeight="SemiBold" FontSize="12"/>
                                                     <!-- Coloured by what the plan costs: a performance plan
                                                          spends power (red), a saver plan conserves it
                                                          (green), balanced sits between (amber). -->
                                                     <TextBlock x:Name="TxtHwPowerPlanSub" Text="PowrProf 電源管理策略" Foreground="{StaticResource PowerNeutral}" FontSize="11" Margin="0,1,0,0"/>
                                                 </StackPanel>
                                                 <TextBlock x:Name="TxtHwPowerPlanVal" Grid.Column="1" Text="平衡 (Balanced)" Foreground="{StaticResource PowerNeutral}" FontWeight="Bold" FontSize="12" VerticalAlignment="Center" Margin="8,0"/>
-                                                <TextBlock Text="電源配置生效中" Grid.Column="2" Foreground="{StaticResource TextMain}" FontWeight="SemiBold" FontSize="12" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                                                <TextBlock x:Name="TxtHwPowerPlanState" Text="Active scheme" Grid.Column="2" Foreground="{StaticResource TextMuted}" FontSize="11" HorizontalAlignment="Right" VerticalAlignment="Center"/>
                                             </Grid>
                                         </Border>
 
@@ -434,7 +441,7 @@
                                              for any of them on this hardware. -->
 
                                         <!-- Discrete GPU (dGPU) Row -->
-                                        <Border Background="#0C1322" BorderBrush="#1A2438" BorderThickness="1" CornerRadius="7" Padding="10,6" Margin="0,0,0,6">
+                                        <Border Style="{StaticResource DataRowStyle}" Margin="0,0,0,6">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="238"/>
@@ -442,14 +449,14 @@
                                                     <ColumnDefinition Width="150"/>
                                                 </Grid.ColumnDefinitions>
                                                 <StackPanel Grid.Column="0" VerticalAlignment="Center">
-                                                    <TextBlock x:Name="TxtDgpuName" Text="🎮 獨立顯示卡 (dGPU)" Foreground="{StaticResource TextMain}" FontWeight="Bold" FontSize="12" TextTrimming="CharacterEllipsis"/>
+                                                    <TextBlock x:Name="TxtDgpuName" Text="獨立顯示卡 (dGPU)" Foreground="{StaticResource TextMain}" FontWeight="SemiBold" FontSize="12" TextTrimming="CharacterEllipsis"/>
                                                     <!-- The wattage keeps the blue of the dGPU chart series
                                                          so the two read as the same thing. The load bar and
                                                          its label are repainted per tick by how much power
                                                          the card is actually spending. -->
                                                     <TextBlock x:Name="TxtDgpuPowerW" Text="~0.0 W" Foreground="{StaticResource PowerGpu}" FontSize="11" Margin="0,1,0,0"/>
                                                 </StackPanel>
-                                                <ProgressBar x:Name="PbDgpuUsage" Grid.Column="1" Height="9" Value="0" Maximum="100" Foreground="{StaticResource PowerCharge}" Background="#090D16" BorderThickness="0" Margin="8,0" VerticalAlignment="Center"/>
+                                                <ProgressBar x:Name="PbDgpuUsage" Grid.Column="1" Value="0" Maximum="100" Foreground="{StaticResource PowerCharge}" Margin="8,0" VerticalAlignment="Center"/>
                                                 <TextBlock x:Name="TxtDgpuUsageVal" Grid.Column="2" Text="0% (待機省電)" Foreground="{StaticResource PowerCharge}" FontWeight="SemiBold" FontSize="12" HorizontalAlignment="Right" VerticalAlignment="Center"/>
                                             </Grid>
                                         </Border>
@@ -462,15 +469,15 @@
                                 </Border>
 
                                 <!-- Live Power Tip Box -->
-                                <Border Background="#1038BDF8" BorderBrush="{StaticResource AccentCyan}" BorderThickness="1" CornerRadius="7" Padding="10,7">
-                                    <TextBlock x:Name="TxtLivePowerTip" Text="💡 即時監測每 1 秒自動更新一次。" FontSize="12" Foreground="{StaticResource TextMain}" TextWrapping="Wrap"/>
+                                <Border Background="{StaticResource AccentTint}" BorderBrush="{StaticResource AccentCyan}" BorderThickness="1" CornerRadius="6" Padding="10,8">
+                                    <TextBlock x:Name="TxtLivePowerTip" Text="即時監測每 1 秒自動更新一次。" FontSize="12" Foreground="{StaticResource TextMain}" TextWrapping="Wrap"/>
                                 </Border>
                             </StackPanel>
                         </ScrollViewer>
                     </TabItem>
 
                     <!-- TAB 2: Live Power & Charge/Discharge History -->
-                    <TabItem x:Name="TabHistoryLogs" Header=" 📉 即時功耗與充放電歷史紀錄 ">
+                    <TabItem x:Name="TabHistoryLogs" Header=" 即時功耗與充放電歷史紀錄 ">
                         <Grid Margin="0,8,0,0">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto"/>
@@ -478,35 +485,51 @@
                             </Grid.RowDefinitions>
 
                             <!-- Action Buttons Header -->
-                            <Grid Grid.Row="0" Margin="0,0,0,7">
-                                <TextBlock x:Name="TxtHistoryLogHeader" Text="📋 即時動態功耗與充放電事件歷史日誌 (Live Power &amp; Event Logs)" FontSize="13" FontWeight="Bold" Foreground="{StaticResource TextMain}" VerticalAlignment="Center"/>
+                            <Grid Grid.Row="0" Margin="0,0,0,8">
+                                <TextBlock x:Name="TxtHistoryLogHeader" Text="即時功耗與充放電事件紀錄" FontSize="13" FontWeight="SemiBold" Foreground="{StaticResource TextMain}" VerticalAlignment="Center"/>
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                                    <Button x:Name="BtnExportPowerCsv" Content="📥 匯出 CSV 紀錄" Style="{StaticResource SecondaryButtonStyle}" Margin="0,0,6,0" Padding="10,4" Click="BtnExportPowerCsv_Click"/>
-                                    <Button x:Name="BtnClearPowerHistory" Content="🗑️ 清除紀錄" Style="{StaticResource SecondaryButtonStyle}" Padding="10,4" Click="BtnClearPowerHistory_Click"/>
+                                    <Button x:Name="BtnExportPowerCsv" Content="匯出 CSV 紀錄" Style="{StaticResource SecondaryButtonStyle}" Margin="0,0,6,0" Padding="10,4" Click="BtnExportPowerCsv_Click"/>
+                                    <Button x:Name="BtnClearPowerHistory" Content="清除紀錄" Style="{StaticResource SecondaryButtonStyle}" Padding="10,4" Click="BtnClearPowerHistory_Click"/>
                                 </StackPanel>
                             </Grid>
 
                             <!-- History Event Log ListView -->
-                            <ListView x:Name="LvPowerHistory" Grid.Row="1" Background="#0C1322" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" Foreground="{StaticResource TextMain}">
-                                <ListView.View>
-                                    <GridView>
-                                        <GridViewColumn Header="時間戳記" Width="140" DisplayMemberBinding="{Binding TimestampText}"/>
-                                        <GridViewColumn Header="事件類型" Width="100" DisplayMemberBinding="{Binding EventType}"/>
-                                        <GridViewColumn Header="放電/充電功率" Width="108" DisplayMemberBinding="{Binding DischargeRateText}"/>
-                                        <GridViewColumn Header="電量 (%)" Width="76" DisplayMemberBinding="{Binding BatteryPercentText}"/>
-                                        <GridViewColumn Header="電池狀態 (V / A)" Width="124" DisplayMemberBinding="{Binding TelemetryText}"/>
-                                        <GridViewColumn Header="CPU 負載" Width="84" DisplayMemberBinding="{Binding CpuUsageText}"/>
-                                        <GridViewColumn Header="獨顯負載" Width="84" DisplayMemberBinding="{Binding DgpuUsageText}"/>
-                                        <GridViewColumn Header="獨顯功耗" Width="84" DisplayMemberBinding="{Binding DgpuPowerText}"/>
-                                        <GridViewColumn Header="詳細狀態記錄" Width="220" DisplayMemberBinding="{Binding SummaryText}"/>
-                                    </GridView>
-                                </ListView.View>
-                            </ListView>
+                            <Grid Grid.Row="1">
+                                <ListView x:Name="LvPowerHistory" Background="{StaticResource BgInset}" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" Foreground="{StaticResource TextMain}">
+                                    <ListView.View>
+                                        <GridView>
+                                            <GridViewColumn Header="時間戳記" Width="140" DisplayMemberBinding="{Binding TimestampText}"/>
+                                            <GridViewColumn Header="事件類型" Width="100" DisplayMemberBinding="{Binding EventType}"/>
+                                            <GridViewColumn Header="放電/充電功率" Width="108" DisplayMemberBinding="{Binding DischargeRateText}"/>
+                                            <GridViewColumn Header="電量 (%)" Width="76" DisplayMemberBinding="{Binding BatteryPercentText}"/>
+                                            <GridViewColumn Header="電池狀態 (V / A)" Width="124" DisplayMemberBinding="{Binding TelemetryText}"/>
+                                            <GridViewColumn Header="CPU 負載" Width="84" DisplayMemberBinding="{Binding CpuUsageText}"/>
+                                            <GridViewColumn Header="獨顯負載" Width="84" DisplayMemberBinding="{Binding DgpuUsageText}"/>
+                                            <GridViewColumn Header="獨顯功耗" Width="84" DisplayMemberBinding="{Binding DgpuPowerText}"/>
+                                            <GridViewColumn Header="詳細狀態記錄" Width="220" DisplayMemberBinding="{Binding SummaryText}"/>
+                                        </GridView>
+                                    </ListView.View>
+                                </ListView>
+                                <TextBlock x:Name="TxtPowerHistoryEmpty" Text="監測開始後，功耗事件會顯示在這裡。"
+                                           Foreground="{StaticResource TextMuted}" FontSize="12"
+                                           HorizontalAlignment="Center" VerticalAlignment="Center" IsHitTestVisible="False">
+                                    <TextBlock.Style>
+                                        <Style TargetType="TextBlock">
+                                            <Setter Property="Visibility" Value="Collapsed"/>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding ElementName=LvPowerHistory, Path=HasItems}" Value="False">
+                                                    <Setter Property="Visibility" Value="Visible"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </TextBlock.Style>
+                                </TextBlock>
+                            </Grid>
                         </Grid>
                     </TabItem>
 
-                    <!-- TAB 3: Battery Voltage by State of Charge (0–100%) -->
-                    <TabItem x:Name="TabVoltageHistory" Header=" 🔋 電池電壓紀錄 ">
+                    <!-- TAB 3: Battery Voltage by State of Charge (0-100%) -->
+                    <TabItem x:Name="TabVoltageHistory" Header=" 電池電壓紀錄 ">
                         <Grid Margin="0,8,0,0">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto"/>
@@ -516,21 +539,21 @@
 
                             <Grid Grid.Row="0" Margin="0,0,0,7">
                                 <StackPanel>
-                                    <TextBlock x:Name="TxtVoltageHistoryTitle" Text="🔋 電池電壓紀錄（0–100%）" FontSize="13" FontWeight="Bold" Foreground="{StaticResource TextMain}"/>
+                                    <TextBlock x:Name="TxtVoltageHistoryTitle" Text="電池電壓紀錄 (0-100%)" FontSize="13" FontWeight="SemiBold" Foreground="{StaticResource TextMain}"/>
                                     <TextBlock x:Name="TxtVoltageHistorySummary" Text="已記錄 0 / 101 個電量區間，累積 0 次電量變化事件" FontSize="11" Foreground="{StaticResource TextMuted}" Margin="0,3,0,0"/>
                                     <TextBlock x:Name="TxtVoltageHistoryHint" Text="僅顯示電池驅動回報的實測電壓；同一電量未變化時不重複記錄。" FontSize="11" Foreground="{StaticResource TextMuted}" Margin="0,2,0,0"/>
                                 </StackPanel>
                                 <Button x:Name="BtnClearVoltageHistory" Content="清除電壓紀錄" Style="{StaticResource SecondaryButtonStyle}" HorizontalAlignment="Right" VerticalAlignment="Center" Padding="10,4" Click="BtnClearVoltageHistory_Click"/>
                             </Grid>
 
-                            <Border Grid.Row="1" Background="#182338" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" CornerRadius="8" Padding="11,9" Margin="0,0,0,7">
+                            <Border Grid.Row="1" Style="{StaticResource MetricCardStyle}" Margin="0,0,0,7">
                                 <Grid>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="*"/>
                                         <RowDefinition Height="Auto"/>
                                     </Grid.RowDefinitions>
 
-                                    <Border Grid.Row="0" Background="#060910" BorderBrush="#1E293B" BorderThickness="1" CornerRadius="6" ClipToBounds="True">
+                                    <Border Grid.Row="0" Style="{StaticResource DataSurfaceStyle}" ClipToBounds="True">
                                         <Grid x:Name="GridVoltageChartContainer" SizeChanged="GridVoltageChartContainer_SizeChanged">
                                             <Canvas x:Name="CanvasVoltageGridlines"/>
 
@@ -542,11 +565,11 @@
                                                     <RowDefinition Height="*"/>
                                                     <RowDefinition Height="Auto"/>
                                                 </Grid.RowDefinitions>
-                                                <TextBlock x:Name="TxtVoltageYAxis100" Grid.Row="0" Text="-- V" FontSize="10" Foreground="#94A3B8" FontFamily="Consolas, Segoe UI" VerticalAlignment="Top"/>
-                                                <TextBlock x:Name="TxtVoltageYAxis75" Grid.Row="1" Text="-- V" FontSize="10" Foreground="#94A3B8" FontFamily="Consolas, Segoe UI" VerticalAlignment="Top"/>
-                                                <TextBlock x:Name="TxtVoltageYAxis50" Grid.Row="2" Text="-- V" FontSize="10" Foreground="#94A3B8" FontFamily="Consolas, Segoe UI" VerticalAlignment="Top"/>
-                                                <TextBlock x:Name="TxtVoltageYAxis25" Grid.Row="3" Text="-- V" FontSize="10" Foreground="#94A3B8" FontFamily="Consolas, Segoe UI" VerticalAlignment="Top"/>
-                                                <TextBlock x:Name="TxtVoltageYAxis0" Grid.Row="4" Text="-- V" FontSize="10" Foreground="#94A3B8" FontFamily="Consolas, Segoe UI" VerticalAlignment="Bottom"/>
+                                                <TextBlock x:Name="TxtVoltageYAxis100" Grid.Row="0" Text="-- V" FontSize="10" Foreground="{StaticResource TextMuted}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Top" Typography.NumeralAlignment="Tabular"/>
+                                                <TextBlock x:Name="TxtVoltageYAxis75" Grid.Row="1" Text="-- V" FontSize="10" Foreground="{StaticResource TextMuted}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Top" Typography.NumeralAlignment="Tabular"/>
+                                                <TextBlock x:Name="TxtVoltageYAxis50" Grid.Row="2" Text="-- V" FontSize="10" Foreground="{StaticResource TextMuted}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Top" Typography.NumeralAlignment="Tabular"/>
+                                                <TextBlock x:Name="TxtVoltageYAxis25" Grid.Row="3" Text="-- V" FontSize="10" Foreground="{StaticResource TextMuted}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Top" Typography.NumeralAlignment="Tabular"/>
+                                                <TextBlock x:Name="TxtVoltageYAxis0" Grid.Row="4" Text="-- V" FontSize="10" Foreground="{StaticResource TextMuted}" FontFamily="Cascadia Mono, Consolas" VerticalAlignment="Bottom" Typography.NumeralAlignment="Tabular"/>
                                             </Grid>
 
                                             <!-- Segments are split at missing percentages, so the line never
@@ -575,63 +598,127 @@
                                 </Grid>
                             </Border>
 
-                            <ListView x:Name="LvBatteryVoltageHistory" Grid.Row="2" Background="#0C1322" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" Foreground="{StaticResource TextMain}">
-                                <ListView.View>
-                                    <GridView>
-                                        <GridViewColumn x:Name="VoltagePercentColumn" Header="電量 (%)" Width="100" DisplayMemberBinding="{Binding BatteryPercentText}"/>
-                                        <GridViewColumn x:Name="VoltageAverageColumn" Header="平均電壓" Width="120" DisplayMemberBinding="{Binding AverageVoltageText}"/>
-                                        <GridViewColumn x:Name="VoltageRangeColumn" Header="實測範圍" Width="150" DisplayMemberBinding="{Binding VoltageRangeText}"/>
-                                        <GridViewColumn x:Name="VoltageSamplesColumn" Header="變化次數" Width="100" DisplayMemberBinding="{Binding SampleCount}"/>
-                                        <GridViewColumn x:Name="VoltageLastColumn" Header="最後紀錄" Width="170" DisplayMemberBinding="{Binding LastRecordedAtText}"/>
-                                    </GridView>
-                                </ListView.View>
-                            </ListView>
+                            <Grid Grid.Row="2">
+                                <ListView x:Name="LvBatteryVoltageHistory" Background="{StaticResource BgInset}" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" Foreground="{StaticResource TextMain}">
+                                    <ListView.View>
+                                        <GridView>
+                                            <GridViewColumn x:Name="VoltagePercentColumn" Header="電量 (%)" Width="100" DisplayMemberBinding="{Binding BatteryPercentText}"/>
+                                            <GridViewColumn x:Name="VoltageAverageColumn" Header="平均電壓" Width="120" DisplayMemberBinding="{Binding AverageVoltageText}"/>
+                                            <GridViewColumn x:Name="VoltageRangeColumn" Header="實測範圍" Width="150" DisplayMemberBinding="{Binding VoltageRangeText}"/>
+                                            <GridViewColumn x:Name="VoltageSamplesColumn" Header="變化次數" Width="100" DisplayMemberBinding="{Binding SampleCount}"/>
+                                            <GridViewColumn x:Name="VoltageLastColumn" Header="最後紀錄" Width="170" DisplayMemberBinding="{Binding LastRecordedAtText}"/>
+                                        </GridView>
+                                    </ListView.View>
+                                </ListView>
+                                <TextBlock x:Name="TxtVoltageHistoryEmpty" Text="電量百分比改變且驅動回報實測電壓後，紀錄會顯示在這裡。"
+                                           Foreground="{StaticResource TextMuted}" FontSize="12" TextWrapping="Wrap" MaxWidth="420" TextAlignment="Center"
+                                           HorizontalAlignment="Center" VerticalAlignment="Center" IsHitTestVisible="False">
+                                    <TextBlock.Style>
+                                        <Style TargetType="TextBlock">
+                                            <Setter Property="Visibility" Value="Collapsed"/>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding ElementName=LvBatteryVoltageHistory, Path=HasItems}" Value="False">
+                                                    <Setter Property="Visibility" Value="Visible"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </TextBlock.Style>
+                                </TextBlock>
+                            </Grid>
                         </Grid>
                     </TabItem>
 
                     <!-- TAB 4: Smart Diagnostics -->
-                    <TabItem x:Name="TabDiagnostics" Header=" 💡 智慧診斷與維護建議 ">
-                        <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="0,8,0,0">
-                            <ItemsControl x:Name="IcDiagnostics">
-                                <ItemsControl.ItemTemplate>
-                                    <DataTemplate>
-                                        <Border Background="#182338" CornerRadius="7" Padding="10,8" Margin="0,0,0,7" BorderBrush="{StaticResource AccentCyan}" BorderThickness="4,0,0,0">
-                                            <StackPanel>
-                                                <TextBlock Text="{Binding Title}" FontWeight="Bold" FontSize="13" Foreground="{StaticResource TextMain}"/>
-                                                <TextBlock Text="{Binding Description}" FontSize="12" Foreground="{StaticResource TextMuted}" Margin="0,3,0,0" TextWrapping="Wrap"/>
-                                            </StackPanel>
-                                        </Border>
-                                    </DataTemplate>
-                                </ItemsControl.ItemTemplate>
-                            </ItemsControl>
-                        </ScrollViewer>
+                    <TabItem x:Name="TabDiagnostics" Header=" 智慧診斷與維護建議 ">
+                        <Grid Margin="0,8,0,0">
+                            <ScrollViewer VerticalScrollBarVisibility="Auto">
+                                <ItemsControl x:Name="IcDiagnostics">
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate>
+                                            <Border Background="{StaticResource BgRaised}" CornerRadius="6" Padding="11,9" Margin="0,0,0,7" BorderBrush="{StaticResource AccentCyan}" BorderThickness="3,0,0,0">
+                                                <StackPanel>
+                                                    <TextBlock Text="{Binding Title}" FontWeight="SemiBold" FontSize="13" Foreground="{StaticResource TextMain}"/>
+                                                    <TextBlock Text="{Binding Description}" FontSize="12" Foreground="{StaticResource TextMuted}" Margin="0,3,0,0" TextWrapping="Wrap"/>
+                                                </StackPanel>
+                                            </Border>
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
+                            </ScrollViewer>
+                            <TextBlock x:Name="TxtDiagnosticsEmpty" Text="執行電池檢測後，診斷與維護建議會顯示在這裡。"
+                                       Foreground="{StaticResource TextMuted}" FontSize="12"
+                                       HorizontalAlignment="Center" VerticalAlignment="Center" IsHitTestVisible="False">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Visibility" Value="Collapsed"/>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding ElementName=IcDiagnostics, Path=HasItems}" Value="False">
+                                                <Setter Property="Visibility" Value="Visible"/>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
                     </TabItem>
 
                     <!-- TAB 5: Life Estimates -->
-                    <TabItem x:Name="TabLifeEstimates" Header=" ⏱️ 續航估算表 ">
-                        <ListView x:Name="LvLifeEstimates" Background="#0C1322" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" Foreground="{StaticResource TextMain}" Margin="0,8,0,0">
-                            <ListView.View>
-                                <GridView>
-                                    <GridViewColumn Header="記錄期間" Width="170" DisplayMemberBinding="{Binding Period}"/>
-                                    <GridViewColumn Header="實測滿電續航" Width="170" DisplayMemberBinding="{Binding FullChargeEstimate}"/>
-                                    <GridViewColumn Header="原廠設計續航" Width="170" DisplayMemberBinding="{Binding DesignCapEstimate}"/>
-                                </GridView>
-                            </ListView.View>
-                        </ListView>
+                    <TabItem x:Name="TabLifeEstimates" Header=" 續航估算表 ">
+                        <Grid Margin="0,8,0,0">
+                            <ListView x:Name="LvLifeEstimates" Background="{StaticResource BgInset}" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" Foreground="{StaticResource TextMain}">
+                                <ListView.View>
+                                    <GridView>
+                                        <GridViewColumn Header="記錄期間" Width="170" DisplayMemberBinding="{Binding Period}"/>
+                                        <GridViewColumn Header="實測滿電續航" Width="170" DisplayMemberBinding="{Binding FullChargeEstimate}"/>
+                                        <GridViewColumn Header="原廠設計續航" Width="170" DisplayMemberBinding="{Binding DesignCapEstimate}"/>
+                                    </GridView>
+                                </ListView.View>
+                            </ListView>
+                            <TextBlock x:Name="TxtLifeEstimatesEmpty" Text="載入含續航資料的電池報告後，估算結果會顯示在這裡。"
+                                       Foreground="{StaticResource TextMuted}" FontSize="12"
+                                       HorizontalAlignment="Center" VerticalAlignment="Center" IsHitTestVisible="False">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Visibility" Value="Collapsed"/>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding ElementName=LvLifeEstimates, Path=HasItems}" Value="False">
+                                                <Setter Property="Visibility" Value="Visible"/>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
                     </TabItem>
 
                     <!-- TAB 6: Recent Usage -->
-                    <TabItem x:Name="TabRecentUsage" Header=" 📊 最近使用紀錄 ">
-                        <ListView x:Name="LvRecentUsage" Background="#0C1322" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" Foreground="{StaticResource TextMain}" Margin="0,8,0,0">
-                            <ListView.View>
-                                <GridView>
-                                    <GridViewColumn Header="開始時間" Width="170" DisplayMemberBinding="{Binding StartTime}"/>
-                                    <GridViewColumn Header="狀態" Width="110" DisplayMemberBinding="{Binding State}"/>
-                                    <GridViewColumn Header="電源來源" Width="110" DisplayMemberBinding="{Binding Source}"/>
-                                    <GridViewColumn Header="剩餘電量" Width="130" DisplayMemberBinding="{Binding CapacityRemaining}"/>
-                                </GridView>
-                            </ListView.View>
-                        </ListView>
+                    <TabItem x:Name="TabRecentUsage" Header=" 最近使用紀錄 ">
+                        <Grid Margin="0,8,0,0">
+                            <ListView x:Name="LvRecentUsage" Background="{StaticResource BgInset}" BorderBrush="{StaticResource BorderColor}" BorderThickness="1" Foreground="{StaticResource TextMain}">
+                                <ListView.View>
+                                    <GridView>
+                                        <GridViewColumn Header="開始時間" Width="170" DisplayMemberBinding="{Binding StartTime}"/>
+                                        <GridViewColumn Header="狀態" Width="110" DisplayMemberBinding="{Binding State}"/>
+                                        <GridViewColumn Header="電源來源" Width="110" DisplayMemberBinding="{Binding Source}"/>
+                                        <GridViewColumn Header="剩餘電量" Width="130" DisplayMemberBinding="{Binding CapacityRemaining}"/>
+                                    </GridView>
+                                </ListView.View>
+                            </ListView>
+                            <TextBlock x:Name="TxtRecentUsageEmpty" Text="載入含使用紀錄的電池報告後，資料會顯示在這裡。"
+                                       Foreground="{StaticResource TextMuted}" FontSize="12"
+                                       HorizontalAlignment="Center" VerticalAlignment="Center" IsHitTestVisible="False">
+                                <TextBlock.Style>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="Visibility" Value="Collapsed"/>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding ElementName=LvRecentUsage, Path=HasItems}" Value="False">
+                                                <Setter Property="Visibility" Value="Visible"/>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
                     </TabItem>
 
                 </TabControl>
@@ -639,12 +726,14 @@
         </Grid>
 
         <!-- Loading Overlay -->
-        <Border x:Name="OverlayLoading" Grid.RowSpan="2" Background="#D0090D16" Visibility="Collapsed">
-            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                <TextBlock Text="⚡" FontSize="40" HorizontalAlignment="Center" Margin="0,0,0,10"/>
-                <TextBlock Text="正在執行 Windows 電池健康檢測 (powercfg /batteryreport)..." FontSize="15" FontWeight="Bold" Foreground="{StaticResource TextMain}" HorizontalAlignment="Center"/>
-                <TextBlock Text="請稍候..." FontSize="12" Foreground="{StaticResource TextMuted}" HorizontalAlignment="Center" Margin="0,5,0,0"/>
-            </StackPanel>
+        <Border x:Name="OverlayLoading" Grid.RowSpan="2" Background="#E60A0E13" Visibility="Collapsed">
+            <Border Style="{StaticResource PanelCardStyle}" Padding="24,20" HorizontalAlignment="Center" VerticalAlignment="Center" MaxWidth="520">
+                <StackPanel HorizontalAlignment="Center">
+                    <Image Source="pack://application:,,,/app_icon.png" Width="40" Height="40" Margin="0,0,0,12"/>
+                    <TextBlock x:Name="TxtLoadingTitle" Text="正在執行 Windows 電池健康檢測" FontSize="15" FontWeight="SemiBold" Foreground="{StaticResource TextMain}" HorizontalAlignment="Center"/>
+                    <TextBlock x:Name="TxtLoadingDetail" Text="powercfg /batteryreport 正在產生並分析最新報告。" FontSize="12" Foreground="{StaticResource TextMuted}" HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" Margin="0,6,0,0"/>
+                </StackPanel>
+            </Border>
         </Border>
     </Grid>
 </Window>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index b12c325..f7fabbf 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -283,10 +283,19 @@ private void ApplyLanguage()
             LblHwBatteryTelemetry.Text = LocalizationService.Get("HwBatteryTelemetry");
             LblHwEnergy.Text = LocalizationService.Get("HwEnergy");
             LblHwPowerPlan.Text = LocalizationService.Get("HwPowerPlan");
+            TxtHwTelemetrySource.Text = LocalizationService.Get("HwTelemetrySource");
+            TxtHwPowerPlanState.Text = LocalizationService.Get("HwPowerPlanState");
 
             TxtHistoryLogHeader.Text = LocalizationService.Get("HistoryLogHeader");
             BtnExportPowerCsv.Content = LocalizationService.Get("BtnExportCsv");
             BtnClearPowerHistory.Content = LocalizationService.Get("BtnClearHistory");
+            TxtPowerHistoryEmpty.Text = LocalizationService.Get("PowerHistoryEmpty");
+            TxtVoltageHistoryEmpty.Text = LocalizationService.Get("VoltageHistoryEmpty");
+            TxtDiagnosticsEmpty.Text = LocalizationService.Get("DiagnosticsEmpty");
+            TxtLifeEstimatesEmpty.Text = LocalizationService.Get("LifeEstimatesEmpty");
+            TxtRecentUsageEmpty.Text = LocalizationService.Get("RecentUsageEmpty");
+            TxtLoadingTitle.Text = LocalizationService.Get("LoadingTitle");
+            TxtLoadingDetail.Text = LocalizationService.Get("LoadingDetail");
 
             // System tray menu follows the same language as the window.
             if (_trayItemShow != null) _trayItemShow.Text = LocalizationService.Get("TrayShow");
@@ -723,14 +732,16 @@ private void InitSystemTrayIcon()
                 _trayItemShow = new ToolStripMenuItem(LocalizationService.Get("TrayShow"), null, (s, args) => RestoreFromTray());
                 _trayItemShow.Font = new System.Drawing.Font(_trayItemShow.Font, System.Drawing.FontStyle.Bold);
 
-                _trayItemCheck = new ToolStripMenuItem(LocalizationService.Get("TrayCheck"), null, async (s, args) => {
+                _trayItemCheck = new ToolStripMenuItem(LocalizationService.Get("TrayCheck"), null, async (s, args) =>
+                {
                     RestoreFromTray();
                     await RunBatteryCheckAsync();
                 });
 
                 _trayItemAutoStart = new ToolStripMenuItem(LocalizationService.Get("TrayAutoStart"));
                 _trayItemAutoStart.Checked = StartupService.IsAutoStartEnabled();
-                _trayItemAutoStart.Click += (s, args) => {
+                _trayItemAutoStart.Click += (s, args) =>
+                {
                     bool newState = !_trayItemAutoStart!.Checked;
                     if (StartupService.SetAutoStart(newState))
                     {
@@ -1057,8 +1068,8 @@ private void UpdateLivePowerUI(RealTimePowerState state, bool recordSample = tru
                     TxtLiveAcState.Foreground = BrushRose;
 
                     TxtLiveAcState.Text = en
-                        ? $"🔌⚠️ Charger cannot keep up — battery covering -{state.DischargeRateW:F1}W (measured at the pack)"
-                        : $"🔌⚠️ 外接電源供電不足 — 電池補上 -{state.DischargeRateW:F1}W（電池實測）";
+                        ? $"Charger cannot keep up. Battery covering -{state.DischargeRateW:F1}W (measured at the pack)"
+                        : $"外接電源供電不足。電池補上 -{state.DischargeRateW:F1}W（電池實測）";
                 }
                 else if (state.IsAcOnline)
                 {
@@ -1077,20 +1088,20 @@ private void UpdateLivePowerUI(RealTimePowerState state, bool recordSample = tru
                     if (state.IsCharging && state.IsChargeRateMeasured)
                     {
                         TxtLiveAcState.Text = en
-                            ? $"🔌 Charging the battery at +{state.ChargingRateW:F1}W (measured at the pack)"
-                            : $"🔌 電池充電中 +{state.ChargingRateW:F1}W（電池實測）";
+                            ? $"Charging the battery at +{state.ChargingRateW:F1}W (measured at the pack)"
+                            : $"電池充電中 +{state.ChargingRateW:F1}W（電池實測）";
                     }
                     else if (state.IsCharging)
                     {
                         TxtLiveAcState.Text = en
-                            ? "🔌 Charging — this battery does not report a charge rate"
-                            : "🔌 電池充電中 — 此電池未回報充電功率";
+                            ? "Charging. This battery does not report a charge rate"
+                            : "電池充電中。此電池未回報充電功率";
                     }
                     else
                     {
                         TxtLiveAcState.Text = en
-                            ? "🔌 On AC, battery idle — no current in or out, so there is nothing to measure"
-                            : "🔌 市電直供中，電池無充放電電流 — 此狀態下沒有可量測的功率";
+                            ? "On AC, battery idle. No current in or out, so there is nothing to measure"
+                            : "市電直供中，電池無充放電電流。此狀態下沒有可量測的功率";
                     }
                 }
                 else
@@ -1109,14 +1120,14 @@ private void UpdateLivePowerUI(RealTimePowerState state, bool recordSample = tru
                     if (state.IsDischargeRateMeasured)
                     {
                         TxtLiveAcState.Text = en
-                            ? $"🔋 Battery Discharging (-{state.DischargeRateW:F1}W measured at the pack — whole system)"
-                            : $"🔋 電池放電中 (-{state.DischargeRateW:F1}W 電池實測 — 全系統真實耗電)";
+                            ? $"Battery Discharging (-{state.DischargeRateW:F1}W measured at the pack, whole system)"
+                            : $"電池放電中 (-{state.DischargeRateW:F1}W 電池實測，為全系統真實耗電)";
                     }
                     else
                     {
                         TxtLiveAcState.Text = en
-                            ? $"🔋 Battery Discharging (~-{state.DischargeRateW:F1}W estimated)"
-                            : $"🔋 電池放電中 (~-{state.DischargeRateW:F1}W 推估)";
+                            ? $"Battery Discharging (~-{state.DischargeRateW:F1}W estimated)"
+                            : $"電池放電中 (~-{state.DischargeRateW:F1}W 推估)";
                     }
                 }
 
@@ -1131,16 +1142,16 @@ private void UpdateLivePowerUI(RealTimePowerState state, bool recordSample = tru
                         // Amber, not red: red means power leaving the pack, and
                         // this line is a warning about the supply, not a rate.
                         TxtLiveChargerSupply.Text = en
-                            ? "⚠️ Windows reports the external supply as inadequate for this system"
-                            : "⚠️ Windows 判定：外接電源供電能力不足以支撐目前的系統負載";
+                            ? "Windows reports the external supply as inadequate for this system"
+                            : "Windows 判定：外接電源供電能力不足以支撐目前的系統負載";
                         TxtLiveChargerSupply.Foreground = BrushAmber;
                         TxtLiveChargerSupply.Visibility = Visibility.Visible;
                         break;
 
                     case PowerSupplyCapability.Adequate:
                         TxtLiveChargerSupply.Text = en
-                            ? "🔌 Windows reports the external supply as adequate. The adapter's own wattage is not exposed by Windows."
-                            : "🔌 Windows 判定：外接電源供電充足（變壓器 / USB-C 充電器本身的瓦數，Windows 並未提供）";
+                            ? "Windows reports the external supply as adequate. The adapter's own wattage is not exposed by Windows."
+                            : "Windows 判定：外接電源供電充足（變壓器 / USB-C 充電器本身的瓦數，Windows 並未提供）";
                         TxtLiveChargerSupply.Foreground = BrushSlate;
                         TxtLiveChargerSupply.Visibility = Visibility.Visible;
                         break;
@@ -1209,7 +1220,7 @@ private void UpdateLivePowerUI(RealTimePowerState state, bool recordSample = tru
 
                     TxtHwEnergySub.Text = state.DriverHealthPercent > 0
                         ? (en
-                            ? $"Full charge {state.BatteryCapacityHealthText} — health {state.DriverHealthPercent:F1}%"
+                            ? $"Full charge {state.BatteryCapacityHealthText}, health {state.DriverHealthPercent:F1}%"
                             : $"滿電 {state.BatteryCapacityHealthText}，健康度 {state.DriverHealthPercent:F1}%")
                         : (en ? "Measured by the battery driver" : "電池驅動實測容量");
                 }
@@ -1220,7 +1231,7 @@ private void UpdateLivePowerUI(RealTimePowerState state, bool recordSample = tru
 
                 // The discrete GPU is the only component with a real power
                 // sensor, so it is the only component row left on this page.
-                TxtDgpuName.Text = $"🎮 {state.DgpuName}";
+                TxtDgpuName.Text = state.DgpuName;
                 PbDgpuUsage.Value = state.DgpuUsagePercent;
                 TxtDgpuUsageVal.Text = state.DgpuStatusText;
                 TxtDgpuPowerW.Text = state.IsDgpuPowerMeasured
@@ -1248,22 +1259,22 @@ private void UpdateLivePowerUI(RealTimePowerState state, bool recordSample = tru
                 if (state.IsChargerDeficit)
                 {
                     TxtLivePowerTip.Text = en
-                        ? $"🔌⚠️ Plugged in but still discharging: the charger is short by at least {state.DischargeRateW:F1} W, which the battery is covering.{dgpuPart} Typical of charging over USB-C — a PD charger rated below this machine's draw cannot hold it up. Use a higher-wattage charger, or reduce load, to charge while working."
-                        : $"🔌⚠️ 已接上外接電源，但電池仍在放電：充電器至少差 {state.DischargeRateW:F1} W，缺口由電池補上。{dgpuPart}這是 USB-C 充電最常見的情況 — PD 充電器的瓦數低於本機耗電就撐不住。請改用瓦數更高的充電器，或降低負載才能邊用邊充。";
+                        ? $"Plugged in but still discharging: the charger is short by at least {state.DischargeRateW:F1} W, which the battery is covering.{dgpuPart} This is common with USB-C charging. A PD charger rated below this machine's draw cannot sustain it. Use a higher-wattage charger or reduce load to charge while working."
+                        : $"已接上外接電源，但電池仍在放電：充電器至少差 {state.DischargeRateW:F1} W，缺口由電池補上。{dgpuPart}這是 USB-C 充電常見的情況。PD 充電器的瓦數低於本機耗電就無法維持供電。請改用瓦數更高的充電器，或降低負載才能邊用邊充。";
                 }
                 else if (state.IsAcOnline)
                 {
                     if (state.IsCharging && state.IsChargeRateMeasured)
                     {
                         TxtLivePowerTip.Text = en
-                            ? $"🔌 On AC. Battery charging at {state.ChargingRateW:F1} W (measured at the pack). {state.EstimatedTimeRemainingText}.{dgpuPart}"
-                            : $"🔌 市電供電中，電池充電功率 {state.ChargingRateW:F1} W（電池實測）。{state.EstimatedTimeRemainingText}。{dgpuPart}";
+                            ? $"On AC. Battery charging at {state.ChargingRateW:F1} W (measured at the pack). {state.EstimatedTimeRemainingText}.{dgpuPart}"
+                            : $"市電供電中，電池充電功率 {state.ChargingRateW:F1} W（電池實測）。{state.EstimatedTimeRemainingText}。{dgpuPart}";
                     }
                     else
                     {
                         TxtLivePowerTip.Text = en
-                            ? $"🔌 On AC, no current flowing to or from the battery — there is no measurable system wattage in this state. Adapter input is not exposed by Windows.{dgpuPart}"
-                            : $"🔌 市電直供中，電池無充放電電流，此狀態下沒有可量測的系統功率（變壓器輸入功率 Windows 並未提供）。{dgpuPart}";
+                            ? $"On AC, no current is flowing to or from the battery. There is no measurable system wattage in this state. Adapter input is not exposed by Windows.{dgpuPart}"
+                            : $"市電直供中，電池無充放電電流，此狀態下沒有可量測的系統功率（變壓器輸入功率 Windows 並未提供）。{dgpuPart}";
                     }
                 }
                 else if (state.IsDischargeRateMeasured)
@@ -1271,21 +1282,21 @@ private void UpdateLivePowerUI(RealTimePowerState state, bool recordSample = tru
                     if (state.DischargeRateW > 20.0 || state.DgpuUsagePercent > 40.0)
                     {
                         TxtLivePowerTip.Text = en
-                            ? $"⚠️ High draw: {state.DischargeRateW:F1} W measured at the battery — the whole machine.{dgpuPart} Lowering screen brightness (now {state.ScreenBrightnessPercent}%) extends runtime."
-                            : $"⚠️ 目前放電 {state.DischargeRateW:F1} W（電池實測，為整機真實耗電）。{dgpuPart}建議調低螢幕亮度（目前 {state.ScreenBrightnessPercent}%）以延長續航。";
+                            ? $"High draw: {state.DischargeRateW:F1} W measured at the battery for the whole machine.{dgpuPart} Lowering screen brightness (now {state.ScreenBrightnessPercent}%) extends runtime."
+                            : $"目前放電 {state.DischargeRateW:F1} W（電池實測，為整機真實耗電）。{dgpuPart}建議調低螢幕亮度（目前 {state.ScreenBrightnessPercent}%）以延長續航。";
                     }
                     else
                     {
                         TxtLivePowerTip.Text = en
-                            ? $"💡 On battery: {state.DischargeRateW:F1} W measured at the pack — the whole machine's real draw.{dgpuPart}"
-                            : $"💡 電池供電中，實測放電 {state.DischargeRateW:F1} W（量測自電池，即整機真實耗電）。{dgpuPart}";
+                            ? $"On battery: {state.DischargeRateW:F1} W measured at the pack, the whole machine's real draw.{dgpuPart}"
+                            : $"電池供電中，實測放電 {state.DischargeRateW:F1} W（量測自電池，即整機真實耗電）。{dgpuPart}";
                     }
                 }
                 else
                 {
                     TxtLivePowerTip.Text = en
-                        ? $"💡 On battery. This machine's battery does not report a discharge rate, so no wattage can be shown.{dgpuPart}"
-                        : $"💡 電池供電中。此裝置的電池未回報放電功率，因此無法顯示瓦數。{dgpuPart}";
+                        ? $"On battery. This machine's battery does not report a discharge rate, so no wattage can be shown.{dgpuPart}"
+                        : $"電池供電中。此裝置的電池未回報放電功率，因此無法顯示瓦數。{dgpuPart}";
                 }
             }
             catch (Exception ex)
@@ -1308,12 +1319,12 @@ private void BtnExportPowerCsv_Click(object sender, RoutedEventArgs e)
                 bool success = RealTimePowerHistoryService.ExportToCsv(saveDialog.FileName);
                 if (success)
                 {
-                    MessageBox.Show(LocalizationService.CurrentLanguage == AppLanguage.English ? $"Successfully exported to:\n{saveDialog.FileName}" : $"已成功匯出歷史日誌至:\n{saveDialog.FileName}", 
+                    MessageBox.Show(LocalizationService.CurrentLanguage == AppLanguage.English ? $"Successfully exported to:\n{saveDialog.FileName}" : $"已成功匯出歷史日誌至:\n{saveDialog.FileName}",
                         LocalizationService.CurrentLanguage == AppLanguage.English ? "Export Success" : "匯出成功", MessageBoxButton.OK, MessageBoxImage.Information);
                 }
                 else
                 {
-                    MessageBox.Show(LocalizationService.CurrentLanguage == AppLanguage.English ? "Export failed due to write permissions." : "匯出失敗，請確認檔案寫入權限。", 
+                    MessageBox.Show(LocalizationService.CurrentLanguage == AppLanguage.English ? "Export failed due to write permissions." : "匯出失敗，請確認檔案寫入權限。",
                         LocalizationService.CurrentLanguage == AppLanguage.English ? "Error" : "錯誤", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
@@ -1321,7 +1332,7 @@ private void BtnExportPowerCsv_Click(object sender, RoutedEventArgs e)
 
         private void BtnClearPowerHistory_Click(object sender, RoutedEventArgs e)
         {
-            var result = MessageBox.Show(LocalizationService.CurrentLanguage == AppLanguage.English ? "Clear all live power and event history logs?" : "確定要清除所有即時功耗與充放電事件紀錄嗎？", 
+            var result = MessageBox.Show(LocalizationService.CurrentLanguage == AppLanguage.English ? "Clear all live power and event history logs?" : "確定要清除所有即時功耗與充放電事件紀錄嗎？",
                 LocalizationService.CurrentLanguage == AppLanguage.English ? "Confirm Clear" : "確認清除", MessageBoxButton.YesNo, MessageBoxImage.Question);
             if (result == MessageBoxResult.Yes)
             {
@@ -1416,7 +1427,7 @@ private void BtnExportData_Click(object sender, RoutedEventArgs e)
         {
             if (_currentReport == null)
             {
-                MessageBox.Show(LocalizationService.CurrentLanguage == AppLanguage.English ? "No battery report data available to export." : "目前尚無可供匯出的電池資料。", 
+                MessageBox.Show(LocalizationService.CurrentLanguage == AppLanguage.English ? "No battery report data available to export." : "目前尚無可供匯出的電池資料。",
                     LocalizationService.CurrentLanguage == AppLanguage.English ? "Info" : "提示", MessageBoxButton.OK, MessageBoxImage.Information);
                 return;
             }
@@ -1434,7 +1445,7 @@ private void BtnExportData_Click(object sender, RoutedEventArgs e)
                 {
                     string json = JsonSerializer.Serialize(_currentReport, new JsonSerializerOptions { WriteIndented = true });
                     File.WriteAllText(saveDialog.FileName, json);
-                    MessageBox.Show(LocalizationService.CurrentLanguage == AppLanguage.English ? $"Successfully exported to:\n{saveDialog.FileName}" : $"已成功匯出至:\n{saveDialog.FileName}", 
+                    MessageBox.Show(LocalizationService.CurrentLanguage == AppLanguage.English ? $"Successfully exported to:\n{saveDialog.FileName}" : $"已成功匯出至:\n{saveDialog.FileName}",
                         LocalizationService.CurrentLanguage == AppLanguage.English ? "Export Success" : "匯出成功", MessageBoxButton.OK, MessageBoxImage.Information);
                 }
                 catch (Exception ex)
@@ -1452,7 +1463,7 @@ private void DisplayReport(BatteryReportData report)
 
             bool isEn = LocalizationService.CurrentLanguage == AppLanguage.English;
             string naText = isEn ? "N/A" : "未提供";
-            string dash = "—";
+            string dash = "-";
 
             // Score & Badge
             bool healthMeasured = metrics.HasBattery && metrics.IsHealthMeasured;
@@ -1527,8 +1538,8 @@ private void DisplayReport(BatteryReportData report)
                 SepSpecMade.Visibility = Visibility.Collapsed;
             }
 
-            TxtReportTime.Text = string.IsNullOrWhiteSpace(report.SystemInfo.ReportTime) 
-                ? $"{DateTime.Now:yyyy-MM-dd HH:mm}" 
+            TxtReportTime.Text = string.IsNullOrWhiteSpace(report.SystemInfo.ReportTime)
+                ? $"{DateTime.Now:yyyy-MM-dd HH:mm}"
                 : report.SystemInfo.ReportTime;
 
             // Bind Lists
diff --git a/README.md b/README.md
index 2012451..546978b 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@
 
 | 格式 | 檔案名稱 | 說明 |
 | :--- | :--- | :--- |
-| **🚀 安裝版** | `WinBatLens_v1.1.7_Setup_x64.exe` | Inno Setup 安裝程式，支援開機啟動設定與乾淨解除安裝。 |
+| **🚀 安裝版** | `WinBatLens_v1.1.7_Setup_x64.exe` | Inno Setup 安裝程式；固定建立開始功能表的啟動／解除安裝捷徑，可自行釘選到開始或工作列。桌面捷徑與開機啟動為預設不勾選的選用項目。 |
 | **📦 免安裝單檔版** | `WinBatLens_v1.1.7_Portable_x64.exe` | 單一可執行檔（Single-File），免安裝、隨開即用。 |
 | **📁 免安裝壓縮包** | `WinBatLens_v1.1.7_Portable_x64.zip` | 包含可執行檔、README 與授權說明的 ZIP 封裝包。 |
 
diff --git a/Services/LocalizationService.cs b/Services/LocalizationService.cs
index c096b9e..4da04a4 100644
--- a/Services/LocalizationService.cs
+++ b/Services/LocalizationService.cs
@@ -25,8 +25,8 @@ public class LocalizationService
 
         private static readonly Dictionary<string, string> ZhTwStrings = new Dictionary<string, string>
         {
-            ["TabVoltageHistory"] = " 🔋 電池電壓紀錄 ",
-            ["VoltageHistoryTitle"] = "🔋 電池電壓紀錄（0–100%）",
+            ["TabVoltageHistory"] = " 電池電壓紀錄 ",
+            ["VoltageHistoryTitle"] = "電池電壓紀錄 (0-100%)",
             ["VoltageHistorySummary"] = "已記錄 {0} / 101 個電量區間，累積 {1} 次電量變化事件",
             ["VoltageHistoryHint"] = "僅顯示電池驅動回報的實測電壓；同一電量未變化時不重複記錄。",
             ["BtnClearVoltageHistory"] = "清除電壓紀錄",
@@ -37,14 +37,14 @@ public class LocalizationService
             ["VoltageLastColumn"] = "最後紀錄",
             ["AppTitle"] = "WinBat Lens - Windows 電池健康度與即時硬體耗電監測",
             ["SubTitle"] = "Windows 電池健康診斷與全系統耗電監測",
-            ["AutoStart"] = "🚀 開機自動啟動",
-            ["BtnOpenReport"] = "📁 開啟 HTML 報告",
-            ["BtnCheck"] = "⚡ 執行電池檢測",
-            ["BtnExportJson"] = "📥 匯出 JSON",
-            ["BtnLanguage"] = "🌐 English",
+            ["AutoStart"] = "開機自動啟動",
+            ["BtnOpenReport"] = "開啟 HTML 報告",
+            ["BtnCheck"] = "執行電池檢測",
+            ["BtnExportJson"] = "匯出 JSON",
+            ["BtnLanguage"] = "English",
             ["HealthTitle"] = "電池健康度 (Health Score)",
             ["HealthSummaryDefault"] = "請點擊右上角「執行電池檢測」按鈕載入最新報告。",
-            ["BatterySpecsTitle"] = "🔋 電池規格參數",
+            ["BatterySpecsTitle"] = "電池規格參數",
             ["SpecName"] = "電池名稱",
             ["SpecMfg"] = "製造商",
             ["SpecChem"] = "化學材質",
@@ -53,32 +53,41 @@ public class LocalizationService
             ["SpecFull"] = "滿電容量",
             ["SpecLoss"] = "容量損耗",
             ["SpecCycles"] = "充放電循環",
-            ["CapacityHistoryTitle"] = "📈 容量歷史紀錄",
+            ["CapacityHistoryTitle"] = "容量歷史紀錄",
             ["ColPeriod"] = "期間",
             ["ColFullCap"] = "滿電容量",
             ["ColDesignCap"] = "設計容量",
             ["ColHealthPct"] = "健康%",
-            ["TabRealTime"] = " ⚡ 全系統硬體功耗分佈 ",
-            ["TabHistoryLogs"] = " 📉 即時功耗與充放電歷史紀錄 ",
-            ["TabDiagnostics"] = " 💡 智慧診斷與維護建議 ",
-            ["TabLifeEstimates"] = " ⏱️ 續航估算表 ",
-            ["TabRecentUsage"] = " 📊 最近使用紀錄 ",
-            ["CardTotalPower"] = "⚡ 電池充放電功率 (實測)",
-            ["CardEstTime"] = "⏱️ 電腦估算剩餘續航時間",
-            ["CardTelemetry"] = "🔋 電池物理狀態 (電壓 / 電流)",
-            ["CardPowerPlan"] = "⚙️ Windows 電源模式",
-            ["WaveformTitle"] = "📈 60 秒即時動態走勢波形圖 (Task Manager Style Live Graph)",
+            ["TabRealTime"] = " 全系統硬體功耗分佈 ",
+            ["TabHistoryLogs"] = " 即時功耗與充放電歷史紀錄 ",
+            ["TabDiagnostics"] = " 智慧診斷與維護建議 ",
+            ["TabLifeEstimates"] = " 續航估算表 ",
+            ["TabRecentUsage"] = " 最近使用紀錄 ",
+            ["CardTotalPower"] = "電池充放電功率 (實測)",
+            ["CardEstTime"] = "電腦估算剩餘續航時間",
+            ["CardTelemetry"] = "電池物理狀態 (電壓 / 電流)",
+            ["CardPowerPlan"] = "Windows 電源模式",
+            ["WaveformTitle"] = "60 秒即時功率走勢",
             ["LegendDischarge"] = "放電 (W)",
             ["LegendCharge"] = "充電 (+W)",
             ["LegendGpu"] = "獨顯 (W)",
-            ["HardwareTitle"] = "💻 硬體實測功耗 (Measured Hardware Power)",
-            ["HwBatteryTelemetry"] = "🔋 電池物理狀態 (電壓 / 電流)",
-            ["HwEnergy"] = "🔋 電池蓄電量 (Wh)",
-            ["HwPowerPlan"] = "⚙️ Windows 運作電源計劃",
-            ["HwDgpu"] = "🎮 獨立顯示卡 (dGPU)",
-            ["BtnExportCsv"] = "📥 匯出 CSV 紀錄",
-            ["BtnClearHistory"] = "🗑️ 清除紀錄",
-            ["HistoryLogHeader"] = "📋 即時動態功耗與充放電事件歷史日誌 (Live Power & Event Logs)",
+            ["HardwareTitle"] = "硬體實測功耗",
+            ["HwBatteryTelemetry"] = "電池物理狀態 (電壓 / 電流)",
+            ["HwEnergy"] = "電池蓄電量 (Wh)",
+            ["HwPowerPlan"] = "Windows 運作電源計劃",
+            ["HwDgpu"] = "獨立顯示卡 (dGPU)",
+            ["HwTelemetrySource"] = "電池類別驅動程式",
+            ["HwPowerPlanState"] = "目前使用中",
+            ["BtnExportCsv"] = "匯出 CSV 紀錄",
+            ["BtnClearHistory"] = "清除紀錄",
+            ["HistoryLogHeader"] = "即時功耗與充放電事件紀錄",
+            ["PowerHistoryEmpty"] = "監測開始後，功耗事件會顯示在這裡。",
+            ["VoltageHistoryEmpty"] = "電量百分比改變且驅動回報實測電壓後，紀錄會顯示在這裡。",
+            ["DiagnosticsEmpty"] = "執行電池檢測後，診斷與維護建議會顯示在這裡。",
+            ["LifeEstimatesEmpty"] = "載入含續航資料的電池報告後，估算結果會顯示在這裡。",
+            ["RecentUsageEmpty"] = "載入含使用紀錄的電池報告後，資料會顯示在這裡。",
+            ["LoadingTitle"] = "正在執行 Windows 電池健康檢測",
+            ["LoadingDetail"] = "powercfg /batteryreport 正在產生並分析最新報告。",
             ["ColTime"] = "時間戳記",
             ["ColEvent"] = "事件類型",
             ["ColPower"] = "放電/充電功率",
@@ -88,10 +97,10 @@ public class LocalizationService
             ["ColDgpu"] = "獨顯負載",
             ["ColScreen"] = "螢幕功耗",
             ["ColSummary"] = "詳細狀態記錄",
-            ["TrayShow"] = "⚡ 開啟 WinBat Lens 主畫面",
-            ["TrayCheck"] = "🔄 執行電池健康檢測",
-            ["TrayAutoStart"] = "🚀 開機自動啟動",
-            ["TrayExit"] = "❌ 結束程式",
+            ["TrayShow"] = "開啟 WinBat Lens 主畫面",
+            ["TrayCheck"] = "執行電池健康檢測",
+            ["TrayAutoStart"] = "開機自動啟動",
+            ["TrayExit"] = "結束程式",
             ["TrayTooltip"] = "WinBat Lens - 電池健康度與即時耗電監測",
             ["TrayBalloonTitle"] = "WinBat Lens 已縮小至托盤",
             ["TrayBalloonText"] = "程式將在背景持續為您進行即時耗電與電池狀態監測。",
@@ -105,8 +114,8 @@ public class LocalizationService
 
         private static readonly Dictionary<string, string> EnUsStrings = new Dictionary<string, string>
         {
-            ["TabVoltageHistory"] = " 🔋 Battery Voltage History ",
-            ["VoltageHistoryTitle"] = "🔋 Battery Voltage by Charge Level (0–100%)",
+            ["TabVoltageHistory"] = " Battery Voltage History ",
+            ["VoltageHistoryTitle"] = "Battery Voltage by Charge Level (0-100%)",
             ["VoltageHistorySummary"] = "Recorded {0} / 101 charge-level ranges, {1} percentage-change events",
             ["VoltageHistoryHint"] = "Only battery-driver measurements are shown; the same percentage is not recorded again until it changes.",
             ["BtnClearVoltageHistory"] = "Clear Voltage History",
@@ -117,14 +126,14 @@ public class LocalizationService
             ["VoltageLastColumn"] = "Last recorded",
             ["AppTitle"] = "WinBat Lens - Windows Battery Health & Real-Time Hardware Power Monitor",
             ["SubTitle"] = "Windows Battery Health Diagnostics & Full System Power Monitor",
-            ["AutoStart"] = "🚀 Launch on Windows Startup",
-            ["BtnOpenReport"] = "📁 Open HTML Report",
-            ["BtnCheck"] = "⚡ Run Battery Check",
-            ["BtnExportJson"] = "📥 Export JSON",
-            ["BtnLanguage"] = "🌐 繁體中文",
+            ["AutoStart"] = "Launch on Windows Startup",
+            ["BtnOpenReport"] = "Open HTML Report",
+            ["BtnCheck"] = "Run Battery Check",
+            ["BtnExportJson"] = "Export JSON",
+            ["BtnLanguage"] = "繁體中文",
             ["HealthTitle"] = "Battery Health Score",
             ["HealthSummaryDefault"] = "Click 'Run Battery Check' in the top right to load report.",
-            ["BatterySpecsTitle"] = "🔋 Battery Specifications",
+            ["BatterySpecsTitle"] = "Battery Specifications",
             ["SpecName"] = "Battery Name",
             ["SpecMfg"] = "Manufacturer",
             ["SpecChem"] = "Chemistry",
@@ -133,32 +142,41 @@ public class LocalizationService
             ["SpecFull"] = "Full Charge Capacity",
             ["SpecLoss"] = "Capacity Loss",
             ["SpecCycles"] = "Cycle Count",
-            ["CapacityHistoryTitle"] = "📈 Capacity Degradation History",
+            ["CapacityHistoryTitle"] = "Capacity Degradation History",
             ["ColPeriod"] = "Period",
             ["ColFullCap"] = "Full Charge Cap",
             ["ColDesignCap"] = "Design Cap",
             ["ColHealthPct"] = "Health %",
-            ["TabRealTime"] = " ⚡ Hardware Power Breakdown ",
-            ["TabHistoryLogs"] = " 📉 Power & Event History Logs ",
-            ["TabDiagnostics"] = " 💡 Smart Diagnostics & Tips ",
-            ["TabLifeEstimates"] = " ⏱️ Battery Life Estimates ",
-            ["TabRecentUsage"] = " 📊 Recent Battery Usage ",
-            ["CardTotalPower"] = "⚡ Battery Charge & Discharge (measured)",
-            ["CardEstTime"] = "⏱️ Estimated Battery Life Remaining",
-            ["CardTelemetry"] = "🔋 Battery Hardware State (V / A)",
-            ["CardPowerPlan"] = "⚙️ Active Windows Power Scheme",
-            ["WaveformTitle"] = "📈 60-Second Real-Time Power & Load Waveform Graph",
+            ["TabRealTime"] = " Hardware Power Breakdown ",
+            ["TabHistoryLogs"] = " Power & Event History Logs ",
+            ["TabDiagnostics"] = " Smart Diagnostics & Tips ",
+            ["TabLifeEstimates"] = " Battery Life Estimates ",
+            ["TabRecentUsage"] = " Recent Battery Usage ",
+            ["CardTotalPower"] = "Battery Charge & Discharge (measured)",
+            ["CardEstTime"] = "Estimated Battery Life Remaining",
+            ["CardTelemetry"] = "Battery Hardware State (V / A)",
+            ["CardPowerPlan"] = "Active Windows Power Scheme",
+            ["WaveformTitle"] = "60-Second Real-Time Power Waveform",
             ["LegendDischarge"] = "Discharge (W)",
             ["LegendCharge"] = "Charge (+W)",
             ["LegendGpu"] = "dGPU (W)",
-            ["HardwareTitle"] = "💻 Measured Hardware Power",
-            ["HwBatteryTelemetry"] = "🔋 Battery Telemetry (V / A)",
-            ["HwEnergy"] = "🔋 Battery Energy (Wh)",
-            ["HwPowerPlan"] = "⚙️ Windows Power Scheme",
-            ["HwDgpu"] = "🎮 Discrete GPU (dGPU)",
-            ["BtnExportCsv"] = "📥 Export CSV",
-            ["BtnClearHistory"] = "🗑️ Clear History",
-            ["HistoryLogHeader"] = "📋 Real-Time Dynamic Power & Charge/Discharge Event Logs",
+            ["HardwareTitle"] = "Measured Hardware Power",
+            ["HwBatteryTelemetry"] = "Battery Telemetry (V / A)",
+            ["HwEnergy"] = "Battery Energy (Wh)",
+            ["HwPowerPlan"] = "Windows Power Scheme",
+            ["HwDgpu"] = "Discrete GPU (dGPU)",
+            ["HwTelemetrySource"] = "Battery class driver",
+            ["HwPowerPlanState"] = "Active scheme",
+            ["BtnExportCsv"] = "Export CSV",
+            ["BtnClearHistory"] = "Clear History",
+            ["HistoryLogHeader"] = "Power and Charge/Discharge Event History",
+            ["PowerHistoryEmpty"] = "Power events will appear here after monitoring begins.",
+            ["VoltageHistoryEmpty"] = "Records appear after charge level changes and the battery driver reports a measured voltage.",
+            ["DiagnosticsEmpty"] = "Run a battery check to see diagnostics and maintenance guidance.",
+            ["LifeEstimatesEmpty"] = "Load a battery report with runtime data to see estimates here.",
+            ["RecentUsageEmpty"] = "Load a battery report with usage records to see data here.",
+            ["LoadingTitle"] = "Running Windows Battery Health Check",
+            ["LoadingDetail"] = "powercfg /batteryreport is generating and analyzing the latest report.",
             ["ColTime"] = "Timestamp",
             ["ColEvent"] = "Event Type",
             ["ColPower"] = "Power (W)",
@@ -168,10 +186,10 @@ public class LocalizationService
             ["ColDgpu"] = "dGPU Load",
             ["ColScreen"] = "Screen Power",
             ["ColSummary"] = "Log Details",
-            ["TrayShow"] = "⚡ Open WinBat Lens",
-            ["TrayCheck"] = "🔄 Run Battery Health Check",
-            ["TrayAutoStart"] = "🚀 Launch on Windows Startup",
-            ["TrayExit"] = "❌ Exit",
+            ["TrayShow"] = "Open WinBat Lens",
+            ["TrayCheck"] = "Run Battery Health Check",
+            ["TrayAutoStart"] = "Launch on Windows Startup",
+            ["TrayExit"] = "Exit",
             ["TrayTooltip"] = "WinBat Lens - Battery Health & Live Power Monitor",
             ["TrayBalloonTitle"] = "WinBat Lens minimized to tray",
             ["TrayBalloonText"] = "Power and battery monitoring continues in the background.",
@@ -199,8 +217,8 @@ public static string Get(string key)
         /// </summary>
         public static void ToggleLanguage()
         {
-            CurrentLanguage = CurrentLanguage == AppLanguage.TraditionalChinese 
-                ? AppLanguage.English 
+            CurrentLanguage = CurrentLanguage == AppLanguage.TraditionalChinese
+                ? AppLanguage.English
                 : AppLanguage.TraditionalChinese;
         }
     }
diff --git a/installer/WinBatLens.iss b/installer/WinBatLens.iss
index 25719c5..00bc7f7 100644
--- a/installer/WinBatLens.iss
+++ b/installer/WinBatLens.iss
@@ -1,8 +1,10 @@
 ; WinBat Lens Inno Setup Script
 #define MyAppName "WinBat Lens"
 #define MyAppPublisher "WinBat Lens Team"
+#define MyAppURL "https://github.com/nojackno2-ctrl/WinBat-Lens"
 #define MyAppExeName "WinBatLens.exe"
 #define MyAppId "{{D2B3F0E1-8E4B-4D2A-9A2C-5F1B3E7A902A}"
+#define MyAppUserModelId "nojackno2.WinBatLens"
 #define MyPublishExe "..\bin\Release\net10.0-windows\win-x64\publish\WinBatLens.exe"
 
 ; Named kernel objects the running app owns. Both are part of a cross-version
@@ -25,29 +27,45 @@
 AppId={#MyAppId}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
+AppVerName={#MyAppName} v{#MyAppVersion}
 AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}/issues
+AppUpdatesURL={#MyAppURL}/releases
+AppReadmeFile={app}\README.md
+VersionInfoVersion={#MyAppVersion}.0
+VersionInfoCompany={#MyAppPublisher}
+VersionInfoDescription={#MyAppName} installer
+VersionInfoTextVersion={#MyAppVersion}
+VersionInfoProductVersion={#MyAppVersion}.0
+VersionInfoProductName={#MyAppName}
 DefaultDirName={autopf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 LicenseFile=..\LICENSE
 SetupIconFile=..\app_icon.ico
 UninstallDisplayIcon={app}\{#MyAppExeName}
+UninstallDisplayName={#MyAppName} v{#MyAppVersion}
+Uninstallable=yes
 OutputDir=..\dist
 OutputBaseFilename=WinBatLens_v{#MyAppVersion}_Setup_x64
 Compression=lzma2/ultra64
 SolidCompression=yes
 WizardStyle=modern
-; The Start Menu folder is fixed to DefaultGroupName; whether shortcuts get
-; created is controlled by the "startmenuicon" task on the Tasks page instead.
+; Always create an application and uninstall shortcut in this stable folder so
+; Windows Search and the user's manual Pin to Start/Taskbar actions can find it.
 DisableProgramGroupPage=yes
 ShowLanguageDialog=yes
+PrivilegesRequired=admin
 PrivilegesRequiredOverridesAllowed=commandline dialog
 AppMutex={#MyAppMutex}
 UsePreviousAppDir=yes
 UsePreviousGroup=yes
 UsePreviousTasks=yes
 CreateUninstallRegKey=yes
+SetupLogging=yes
+UninstallLogging=yes
 CloseApplications=yes
-CloseApplicationsFilter=*.exe
+CloseApplicationsFilter={#MyAppExeName}
 RestartApplications=no
 
 [Languages]
@@ -58,9 +76,8 @@ Name: "chinesetrad"; MessagesFile: "ChineseTraditional.isl"
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
-Name: "startmenuicon"; Description: "{cm:CreateStartMenuIcon}"; GroupDescription: "{cm:AdditionalIcons}"
-Name: "autostart"; Description: "{cm:AutoStartTask}"; GroupDescription: "{cm:StartupOptions}"
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "autostart"; Description: "{cm:AutoStartTask}"; GroupDescription: "{cm:StartupOptions}"; Flags: unchecked
 
 [Files]
 Source: "{#MyPublishExe}"; DestDir: "{app}"; Flags: ignoreversion
@@ -68,15 +85,13 @@ Source: "..\README.md"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\LICENSE"; DestDir: "{app}"; Flags: ignoreversion
 
 [Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: startmenuicon
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"; Tasks: startmenuicon
-Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; WorkingDir: "{app}"; AppUserModelID: "{#MyAppUserModelId}"
+Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; WorkingDir: "{app}"; AppUserModelID: "{#MyAppUserModelId}"; Tasks: desktopicon
 
 [CustomMessages]
-chinesetrad.CreateStartMenuIcon=建立開始功能表捷徑
 chinesetrad.AutoStartTask=開機時自動於背景啟動 WinBat Lens
 chinesetrad.StartupOptions=啟動選項：
-english.CreateStartMenuIcon=Create a &Start Menu shortcut
 english.AutoStartTask=Automatically start WinBat Lens in the background on Windows startup
 english.StartupOptions=Startup options:
 
diff --git a/tests/WinBatLens.Tests/InstallerContractTests.cs b/tests/WinBatLens.Tests/InstallerContractTests.cs
new file mode 100644
index 0000000..8063373
--- /dev/null
+++ b/tests/WinBatLens.Tests/InstallerContractTests.cs
@@ -0,0 +1,73 @@
+using Xunit;
+
+namespace WinBatLens.Tests;
+
+public sealed class InstallerContractTests
+{
+    [Fact]
+    public void InstallerProvidesConsistentUpgradeAndDiagnosticsMetadata()
+    {
+        var script = ReadInstallerScript();
+
+        foreach (var directive in new[]
+        {
+            "DisableProgramGroupPage=yes",
+            "UsePreviousAppDir=yes",
+            "UsePreviousGroup=yes",
+            "UsePreviousTasks=yes",
+            "CreateUninstallRegKey=yes",
+            "SetupLogging=yes",
+            "UninstallLogging=yes",
+            "CloseApplicationsFilter={#MyAppExeName}",
+            "RestartApplications=no"
+        })
+        {
+            Assert.Contains(directive, script.Lines, StringComparer.Ordinal);
+        }
+
+        Assert.Contains("AppPublisherURL={#MyAppURL}", script.Lines, StringComparer.Ordinal);
+        Assert.Contains("AppSupportURL={#MyAppURL}/issues", script.Lines, StringComparer.Ordinal);
+        Assert.Contains("AppUpdatesURL={#MyAppURL}/releases", script.Lines, StringComparer.Ordinal);
+    }
+
+    [Fact]
+    public void StartMenuAndOptionalShortcutPolicyIsPreserved()
+    {
+        var script = ReadInstallerScript();
+        var startMenuShortcut = Assert.Single(script.Lines, line =>
+            line.StartsWith("Name: \"{group}\\{#MyAppName}\";", StringComparison.Ordinal));
+        var uninstallShortcut = Assert.Single(script.Lines, line =>
+            line.Contains("{cm:UninstallProgram,{#MyAppName}}", StringComparison.Ordinal));
+        var desktopTask = Assert.Single(script.Lines, line =>
+            line.StartsWith("Name: \"desktopicon\";", StringComparison.Ordinal));
+        var startupTask = Assert.Single(script.Lines, line =>
+            line.StartsWith("Name: \"autostart\";", StringComparison.Ordinal));
+
+        Assert.DoesNotContain("Tasks:", startMenuShortcut, StringComparison.Ordinal);
+        Assert.DoesNotContain("Tasks:", uninstallShortcut, StringComparison.Ordinal);
+        Assert.Contains("WorkingDir: \"{app}\"", startMenuShortcut, StringComparison.Ordinal);
+        Assert.Contains("AppUserModelID:", startMenuShortcut, StringComparison.Ordinal);
+        Assert.Contains("Flags: unchecked", desktopTask, StringComparison.Ordinal);
+        Assert.Contains("Flags: unchecked", startupTask, StringComparison.Ordinal);
+        Assert.DoesNotContain(script.Lines, line => line.StartsWith("Name: \"startmenuicon\";", StringComparison.Ordinal));
+    }
+
+    private static (string Content, string[] Lines) ReadInstallerScript()
+    {
+        var repositoryRoot = FindRepositoryRoot();
+        var content = File.ReadAllText(Path.Combine(repositoryRoot, "installer", "WinBatLens.iss"));
+        return (content, content.Split(["\r\n", "\n"], StringSplitOptions.RemoveEmptyEntries));
+    }
+
+    private static string FindRepositoryRoot()
+    {
+        var directory = new DirectoryInfo(AppContext.BaseDirectory);
+        while (directory is not null && !File.Exists(Path.Combine(directory.FullName, "WinBatLens.csproj")))
+        {
+            directory = directory.Parent;
+        }
+
+        Assert.NotNull(directory);
+        return directory.FullName;
+    }
+}