Merge branch 'feature/v1.2.2-theme-expansion'

feat: set Night Blue and Indigo Violet author to Julia Moon
docs: add forge-post for v1.2.2
2026-05-06 14:07:07 +02:00 · 2026-05-06 14:06:14 +02:00 · 2026-05-06 14:04:22 +02:00 · 2026-05-06 14:02:12 +02:00 · 2026-05-06 14:01:42 +02:00 · 2026-05-06 14:01:23 +02:00
94 changed files with 5688 additions and 1855 deletions
@@ -0,0 +1,12 @@
+---
+subtitle: "Theme Foundation"
+versionsnatur: "Major-UI-Cycle"
+---
+- Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove
+- Settings öffnet jetzt eine Card-Grid-Übersicht — Klick auf eine Card führt in den Detail-View, Breadcrumb und ESC zurück zur Übersicht
+- Themes-Tab mit Mini-Mockup pro Theme, Live-Switch beim Klick
+- Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten Start automatisch abgelegt
+- Optional pro Theme eigene Chat-Channel-Farben mit Übernehmen/Behalten-Banner — niemals automatisch überschrieben
+- Plugin-Icon zum Hellion-Forge-Hammer gewechselt
+- Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2 Klassik in Settings → Themes
+- Anleitung zum Schreiben eigener Themes: `docs/THEME-AUTHORING.md`
@@ -0,0 +1,16 @@
+---
+subtitle: "Layout Refresh"
+versionsnatur: "Major-UI-Cycle"
+---
+- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale Akzent-Pill markiert den aktiven Tab
+- Top-Tabs bekommen eine Akzent-Underline statt Background-Fill am aktiven Tab
+- Pro Tab eigenes Icon wählbar in Einstellungen → Tabs (FontAwesome-Pool)
+- Auto-Tell-Tabs sind jetzt visuell unterscheidbar: jeder Tell-Partner bekommt ein eigenes Icon (envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84 Kombinationen, gleicher Partner ergibt konsistent dieselbe
+- Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft, 2-Sekunden-Cycle, deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0)
+- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge, Tab/Message-Counter, Auto-Tell-Counter, Plugin-Version. Update 1×/Sek
+- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter Trenner. `Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler
+- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn Filter-relevante Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert. Persistente und Auto-Tell-Tabs überleben beide
+- Bug-Fix: Hellion-Schrift (Exo 2) blockt die Schriftgröße nicht mehr — 4K-User können hochskalieren
+- Migration v14 → v15: alte Theme-Felder entfernt, alle anderen Settings bleiben
+
+Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker) folgt in v1.3.0.
@@ -0,0 +1,16 @@
+---
+subtitle: "Settings Cleanup"
+versionsnatur: "UX-Polish-Cycle"
+---
+- Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede Card hat einen kurzen Untertitel — kein Raten mehr wo eine Setting steckt
+- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften & Farben** (Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung** (Aufbewahrung, Cleanup, Export, DB-Viewer, Advanced-Tools — vorher zwischen Datenschutz und Datenbank verteilt)
+- Datenschutz fokussiert sich jetzt auf eine Aufgabe: den Privacy-Filter
+- Der Auto-Tell-Tabs-History-Preload-Slider ist von Datenschutz nach Chat → Auto-Tell-Tabs umgezogen
+- KeybindMode wohnt jetzt unter Allgemein → Eingabe statt unter Sprache
+- Vier tote Schema-Felder entfernt (alle obsolet seit der Theme-Engine in v1.1.0): `Stilüberschreiben`-Toggle, `Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes `ShowThemeQuickPicker`
+- Migration v15 → v16: alter `WindowAlpha`-Wert wird automatisch nach `Theme & Layout → Fenster-Style → Fenster-Transparenz` gemappt (nur wenn der Slider noch auf Default 0.85 stand, sonst gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter `pluginConfigs/HellionChat.json.pre-v16-backup`. User die `Stilüberschreiben` aktiv hatten sehen einen einmaligen Hinweis-Toast
+- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+ standardmäßig hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf konservativere 2500
+- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der First-Run-Wizard hat keine Preset-Wahl)
+- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü (oben rechts in der Titelleiste) bietet eigene Overrides für Deckkraft, Hintergrund-Blur, Anpinnen und Durchklick — die haben Vorrang über unseren Slider für das jeweilige Fenster
+
+Pure UX-Polish, keine neuen Features. Nächster Cycle (v1.3.0): Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker) wie ursprünglich geplant.
@@ -0,0 +1,13 @@
+---
+subtitle: "Theme Expansion"
+versionsnatur: "Theme-Pack-Patch"
+---
+- Vier neue Built-in-Themes verlängern die Auswahl im Picker — keine Engine-Änderung, keine Settings angefasst, einfach mehr Farboptionen
+- **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral gehalten damit es sich nicht mit den Brand-Themes beißt
+- **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für Aurora-Glitter-Stimmung. Schwester von Event Horizon, aber dunkler und dichter; der Türkis-Akzent hält die beiden klar auseinander
+- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion Forge bekommt ein eigenes Theme im Plugin selbst — Schwester von Hellion Arctic, aber grüner und wärmer statt kaltem Cyan
+- **Hellion Spectrum** — Farbenblind-sichere Channel-Farben (Deuteranopie/Protanopie) auf Basis der Wong/Okabe-Ito-Palette. Channel-Identität bleibt erhalten (Tell pink, Yell gelb, Shout orange, Party blau, FC grün); die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche klar trennbar bleibt. Deckt rund 99 % aller CVD-Fälle ab
+- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene Custom-Themes laufen unverändert weiter
+- Theme-Katalog wächst damit von fünf auf neun Built-ins
+
+Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für Blau-Gelb-Schwäche) kann später nachgeliefert werden, falls Bedarf kommt.
@@ -39,10 +39,10 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2

      - name: Setup .NET 10
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7  # v5.2.0
        with:
          dotnet-version: 10.0.x

@@ -55,7 +55,7 @@ jobs:
          Expand-Archive -Force -Path dalamud.zip -DestinationPath $hooks

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
+        uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7  # v4.35.3
        with:
          languages: csharp
          build-mode: manual
@@ -68,7 +68,7 @@ jobs:
        run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore

      - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@v4
+        uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7  # v4.35.3
        with:
          category: /language:csharp

@@ -79,15 +79,15 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
+        uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7  # v4.35.3
        with:
          languages: actions
          build-mode: none

      - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@v4
+        uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7  # v4.35.3
        with:
          category: /language:actions
@@ -0,0 +1,226 @@
+name: Forge Announce
+
+# Triggered when a vX.Y.Z tag is pushed. Reads .github/forge-posts/<tag>.md
+# (Frontmatter + DE bullet body) and the matching English block from
+# HellionChat/HellionChat.yaml, builds a Discord-Webhook embed and posts
+# it to the Hellion Forge #changelog channel.
+#
+# Decoupled from release.yml: a fail here does not block the GitHub
+# release, and a fail there does not block the announce. Spec lives in
+# the Vault under "Hellion Chat Forge-Auto-Announce Spec".
+#
+# Security: the only user-controlled inputs that enter run-steps are the
+# tag name and the frontmatter values from a repo-internal markdown file.
+# Tag name is read via env: (TAG_NAME, $env:TAG_NAME) and validated against
+# ^v\d+\.\d+\.\d+$ before any string interpolation. Frontmatter values are
+# parsed by regex with explicit length caps. No webhook event payload data
+# (issue titles, PR bodies, commit messages, etc.) flows into run-steps.
+
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Existing tag to (re)post, e.g. v1.1.0'
+        required: true
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  announce:
+    name: Post changelog to Hellion Forge
+    runs-on: ubuntu-latest
+    # The DISCORD_FORGE_WEBHOOK secret lives under Settings → Environments
+    # → Webhook (case-sensitive). Without this declaration the secret is
+    # not in scope for the job.
+    environment: Webhook
+    timeout-minutes: 5
+
+    steps:
+      # On push:tags github.ref points at the tag commit; on workflow_dispatch
+      # the user supplies the tag explicitly. Always check out that tag so
+      # the yaml + forge-posts file are read from the tagged tree, not main.
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
+        with:
+          ref: ${{ github.event.inputs.tag || github.ref }}
+
+      # Build embed-payload as a JSON file on disk. PowerShell-Core (pwsh)
+      # ships pre-installed on ubuntu-latest so we get the same scripting
+      # patterns release.yml uses on windows-latest. Tag is read via env: to
+      # treat it as a string variable rather than inline shell text, and
+      # validated against the semver regex before any interpolation.
+      - name: Build embed payload
+        id: build
+        shell: pwsh
+        env:
+          TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
+        run: |
+          $tag = $env:TAG_NAME
+          if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
+              throw "V1: Refusing to announce non-semver tag: $tag"
+          }
+          $version = $tag.Substring(1)
+
+          # ---------- Forge-Post-Datei lesen ----------
+          $forgePath = ".github/forge-posts/$tag.md"
+          if (-not (Test-Path $forgePath)) {
+              throw "V2: Forge-Post-Datei für $tag fehlt unter .github/forge-posts/. Datei vor dem Tag anlegen, dann Tag re-pushen oder workflow_dispatch."
+          }
+          $forgeRaw = Get-Content -Path $forgePath -Raw
+
+          # Frontmatter (--- … ---) am Datei-Anfang
+          if ($forgeRaw -notmatch '(?s)\A---\s*\r?\n(.*?)\r?\n---\s*\r?\n(.*)\z') {
+              throw "V3: Frontmatter (---) fehlt oder ist defekt in $forgePath"
+          }
+          $fmText = $matches[1]
+          $deBody = $matches[2].Trim()
+
+          $subtitle = $null
+          $versionsnatur = $null
+          foreach ($line in ($fmText -split "`r?`n")) {
+              if ($line -match '^subtitle:\s*"?([^"]*)"?\s*$')      { $subtitle = $matches[1] }
+              if ($line -match '^versionsnatur:\s*"?([^"]*)"?\s*$') { $versionsnatur = $matches[1] }
+          }
+          if ([string]::IsNullOrWhiteSpace($subtitle))      { throw "V3: Frontmatter-Feld 'subtitle' fehlt in $forgePath" }
+          if ([string]::IsNullOrWhiteSpace($versionsnatur)) { throw "V3: Frontmatter-Feld 'versionsnatur' fehlt in $forgePath" }
+          if ($subtitle.Length      -gt 60) { throw "V4: Frontmatter-Feld 'subtitle' überschreitet Limit ($($subtitle.Length) Char, max 60)" }
+          if ($versionsnatur.Length -gt 40) { throw "V4: Frontmatter-Feld 'versionsnatur' überschreitet Limit ($($versionsnatur.Length) Char, max 40)" }
+          if ([string]::IsNullOrWhiteSpace($deBody)) { throw "V3: DE-Body fehlt in $forgePath" }
+
+          # ---------- EN-Block aus HellionChat.yaml ziehen ----------
+          # 1:1 Pattern aus release.yml — gleicher Header-Marker, gleiches
+          # Trailer-Verhalten. Bei Drift die zwei Workflows synchron halten.
+          $yamlPath = "HellionChat/HellionChat.yaml"
+          $raw = Get-Content -Path $yamlPath -Raw
+          $marker = "changelog: |-"
+          $idx = $raw.IndexOf($marker)
+          if ($idx -lt 0) { throw "V5: changelog-Block nicht gefunden in $yamlPath" }
+          $afterMarker = $raw.Substring($idx + $marker.Length)
+          $changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
+              if ($_ -match '^  ') { $_.Substring(2) } else { $_ }
+          }) -join "`n"
+
+          $header = "**Hellion Chat $version"
+          $start = $changelogBody.IndexOf($header)
+          if ($start -lt 0) {
+              throw "V5: No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging."
+          }
+          $rest = $changelogBody.Substring($start)
+          $nextHdr = $rest.IndexOf("`n`n**Hellion Chat ", 1)
+          $trailer = $rest.IndexOf("`n`n---")
+          if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
+              $enBlock = $rest.Substring(0, $nextHdr).TrimEnd()
+          } elseif ($trailer -ge 0) {
+              $enBlock = $rest.Substring(0, $trailer).TrimEnd()
+          } else {
+              $enBlock = $rest.TrimEnd()
+          }
+
+          # ---------- Char-Cap-Check (5500 Total auf title + description + footer) ----------
+          $title = "Hellion Chat $version — $subtitle"
+          $description = "**Deutsch**`n`n$deBody`n`n**English**`n`n$enBlock"
+          $footerText = "Hellion Forge · $versionsnatur"
+          $totalChars = $title.Length + $description.Length + $footerText.Length
+          if ($totalChars -gt 5500) {
+              throw "V6: Total char count $totalChars exceeds 5500 limit. Major-Release detected — please post manually via Bot/Multi-Embed (see forge style §8). Forge-Auto-Announce stays off for this tag."
+          }
+          Write-Host "Char-Cap OK: $totalChars / 5500"
+
+          # ---------- Embed-Payload bauen ----------
+          $payload = [ordered]@{
+              username = "Forge Herald"
+              avatar_url = "https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/icon.png"
+              content = "<@&1500489631555260446>"
+              allowed_mentions = [ordered]@{
+                  parse = @()
+                  roles = @("1500489631555260446")
+              }
+              embeds = @(
+                  [ordered]@{
+                      title = $title
+                      url = "https://github.com/JonKazama-Hellion/HellionChat/releases/tag/$tag"
+                      color = 12730636
+                      description = $description
+                      footer = [ordered]@{ text = $footerText }
+                      timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
+                  }
+              )
+          }
+
+          $payloadJson = $payload | ConvertTo-Json -Depth 8 -Compress
+          # Ausgabe-Datei ohne trailing newline für sauberes curl --data-binary @-
+          [System.IO.File]::WriteAllText("$PWD/embed-payload.json", $payloadJson, [System.Text.UTF8Encoding]::new($false))
+
+          Write-Host "Payload size: $($payloadJson.Length) chars"
+          Write-Host "Embed title:  $title"
+          Write-Host "Embed footer: $footerText"
+
+      # POST to the Hellion Forge changelog webhook. curl from PowerShell-Core
+      # so we can pipe the payload via stdin (--data-binary @-) and keep
+      # secrets out of process arg lists. One retry on 5xx, hard fail on 4xx.
+      - name: POST to Hellion Forge webhook
+        shell: pwsh
+        env:
+          DISCORD_FORGE_WEBHOOK: ${{ secrets.DISCORD_FORGE_WEBHOOK }}
+        run: |
+          if ([string]::IsNullOrEmpty($env:DISCORD_FORGE_WEBHOOK)) {
+              throw "V7: DISCORD_FORGE_WEBHOOK secret is empty. Check Settings → Environments → Webhook."
+          }
+
+          $payloadFile = "$PWD/embed-payload.json"
+          if (-not (Test-Path $payloadFile)) {
+              throw "Embed payload file missing — previous step did not produce embed-payload.json"
+          }
+
+          $maxAttempts = 2
+          $attempt = 0
+          while ($attempt -lt $maxAttempts) {
+              $attempt++
+              Write-Host "POST attempt $attempt of $maxAttempts"
+              $tmpResp = "$PWD/.webhook-response"
+              $tmpHeaders = "$PWD/.webhook-headers"
+              # --silent suppresses progress; --show-error prints errors so
+              # the workflow log shows what happened. -w prints HTTP status
+              # to stdout for inspection. -o captures body for diagnosis,
+              # -D captures headers.
+              $rawStatus = Get-Content $payloadFile -Raw |
+                  curl --silent --show-error `
+                       --header 'Content-Type: application/json' `
+                       --data-binary '@-' `
+                       -D $tmpHeaders `
+                       -o $tmpResp `
+                       -w '%{http_code}' `
+                       "$env:DISCORD_FORGE_WEBHOOK"
+              $status = [int]$rawStatus
+              Write-Host "HTTP status: $status"
+
+              if ($status -ge 200 -and $status -lt 300) {
+                  Write-Host "Forge announce POST succeeded."
+                  exit 0
+              }
+
+              $bodySnippet = ""
+              if (Test-Path $tmpResp) {
+                  $bodySnippet = (Get-Content $tmpResp -Raw -ErrorAction SilentlyContinue)
+                  if ($bodySnippet.Length -gt 500) { $bodySnippet = $bodySnippet.Substring(0, 500) + " …" }
+              }
+
+              if ($status -ge 400 -and $status -lt 500) {
+                  # E2: 4xx is permanent — webhook revoked, channel deleted,
+                  # payload malformed. No retry.
+                  throw "E2: Discord-Webhook returned permanent $status. Body: $bodySnippet"
+              }
+
+              # E1: 5xx (or transport-level fail with status 0) — wait + retry once
+              if ($attempt -lt $maxAttempts) {
+                  Write-Host "Transient $status — sleeping 30s before retry."
+                  Start-Sleep -Seconds 30
+              } else {
+                  throw "E1: Discord-Webhook returned transient $status after $maxAttempts attempts. Body: $bodySnippet"
+              }
+          }
@@ -11,6 +11,10 @@
 .vscode/
 scripts/

+# Local test project (stays out of the published plugin repo;
+# pure-function safety net for refactor cycles)
+HellionChat.Tests/
+
 # Packaging
 pack/

@@ -1,48 +1,98 @@
-# Code of conduct
+# Code of Conduct

-HellionChat is a small hobby project. The contributor base is tiny and
-the moderation overhead I can afford is equally small, so this document
-is short and direct.
+## A Note on This Project

-## What I expect from contributors
+HellionChat is a one-person side project developed under Hellion Forge.
+I maintain this in my spare time, which means replies can take a few
+days. Please do not escalate just because a thread is quiet.

- Be respectful in issues, pull requests, discussions and any other
-  project space (Discord, email).
- Keep feedback focused on the code, the design or the documentation.
-  Critique the work, not the person.
- Assume good intent. People come from different backgrounds, time
-  zones and skill levels. A clarifying question is almost always a
-  better first move than an accusation.
- Stay on topic. This project is about a Dalamud chat plugin. Off-topic
-  arguments belong elsewhere.
- Respect that I maintain this in my spare time. Replies can take a
-  few days. Please do not escalate just because a thread is quiet.
+When in doubt, assume good intent. Contributors come from different
+backgrounds, time zones and skill levels. A clarifying question is
+almost always a better first move than an accusation.

-## What is not welcome
+Please also keep discussions on topic. This project is about a Dalamud
+chat plugin. Off-topic arguments belong elsewhere.

- Personal attacks, slurs, doxxing, sustained disruption of threads.
- Unsolicited private contact after I have asked someone to stop.
- Sharing of private conversations without consent.
- Any content that would put other contributors or end users at risk.
+---

-## Scope
+## Our Pledge

-This applies to every space the project owns or that I run on its
-behalf: the GitHub repository, GitHub Discussions, project-related
-Discord conversations and the maintainer email address listed in
-`SECURITY.md`.
+We pledge to make our community welcoming, safe, and equitable for all.

-It also applies when someone is identifiably representing the project
-in another space, for example posting as a HellionChat maintainer in
-the Dalamud Discord.
+We are committed to fostering an environment that respects and promotes
+the dignity, rights, and contributions of all individuals, regardless
+of characteristics including race, ethnicity, caste, color, age,
+physical characteristics, neurodiversity, disability, sex or gender,
+gender identity or expression, sexual orientation, language, philosophy
+or religion, national or social origin, socio-economic position, level
+of education, or other status. The same privileges of participation are
+extended to everyone who participates in good faith and in accordance
+with this Covenant.
+
+## Encouraged Behaviors
+
+While acknowledging differences in social norms, we all strive to meet
+our community's expectations for positive behavior. We also understand
+that our words and actions may be interpreted differently than we intend
+based on culture, background, or native language.
+
+With these considerations in mind, we agree to behave mindfully toward
+each other and act in ways that center our shared values, including:
+
+1. Respecting the **purpose of our community**, our activities, and our
+   ways of gathering.
+2. Engaging **kindly and honestly** with others.
+3. Respecting **different viewpoints** and experiences.
+4. **Taking responsibility** for our actions and contributions.
+5. Gracefully giving and accepting **constructive feedback**.
+6. Committing to **repairing harm** when it occurs.
+7. Behaving in other ways that promote and sustain the **well-being of
+   our community**.
+
+## Restricted Behaviors
+
+We agree to restrict the following behaviors in our community.
+Instances, threats, and promotion of these behaviors are violations of
+this Code of Conduct.
+
+1. **Harassment.** Violating explicitly expressed boundaries or engaging
+   in unnecessary personal attention after any clear request to stop.
+2. **Character attacks.** Making insulting, demeaning, or pejorative
+   comments directed at a community member or group of people.
+3. **Stereotyping or discrimination.** Characterizing anyone's
+   personality or behavior on the basis of immutable identities or
+   traits.
+4. **Sexualization.** Behaving in a way that would generally be
+   considered inappropriately intimate in the context or purpose of the
+   community.
+5. **Violating confidentiality.** Sharing or acting on someone's
+   personal or private information without their permission.
+6. **Endangerment.** Causing, encouraging, or threatening violence or
+   other harm toward any person or group.
+7. Behaving in other ways that **threaten the well-being** of our
+   community.
+
+### Other Restrictions
+
+1. **Misleading identity.** Impersonating someone else for any reason,
+   or pretending to be someone else to evade enforcement actions.
+2. **Failing to credit sources.** Not properly crediting the sources of
+   content you contribute.
+3. **Promotional materials.** Sharing marketing or other commercial
+   content in a way that is outside the norms of the community.
+4. **Irresponsible communication.** Failing to responsibly present
+   content which includes, links to, or describes any other restricted
+   behaviors.

 ## Reporting

 If something here is being broken, contact me directly. Do not open a
 public issue.

- Email: `kontakt@hellion-media.de`
- Discord DM: `@j.j_kazama`
+| Channel    | Address                  |
+| ---------- | ------------------------ |
+| Email      | `kontakt@hellion-media.de` |
+| Discord DM | `@j.j_kazama`            |

 Reports stay private. I will acknowledge within a few weekdays
 (European business hours) and tell you what I plan to do.
@@ -50,22 +100,34 @@ Reports stay private. I will acknowledge within a few weekdays
 ## Enforcement

 I am the sole maintainer, so enforcement is a single-person process.
-Depending on what happened and how the person responds, I will pick
-the lightest measure that resolves the issue:
+I will pick the lightest measure that actually resolves the situation:

 1. Private note asking the behaviour to stop.
 2. Public correction in the affected thread.
 3. Edit or removal of the offending content.
-4. Temporary block from the repository or related spaces.
-5. Permanent block.
+4. Private written warning with a cooldown period.
+5. Temporary block from the repository or related spaces.
+6. Permanent block.

-Severe cases skip the lower steps. I will not negotiate over
-harassment or threats.
+Severe cases skip the lower steps. I will not negotiate over harassment
+or threats.

-## Acknowledgement
+## Scope

-This document is intentionally short and project-specific rather than
-a copy of a longer template. If you need a more formal reference, the
-[Contributor Covenant](https://www.contributor-covenant.org/) is a
-widely adopted starting point and the spirit of this document is
-compatible with it.
+This Code of Conduct applies to all spaces the project owns or that I
+run on its behalf: the GitHub repository, GitHub Discussions,
+project-related Discord conversations, and the maintainer contact
+listed in [`SECURITY.md`](SECURITY.md). It also applies when someone
+is identifiably representing HellionChat elsewhere, for example when
+posting as a HellionChat maintainer in the Dalamud Discord.
+
+## Attribution
+
+This Code of Conduct is adapted from the Contributor Covenant, version
+3.0, available at
+[https://www.contributor-covenant.org/version/3/0/](https://www.contributor-covenant.org/version/3/0/).
+
+Contributor Covenant is stewarded by the Organization for Ethical
+Source and licensed under CC BY-SA 4.0. To view a copy of this
+license, visit
+[https://creativecommons.org/licenses/by-sa/4.0/](https://creativecommons.org/licenses/by-sa/4.0/).
@@ -1,47 +1,55 @@
 # Contributing to HellionChat

-Thanks for taking a look. HellionChat is a small, opinionated fork of
-[Chat 2](https://github.com/Infiziert90/ChatTwo) maintained by one
-person in spare time. This document explains what I am looking for,
-what I am not, and how to make a contribution land smoothly.
+Thanks for taking a look. HellionChat is a one-person side project
+developed under Hellion Forge. It started as a fork of
+[Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become
+a standalone plugin under its own namespace, IPC channels and
+source tree (standalone-cut completed in v1.0.0). Forking HellionChat
+itself is explicitly permitted under the EUPL-1.2.

-## Before you open anything
+This document explains what I am looking for, what I am not, and how
+to make a contribution land smoothly.

- Read the [README](README.md) so you understand the scope: this is a
+## Before You Open Anything
+
+- Read the [README](README.md) so you understand the scope: a
  privacy-focused, EUPL-1.2-licensed Dalamud plugin that intentionally
-  removes the upstream webinterface and ships smaller defaults.
- Read [UPSTREAM_SYNC.md](docs/UPSTREAM_SYNC.md). Cherry-picks from upstream
-  Chat 2 are selective and conscious; not everything that lands there
-  belongs here.
- Read [SECURITY.md](SECURITY.md). Anything security-sensitive goes
+  removes the upstream webinterface and ships privacy-first defaults.
+- Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Cherry-picks
+  from upstream Chat 2 are selective and deliberate; not everything
+  that lands there belongs here.
+- Read [`SECURITY.md`](SECURITY.md). Anything security-sensitive goes
  through a private advisory, never a public issue or PR.
- Read the [code of conduct](CODE_OF_CONDUCT.md).
+- Read the [Code of Conduct](CODE_OF_CONDUCT.md).

-## What I will accept
+## What I Will Accept

 - Bug fixes for behaviour documented in the README, the in-plugin
  settings or the changelog.
 - Translation contributions for Hellion-specific strings via direct
-  pull requests against `HellionChat/Resources/HellionStrings.*.resx`.
-  Translations for the upstream Chat 2 strings (`Language.*.resx`) are
-  not handled here; they go through the upstream Chat 2 project.
+  pull requests against
+  `HellionChat/Resources/HellionStrings.*.resx`. Translations for
+  upstream Chat 2 strings (`Language.*.resx`) are not handled here;
+  those go to the upstream Chat 2 project.
 - Documentation improvements (README, comments, this file).
 - Performance fixes with a measurable before/after.
 - New features that fit the privacy-first scope and do not duplicate
  what an existing Dalamud plugin already does well.

-## What I will probably decline
+## What I Will Probably Decline

 - Re-introducing the webinterface or any remote-access feature. It was
-  removed in v0.2.0 on purpose. See README "Was gegenüber Chat 2 fehlt".
+  removed in v0.2.0 on purpose. See the README section
+  "Was gegenüber Chat 2 fehlt".
 - Features that bypass the privacy filter or weaken the default
  retention behaviour without an explicit, documented opt-in.
- Sweeping refactors that touch large parts of the upstream codebase.
-  They make selective upstream cherry-picks much harder and the
-  maintenance cost outweighs the benefit for a one-person project.
+- Sweeping refactors that touch large parts of the codebase. They make
+  selective upstream cherry-picks much harder and the maintenance cost
+  outweighs the benefit for a one-person project.
 - AI-generated code dropped in without disclosure or human review. See
-  [AI_DISCLOSURE.md](docs/AI_DISCLOSURE.md) for how I handle AI assistance
-  on my side; I expect comparable transparency from contributors.
+  [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md) for how I handle
+  AI assistance on my side; I expect comparable transparency from
+  contributors.

 If you are unsure whether an idea fits, open a feature-request issue
 first and ask before writing code. I would rather say "no" to a
@@ -50,56 +58,69 @@ proposal than to a finished pull request.
 ## Workflow

 1. Open an issue (bug or feature request) using the templates under
-   `.github/ISSUE_TEMPLATE/`. Skip this step only for trivial typos.
+   `.github/ISSUE_TEMPLATE/`. Skip this for trivial typos.
 2. Fork the repository and branch off `main`. Branch naming is
   informal; something like `fix/auto-tell-history-empty` or
-   `feat/adblock-light-mode` is plenty.
+   `feat/theme-export` is fine.
 3. Match the existing code style. The repository ships an
   `.editorconfig` that VS Code and Rider pick up automatically.
 4. Keep commits focused. Several small commits with clear messages are
-   easier to review than one big one. Squash-on-merge happens at the
-   PR level if needed.
+   easier to review than one large one. Squash-on-merge happens at
+   the PR level if needed.
 5. If your change touches user-visible behaviour, update the README
   and/or the changelog block in `HellionChat/HellionChat.yaml` and
-   `repo.json` for the next version. I bump the version number myself
-   at release time, so you do not need to.
+   `repo.json`. I bump the version number myself at release time.
 6. Open the pull request against `main`. The PR template will ask
   you to summarise the change, the testing you did and any
   compatibility notes.

-## Build and test
+## Build and Test

 The project targets `net10.0-windows` against Dalamud SDK 15. To build
 locally you need:

 - .NET 10 SDK
- A working Dalamud development environment with `DALAMUD_HOME` set
+- A working Dalamud dev environment with `DALAMUD_HOME` set
  (XIVLauncher installed and launched once is the simplest path)
 - VS Code with the C# Dev Kit, Rider, or Visual Studio

-```
+```bash
 dotnet restore
 dotnet build HellionChat.sln -c Release
 ```

-Tests are not part of the current `HellionChat.sln`. If you add a test
+There are currently no tests in `HellionChat.sln`. If you add a test
 project, point it at the relevant subsystems (privacy filter,
 configuration migration, message store) and mention it in the PR.

 For a smoke test in-game: build, copy the output into your Dalamud
-`devPlugins/HellionChat/` directory and load it through `/xlplugins`.
+`devPlugins/HellionChat/` directory and load it via `/xlplugins`.

-## Continuous integration
+## Continuous Integration

 Every push and every pull request runs:

- `build.yml` — `dotnet build` and `dotnet test`
- `codeql.yml` — CodeQL security analysis
+| Workflow      | What it checks                        |
+| ------------- | ------------------------------------- |
+| `build.yml`   | `dotnet build` and `dotnet test`      |
+| `codeql.yml`  | CodeQL security analysis              |

 A pull request will not be merged while either of these is failing.
 CodeQL findings on changed code need to be addressed; pre-existing
 findings on untouched code are tracked separately.

+## Translations
+
+Hellion-specific strings live in
+`HellionChat/Resources/HellionStrings.resx` (English source) and
+`HellionStrings.<lang>.resx` (per-language). These are accepted as
+direct pull requests.
+
+The upstream Chat 2 strings in `HellionChat/Resources/Language.*.resx`
+are **not** translated here. They are owned by the upstream project
+and synced in via cherry-pick. Please contribute those to
+[Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) instead.
+
 ## Licensing

 By submitting a pull request you confirm that:
@@ -109,23 +130,18 @@ By submitting a pull request you confirm that:
 - You agree that your contribution will be released under the
  [EUPL-1.2](LICENSE), the same licence as the rest of the project.

-There is no separate CLA.
+There is no separate CLA. Forking HellionChat is explicitly permitted
+under the EUPL-1.2, as with any EUPL-licensed project.

-## Translations
+## Response Times

-Hellion-specific strings live in `HellionChat/Resources/HellionStrings.resx`
-(English source) and `HellionStrings.<lang>.resx` (per-language).
-Translations are accepted as direct pull requests against those files.
+| Channel       | Address                    |
+| ------------- | -------------------------- |
+| GitHub Issues | Preferred for bugs and feature requests |
+| Discord DM    | `@j.j_kazama`              |
+| Email         | `kontakt@hellion-media.de` |

-The upstream Chat 2 strings in `HellionChat/Resources/Language.*.resx` are
-**not** translated in this repository. They are owned by the upstream
-Chat 2 project and synced in via cherry-pick. Please contribute
-upstream-string translations to
-[Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) instead.
-
-## A note on response times
-
-I respond on weekdays during European business hours and I take
-weekends and FFXIV patch days off. A pull request that sits for a few
-days has not been ignored; I just have not gotten to it yet. Pinging
-once after a week is fine; please do not ping daily.
+I respond on weekdays during European business hours and take weekends
+and FFXIV patch days off. A pull request that sits for a few days has
+not been ignored. Pinging once after a week is fine; please do not
+ping daily.
@@ -1,6 +1,10 @@
 HellionChat — a privacy-focused fork of ChatTwo for FINAL FANTASY XIV

-Copyright (c) 2024-2025 Infiziert90 (Infi) and Anna Clemens (ascclemens)
+═══════════════════════════════════════════════════════════════════
+Source code
+═══════════════════════════════════════════════════════════════════
+
+Copyright (c) 2022-2026 Infiziert90 (Infi) and Anna Clemens (ascclemens)
    Original ChatTwo authors and copyright holders of the upstream
    plugin this fork is built on. Their work covers the message store,
    the channel filtering, the sidebar tab system, the FFXIV chat
@@ -10,18 +14,38 @@ Copyright (c) 2024-2025 Infiziert90 (Infi) and Anna Clemens (ascclemens)
 Copyright (c) 2025-2026 Florian Wathling / Hellion Online Media
    HellionChat-specific modifications, including the privacy filter,
    per-channel retention sweep, export pipeline, Auto-Tell-Tabs,
-    Hellion theme and font integration, German localisation and the
-    EUPL-1.2 fork maintenance.
+    German localisation and the EUPL-1.2 fork maintenance.

-Licensed under the European Union Public Licence (EUPL), Version 1.2
-only. The full Licence text lives in the LICENSE file at the root of
-this repository. The official Licence website is at:
-
-    https://eupl.eu/1.2/en/
+Source code is licensed under the European Union Public Licence
+(EUPL), Version 1.2 only. The full Licence text lives in the LICENSE
+file at the root of this repository. The official Licence website is
+at: https://eupl.eu/1.2/en/

 This Work is provided "AS IS" without warranties of any kind. See
 Article 7 (Disclaimer of Warranty) and Article 8 (Disclaimer of
 Liability) of the Licence for the legally binding wording.

+═══════════════════════════════════════════════════════════════════
+Visual assets
+═══════════════════════════════════════════════════════════════════
+Copyright (c) 2026 Florian Eck
+
+    Designer of the Hellion Forge logo and Hellion Online Media logo
+    (variants located in docs/images and HellionChat/images).
+    Exclusive usage and marketing rights licensed to Hellion Online
+    Media. These assets are NOT covered by the EUPL-1.2 source code
+    licence above and may not be reused, modified, or redistributed
+    without separate permission from the copyright holder.
+
+═══════════════════════════════════════════════════════════════════
+Bundled assets
+═══════════════════════════════════════════════════════════════════
+
+Exo 2 font (HellionChat/Resources/HellionFont.ttf)
+    SIL Open Font License 1.1, full text in HellionFont-OFL.txt.
+    Bundled with permission per the OFL terms.
+
+═══════════════════════════════════════════════════════════════════
+
 Acknowledgements directed at the upstream ChatTwo authors live in
 NOTICE.md. The manual upstream-sync workflow lives in UPSTREAM_SYNC.md.
@@ -1,16 +1,31 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HellionChat", "HellionChat\HellionChat.csproj", "{739F75E6-B65F-41EF-9D90-F7BC519E4875}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Debug|x64.Build.0 = Debug|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Debug|x86.Build.0 = Debug|Any CPU
 		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Release|Any CPU.Build.0 = Release|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Release|x64.ActiveCfg = Release|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Release|x64.Build.0 = Release|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Release|x86.ActiveCfg = Release|Any CPU
+		{739F75E6-B65F-41EF-9D90-F7BC519E4875}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
@@ -34,10 +34,29 @@ public class ConfigKeyBind
 [Serializable]
 public class Configuration : IPluginConfiguration
 {
-    private const int LatestVersion = 12;
+    private const int LatestVersion = 16;

    public int Version { get; set; } = LatestVersion;

+    // v1.1.0 — Theme-Engine. Slug-basiert; ThemeRegistry liefert das Objekt.
+    public string Theme = "hellion-arctic";
+
+    // v1.1.0 — Globale Window-Opacity, theme-übergreifend. Migration aus
+    // HellionThemeWindowOpacity beim Bump v13 → v14.
+    public float WindowOpacity = 0.85f;
+
+
+    // v1.1.0 — Felder für künftige UI-Toggles (v1.2.0 / v1.3.0). Werden
+    // vorab angelegt, damit später keine Migration nötig ist.
+    public bool ReduceMotion;
+    // v1.2.1 — Default geflippt von false → true. Card-Rows-Layout aus
+    // v1.2.0 wurde als zu dicht empfunden; Single-Line `[HH:mm] Sender:
+    // Text` ist besser lesbar und platzsparender. Bestand-User mit aktiv
+    // false werden durch die v15→v16-Migration auf den neuen Default
+    // gehoben (Heuristik: wer in v1.2.0 false hatte, hatte den damals
+    // neu eingeführten Default — kaum jemand hat aktiv abgeschaltet).
+    public bool UseCompactDensity = true;
+
    // Hellion Chat — Privacy filter (DSGVO Art. 25 Privacy by Default).
    // Master-switch defaults to true; set false to restore upstream behavior.
    public bool PrivacyFilterEnabled = true;
@@ -67,17 +86,6 @@ public class Configuration : IPluginConfiguration
    // ChatTwo users skip it because the v6→v7 migration sets the flag.
    public bool FirstRunCompleted;

-    // Hellion Chat global ImGui theme — applied to every plugin window in
-    // Plugin.Draw. Default ON; users who prefer the upstream Dalamud look
-    // can flip this off in the Privacy tab.
-    public bool HellionThemeEnabled = true;
-
-    // Window background opacity, 0.5–1.0. Lower values make the plugin
-    // panes more glass-like so the game shines through. Default 0.5
-    // matches the maintainer's daily-driver preference; users who want
-    // a less translucent look bump it up in Aussehen → Theme.
-    public float HellionThemeWindowOpacity = 0.5f;
-
    // Use the bundled Exo 2 font (OFL-1.1) for the regular plugin font
    // instead of whatever GlobalFontV2.FontId points at. Default ON so a
    // fresh install gets the Hellion typography out-of-the-box; flip OFF
@@ -145,7 +153,11 @@ public class Configuration : IPluginConfiguration
    public bool HideWhenUiHidden = true;
    public bool HideInLoadingScreens;
    public bool HideInBattle;
-    public bool HideInNewGamePlusMenu;
+    // v1.2.1 — Default geflippt false → true. Hellion-UI im NG+-Menü
+    // versteckt zu halten ist konsistent mit den anderen Hide-Defaults
+    // (Cutscenes, Logged-out, UI-Hidden) — UI-out-of-the-way bei Story-
+    // Sequenzen.
+    public bool HideInNewGamePlusMenu = true;
    public bool HideWhenInactive;
    public int InactivityHideTimeout = 10;
    public bool InactivityHideActiveDuringBattle = true;
@@ -160,7 +172,10 @@ public class Configuration : IPluginConfiguration
    public bool NativeItemTooltips = true;
    public bool PrettierTimestamps = true;
    public bool MoreCompactPretty;
-    public bool HideSameTimestamps;
+    // v1.2.1 — Default geflippt false → true. Wiederholte Zeitstempel
+    // innerhalb derselben Minute lesen sich als Rauschen; ein einziger
+    // Timestamp pro Minute reicht aus um die Konversation zu verorten.
+    public bool HideSameTimestamps = true;
    public bool ShowNoviceNetwork;
    // Hellion Chat — vertical sidebar tab layout reads better than the
    // horizontal tab strip in the company of Auto-Tell-Tabs (a club
@@ -187,7 +202,11 @@ public class Configuration : IPluginConfiguration
    public bool CollapseKeepUniqueLinks;
    public bool PlaySounds = true;
    public bool KeepInputFocus = true;
-    public int MaxLinesToRender = 5_000; // 1-10000
+    // v1.2.1 — Default gesenkt 5000 → 2500. 5000 ist auf Mid-Range-
+    // Hardware bei langen Sessions spürbar langsamer (Card-Layout
+    // re-Layout pro Frame), 2500 deckt eine typische Stunde Chat ab
+    // und bleibt smooth. User die mehr brauchen können bis 10000 hoch.
+    public int MaxLinesToRender = 2_500; // 1-10000
    // Default ON to match a German / European 24h locale. The
    // ChatLogWindow.cs format-flip in v0.5.1 honours this strictly via
    // CultureInfo.InvariantCulture so the result is consistent across
@@ -220,14 +239,25 @@ public class Configuration : IPluginConfiguration
    };

    public float TooltipOffset;
-    public float WindowAlpha = 100f;
-    public Dictionary<ChatType, uint> ChatColours = new();
+    // v1.2.1 — Default-Chat-Farben sind das Hellion-Brand-Preset. Der
+    // First-Run-Wizard bietet keine Theme-/Preset-Wahl an, daher kriegen
+    // neue User die Hellion-Brand-Farben out-of-the-box (Cyan-Familie für
+    // Standard/Tell, Ember/Warning für laute Channels). Bestand-User mit
+    // leerem ChatColours-Dict werden durch die v15→v16-Migration auf das
+    // Preset gehoben; User die bereits Custom-Farben haben, bleiben.
+    public Dictionary<ChatType, uint> ChatColours = BuildDefaultChatColours();
+
+    private static Dictionary<ChatType, uint> BuildDefaultChatColours()
+    {
+        var defaults = new Dictionary<ChatType, uint>();
+        foreach (var (channel, colour) in HellionChat.Resources.ChatColourPresets.All["Hellion"].Colours)
+            defaults[channel] = colour;
+        return defaults;
+    }
+
    public bool ColorSelectedInputChannelButton = true;
    public List<Tab> Tabs = [];

-    public bool OverrideStyle;
-    public string? ChosenStyle;
-
    public ConfigKeyBind? ChatTabForward;
    public ConfigKeyBind? ChatTabBackward;

@@ -279,7 +309,10 @@ public class Configuration : IPluginConfiguration
        MaxLinesToRender = other.MaxLinesToRender;
        Use24HourClock = other.Use24HourClock;
        ShowEmotes = other.ShowEmotes;
-        BlockedEmotes = other.BlockedEmotes;
+        // Deep-copy the set so the live and mutable Configuration instances don't share state
+        // — a HashSet reference assignment would cause edits in the settings window to leak
+        // into the live config before the user clicks Save.
+        BlockedEmotes = new HashSet<string>(other.BlockedEmotes);
        FontsEnabled = other.FontsEnabled;
        ItalicEnabled = other.ItalicEnabled;
        ExtraGlyphRanges = other.ExtraGlyphRanges;
@@ -289,7 +322,6 @@ public class Configuration : IPluginConfiguration
        ItalicFontV2 = other.ItalicFontV2;
        SymbolsFontSizeV2 = other.SymbolsFontSizeV2;
        TooltipOffset = other.TooltipOffset;
-        WindowAlpha = other.WindowAlpha;
        ChatColours = other.ChatColours.ToDictionary(entry => entry.Key, entry => entry.Value);
        ColorSelectedInputChannelButton = other.ColorSelectedInputChannelButton;

@@ -297,14 +329,35 @@ public class Configuration : IPluginConfiguration
        // never present in a disk-loaded copy. Keep the live temp tabs of
        // *this* configuration alive across an UpdateFrom so a settings
        // save (or sidebar-mode toggle) does not silently destroy the
-        // user's open tell conversations. Persistent tabs from `other`
-        // still get the regular clone-replace treatment.
+        // user's open tell conversations.
+        //
+        // For persistent tabs we go through Tab.Clone() which intentionally
+        // does NOT copy the NonSerialized Messages list (avoids shared
+        // mutable state on disk-load). On a settings save that means the
+        // chat history for every persistent tab would be wiped — bug
+        // reported by Flo 2026-05-05. We work around it by capturing the
+        // live MessageList (and LastSendUnread counter) by Identifier
+        // before the replace, then restoring it onto the freshly cloned
+        // tabs whose Identifier survives Tab.Clone(). New tabs added in
+        // settings get a fresh empty MessageList; deleted tabs lose their
+        // history (intended).
        var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList();
-        Tabs = other.Tabs.Where(t => !t.IsTempTab).Select(t => t.Clone()).ToList();
+        var livePersistentSession = Tabs
+            .Where(t => !t.IsTempTab)
+            .ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread));
+
+        Tabs = other.Tabs.Where(t => !t.IsTempTab).Select(t =>
+        {
+            var clone = t.Clone();
+            if (livePersistentSession.TryGetValue(clone.Identifier, out var live))
+            {
+                clone.Messages = live.Messages;
+                clone.LastSendUnread = live.LastSendUnread;
+            }
+            return clone;
+        }).ToList();
        Tabs.AddRange(liveTempTabs);

-        OverrideStyle = other.OverrideStyle;
-        ChosenStyle = other.ChosenStyle;
        ChatTabForward = other.ChatTabForward;
        ChatTabBackward = other.ChatTabBackward;

@@ -318,10 +371,14 @@ public class Configuration : IPluginConfiguration
        RetentionLastRunAt = other.RetentionLastRunAt;

        FirstRunCompleted = other.FirstRunCompleted;
-        HellionThemeEnabled = other.HellionThemeEnabled;
-        HellionThemeWindowOpacity = other.HellionThemeWindowOpacity;
        UseHellionFont = other.UseHellionFont;

+        // v1.1.0 theme engine fields
+        Theme = other.Theme;
+        WindowOpacity = other.WindowOpacity;
+        ReduceMotion = other.ReduceMotion;
+        UseCompactDensity = other.UseCompactDensity;
+
        EnableAutoTellTabs = other.EnableAutoTellTabs;
        AutoTellTabsLimit = other.AutoTellTabsLimit;
        AutoTellTabsCompactDisplay = other.AutoTellTabsCompactDisplay;
@@ -367,6 +424,11 @@ public class Tab
 {
    public string Name = Language.Tab_DefaultName;

+    // v1.2.0 — optionaler FontAwesome-Glyph-Name. Null bedeutet:
+    // Default-Mapping aus TabIconMapping greift (basiert auf Tab-Name).
+    // User können hier per Settings → Tabs einen eigenen Glyph setzen.
+    public string? Icon = null;
+
    [Obsolete("Removed in favor of SelectedChannels")]
    public Dictionary<ChatType, ChatSource> ChatCodes = new();

@@ -571,6 +633,20 @@ public class Tab
            }
        }

+        /// <summary>
+        /// Aktuelle Anzahl der gespeicherten Messages. Lock-acquire pro Read
+        /// ist OK für 1×/sec Status-Bar-Polling (v1.2.0).
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                LockSlim.Wait(-1);
+                try { return Messages.Count; }
+                finally { LockSlim.Release(); }
+            }
+        }
+
        /// <summary>
        /// Returns an array copy of the message list for usage outside of main thread
        /// </summary>
@@ -66,16 +66,29 @@ public static class EmoteCache

    public static string[] SortedCodeArray = [];

+    // Plugin-scoped cancellation source for in-flight emote loads. Dispose
+    // cancels every running download/texture-create so the workers don't
+    // touch a torn-down TextureProvider on plugin reload. Replaced with a
+    // fresh source on the next LoadData() call so a re-enable still works.
+    private static CancellationTokenSource Cts = new();
+    internal static CancellationToken Token => Cts.Token;
+
    public static async Task LoadData()
    {
        if (State is not LoadingState.Unloaded)
            return;

+        // Refresh the CTS in case Dispose was called and we're being re-enabled
+        // in the same process (Dalamud /xlplugins toggle).
+        if (Cts.IsCancellationRequested)
+            Cts = new CancellationTokenSource();
+
        State = LoadingState.Loading;
+        var ct = Cts.Token;
        try
        {
-            var global = await Client.GetAsync(GlobalEmotes);
-            var globalList = await global.Content.ReadAsStringAsync();
+            var global = await Client.GetAsync(GlobalEmotes, ct);
+            var globalList = await global.Content.ReadAsStringAsync(ct);

            foreach (var emote in JsonSerializer.Deserialize<Emote[]>(globalList)!)
                if (!string.IsNullOrEmpty(emote.Code) && !NotWorking.Contains(emote.Code))
@@ -84,8 +97,8 @@ public static class EmoteCache
            var lastId = string.Empty;
            for (var i = 0; i < 15; i++)
            {
-                var top = await Client.GetAsync(Top100Emotes.Format(BetterTTV, lastId));
-                var topList = await top.Content.ReadAsStringAsync();
+                var top = await Client.GetAsync(Top100Emotes.Format(BetterTTV, lastId), ct);
+                var topList = await top.Content.ReadAsStringAsync(ct);

                var jsonList = JsonSerializer.Deserialize<List<Top100>>(topList)!;
                // BetterTTV occasionally returns entries with a null Code; the
@@ -103,6 +116,12 @@ public static class EmoteCache
            SortedCodeArray = Cache.Keys.Order().ToArray();
            State = LoadingState.Done;
        }
+        catch (OperationCanceledException)
+        {
+            // Plugin disposed while the cache was loading; leave State on
+            // Loading so a subsequent re-enable can re-issue LoadData with
+            // a fresh CTS (handled above).
+        }
        catch (Exception ex)
        {
            // Reset to Unloaded so a later trigger (e.g. the user reopening
@@ -116,6 +135,10 @@ public static class EmoteCache

    public static void Dispose()
    {
+        // Cancel in-flight downloads / texture creates so the async-void
+        // Load methods bail out before they touch a disposed TextureProvider.
+        Cts.Cancel();
+
        foreach (var emote in EmoteImages.Values)
            emote.InnerDispose();
    }
@@ -171,7 +194,7 @@ public static class EmoteCache
            ImGui.Image(Texture!.Handle, size);
        }

-        internal async Task<byte[]> LoadAsync(Emote emote)
+        internal async Task<byte[]> LoadAsync(Emote emote, CancellationToken ct)
        {
            // BetterTTV-supplied Id and ImageType are interpolated straight
            // into the filename. HTTPS protects the wire, but a compromised
@@ -188,15 +211,15 @@ public static class EmoteCache

            if (File.Exists(filePath))
            {
-                RawData = await File.ReadAllBytesAsync(filePath);
+                RawData = await File.ReadAllBytesAsync(filePath, ct);
            }
            else
            {
-                var content = await Client.GetAsync(EmotePath.Format(emote.Id));
-                RawData = await content.Content.ReadAsByteArrayAsync();
+                var content = await Client.GetAsync(EmotePath.Format(emote.Id), ct);
+                RawData = await content.Content.ReadAsByteArrayAsync(ct);

                await using var stream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read);
-                stream.Write(RawData, 0, RawData.Length);
+                await stream.WriteAsync(RawData, ct);
            }

            return RawData;
@@ -209,21 +232,28 @@ public static class EmoteCache
    {
        public ImGuiEmote Prepare(Emote emote)
        {
-            Task.Run(() => Load(emote));
+            var ct = EmoteCache.Token;
+            Task.Run(() => Load(emote, ct), ct);
            return this;
        }

-        private async void Load(Emote emote)
+        private async void Load(Emote emote, CancellationToken ct)
        {
            try
            {
-                var image = await LoadAsync(emote);
+                var image = await LoadAsync(emote, ct);
                if (image.Length <= 0)
                    return;

-                Texture = await Plugin.TextureProvider.CreateFromImageAsync(image);
+                ct.ThrowIfCancellationRequested();
+                Texture = await Plugin.TextureProvider.CreateFromImageAsync(image, cancellationToken: ct);
                IsLoaded = true;
            }
+            catch (OperationCanceledException)
+            {
+                // Plugin disposed mid-load; the EmoteImages entry is also
+                // being torn down, no extra cleanup needed.
+            }
            catch (Exception ex)
            {
                Failed = true;
@@ -279,15 +309,16 @@ public static class EmoteCache

        public ImGuiGif Prepare(Emote emote)
        {
-            Task.Run(() => Load(emote));
+            var ct = EmoteCache.Token;
+            Task.Run(() => Load(emote, ct), ct);
            return this;
        }

-        private async void Load(Emote emote)
+        private async void Load(Emote emote, CancellationToken ct)
        {
            try
            {
-                var image = await LoadAsync(emote);
+                var image = await LoadAsync(emote, ct);
                if (image.Length <= 0)
                    return;

@@ -299,6 +330,8 @@ public static class EmoteCache
                var frames = new List<(IDalamudTextureWrap Tex, float Delay)>();
                foreach (var frame in img.Frames)
                {
+                    ct.ThrowIfCancellationRequested();
+
                    var delay = frame.Metadata.GetGifMetadata().FrameDelay / 100f;

                    // Follows the same pattern as browsers, anything under 0.02s delay will be rounded up to 0.1s
@@ -307,13 +340,21 @@ public static class EmoteCache

                    var buffer = new byte[4 * frame.Width * frame.Height];
                    frame.CopyPixelDataTo(buffer);
-                    var tex = await Plugin.TextureProvider.CreateFromRawAsync(RawImageSpecification.Rgba32(frame.Width, frame.Height), buffer);
+                    var tex = await Plugin.TextureProvider.CreateFromRawAsync(RawImageSpecification.Rgba32(frame.Width, frame.Height), buffer, cancellationToken: ct);
                    frames.Add((tex, delay));
                }

                Frames = frames;
                IsLoaded = true;
            }
+            catch (OperationCanceledException)
+            {
+                // Plugin disposed mid-load; partial frames are released by
+                // InnerDispose on the next dispose pass.
+                foreach (var f in Frames)
+                    f.Texture.Dispose();
+                Frames = [];
+            }
            catch (Exception ex)
            {
                Failed = true;
@@ -18,8 +18,6 @@ public class FontManager

    internal IFontHandle FontAwesome = null!;

-    internal readonly byte[] GameSymFont;
-
    private ushort[] Ranges = [];
    private ushort[] JpRange = [];

@@ -30,32 +28,6 @@ public class FontManager
        36f, 40f, 45f, 46f, 68f, 90f,
    ];

-    public FontManager()
-    {
-        var filePath = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "FFXIV_Lodestone_SSF.ttf");
-        if (File.Exists(filePath))
-        {
-            GameSymFont = File.ReadAllBytes(filePath);
-        }
-        else
-        {
-            // Dispose HttpClient and HttpResponseMessage to avoid socket
-            // exhaustion on repeated cold-start downloads. GetAwaiter().GetResult()
-            // unwraps AggregateException so failures surface cleanly. A full
-            // async refactor of the constructor would be cleaner but is out of
-            // scope for v1.0.0 — tracked in the backlog.
-            using var client = new HttpClient();
-            using var response = client
-                .GetAsync("https://img.finalfantasyxiv.com/lds/pc/global/fonts/FFXIV_Lodestone_SSF.ttf")
-                .GetAwaiter()
-                .GetResult();
-            response.EnsureSuccessStatusCode();
-            GameSymFont = response.Content.ReadAsByteArrayAsync().GetAwaiter().GetResult();
-
-            Dalamud.Utility.FilesystemUtil.WriteAllBytesSafe(filePath, GameSymFont);
-        }
-    }
-
    /// <summary>
    /// Backing bytes for the bundled Hellion font (Exo 2, OFL-1.1). Lazily
    /// extracted from the assembly's manifest resources on first use; the
@@ -148,7 +120,16 @@ public class FontManager
            e => e.OnPreBuild(
                tk =>
                {
-                    var config = new SafeFontConfig {SizePt = Plugin.Config.GlobalFontV2.SizePt, GlyphRanges = Ranges};
+                    // v1.2.0 — Bei aktiver Hellion-Schrift (Exo 2 ist Variable-Font)
+                    // wird die User-Schriftgröße aus FontSizeV2 als SizePt angewendet.
+                    // Der Bestand-Pfad nutzt weiter GlobalFontV2.SizePt aus dem
+                    // Custom-Font-Stack. Ohne diese Verzweigung war FontSizeV2 bei
+                    // UseHellionFont=true wirkungslos, was 4K-User mit größerer
+                    // Skalierung blockierte (Settings → Erscheinungsbild → Schriftarten).
+                    var basePt = Plugin.Config.UseHellionFont
+                        ? Plugin.Config.FontSizeV2
+                        : Plugin.Config.GlobalFontV2.SizePt;
+                    var config = new SafeFontConfig {SizePt = basePt, GlyphRanges = Ranges};
                    config.MergeFont = Plugin.Config.UseHellionFont
                        ? tk.AddFontFromMemory(GetHellionFontBytes(), config, "Hellion-Exo2")
                        : AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");
@@ -252,7 +252,7 @@ internal sealed unsafe class Chat : IDisposable
        {
            playerName = SeString.Parse(agent->TellPlayerName).TextValue;
            worldId = agent->TellWorldId;
-            Plugin.Log.Debug($"Detected tell target '{playerName}'@{worldId}");
+            Plugin.Log.Debug($"Detected tell target '[redacted]'@{worldId}");
        }

        Plugin.CurrentTab.CurrentChannel = new UsedChannel
@@ -400,7 +400,9 @@ internal sealed unsafe class Chat : IDisposable
                }

                var idx = RotateLinkshell(currentIndex, rotate, channel == InputChannel.Linkshell1 ? ValidLinkshell : ValidCrossLinkshell);
-                return channel + idx;
+                // RotateLinkshell returns null when no valid linkshell is found within 8 iterations.
+                // Forward the null so the caller can keep the existing channel instead of crashing on nullable arithmetic.
+                return idx is null ? null : channel + idx.Value;
            }
            default:
                return channel;
@@ -245,7 +245,8 @@ internal unsafe class GameFunctions : IDisposable
        vf0(agent, &result, &value, 0, 0);
    }

-    private readonly nint PlaceholderNamePtr = Marshal.AllocHGlobal(128);
+    private const int PlaceholderBufferSize = 128;
+    private readonly nint PlaceholderNamePtr = Marshal.AllocHGlobal(PlaceholderBufferSize);
    private readonly string Placeholder = $"<{Guid.NewGuid():N}>";
    private string? ReplacementName;

@@ -261,6 +262,17 @@ internal unsafe class GameFunctions : IDisposable
        if (ReplacementName == null || placeholder != Placeholder)
            return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);

+        // The fixed buffer is 128 bytes; UTF-8 + null-terminator must fit.
+        // FFXIV player names plus an @World suffix should never approach this
+        // limit, but a malformed ReplacementName must not overflow the buffer.
+        var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
+        if (byteCount >= PlaceholderBufferSize)
+        {
+            Plugin.Log.Warning($"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original.");
+            ReplacementName = null;
+            return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
+        }
+
        MemoryHelper.WriteString(PlaceholderNamePtr, ReplacementName);
        ReplacementName = null;

@@ -20,7 +20,7 @@ public class TellTarget
    }

    public bool IsSet()
-        => Name.Length > 0 && World > 0;
+        => !string.IsNullOrEmpty(Name) && World > 0;

    public string ToWorldString()
        => Sheets.WorldSheet.TryGetRow(World, out var worldRow) ? worldRow.Name.ToString() : string.Empty;
@@ -4,8 +4,9 @@
             0.1.0 is our bootstrap release; the underlying Chat 2 base is
             called out in the yaml changelog so users can see what it
             derives from. -->
-        <Version>1.0.3</Version>
+        <Version>1.2.2</Version>
        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
        <!-- Honor packages.lock.json on restore so floating version ranges
             don't silently drift between machines or CI runs. -->
        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
@@ -18,7 +19,11 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="MessagePack" Version="3.1.4" />
+        <!-- Closed ranges on packages with breaking-change history block a
+             surprise major bump when the lock file is regenerated. The
+             lock file pins the exact version per build; the upper bound
+             keeps the unlock path from drifting across major lines. -->
+        <PackageReference Include="MessagePack" Version="[3.1.4, 4.0.0)" />
        <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
        <!-- Override the transitively-referenced native SQLite build to one
             that ships SQLite >= 3.50.3 (CVE-2025-6965 memory corruption,
@@ -28,8 +33,15 @@
             without a major bump on the managed wrapper. -->
        <PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="3.50.3" />
        <PackageReference Include="morelinq" Version="4.4.0" />
-        <PackageReference Include="Pidgin" Version="3.5.1" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
+        <PackageReference Include="Pidgin" Version="[3.5.1, 4.0.0)" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="[3.1.12, 4.0.0)" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <!-- Pure-function test suites in HellionChat.Tests need access to
+             the internal helper classes (StringUtil, UriPayload, Tokenizer
+             etc.). Test assembly does not get redistributed. -->
+        <InternalsVisibleTo Include="HellionChat.Tests" />
    </ItemGroup>

    <ItemGroup>
@@ -63,6 +75,9 @@
        <EmbeddedResource Include="Resources\HellionFont-OFL.txt">
            <LogicalName>HellionFont-OFL.txt</LogicalName>
        </EmbeddedResource>
+        <EmbeddedResource Include="Themes\Builtin\example-theme.json">
+            <LogicalName>HellionChat.Themes.Builtin.example-theme.json</LogicalName>
+        </EmbeddedResource>
    </ItemGroup>


@@ -31,6 +31,16 @@ description: |-
  - Independent plugin state — own config file and database directory,
    so Hellion Chat does not share state with upstream Chat 2

+  v1.1.0 — Theme engine with five built-in themes (Hellion Arctic,
+  Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove) plus
+  JSON-based custom-theme authoring. Settings rebuilt around a card
+  grid with section detail views. See docs/THEME-AUTHORING.md.
+
+  v1.2.2 — Theme catalogue grown to nine built-in themes:
+  Hellion Arctic, Hellion Spectrum (CVD-safe Deuteran/Protan),
+  Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove,
+  Night Blue, Indigo Violet, Forge Merchantman.
+
  Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.

  Modding & support: join the Hellion Forge Discord at
@@ -41,7 +51,8 @@ accepts_feedback: true
 icon_url: https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/icon.png
 image_urls:
  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/chatWindow.png
-  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/withSimpleTweaks.png
+  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/settingsOverview.png
+  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/themesPicker.png
 tags:
  - Social
  - UI
@@ -49,6 +60,193 @@ tags:
  - Replacement
  - Privacy
 changelog: |-
+  **Hellion Chat 1.2.2 — Theme Expansion**
+
+  Four new built-in themes round out the picker. No engine changes,
+  no settings touched — just more colour options.
+
+  - **Night Blue** — Royal Blue on deep marine. Cool tech-dashboard
+    mood, distinct from the brand themes.
+  - **Indigo Violet** — Royal Violet on deep indigo with a turquoise-
+    mint counter for an aurora glitter feel. Sister to Event Horizon
+    but darker and denser; the turquoise accent keeps the two
+    distinguishable.
+  - **Forge Merchantman** — Patina bronze on workshop slate, warm
+    amber counter. Hellion Forge given a theme of its own — sister
+    to Hellion Arctic but greener and warmer instead of cold cyan.
+  - **Hellion Spectrum** — Deuteran/Protan-safe channel colours
+    using Wong/Okabe-Ito palette tones. Channel identity (Tell pink,
+    Yell yellow, Shout orange, Party blue, FC green) is preserved;
+    tones are chosen so each channel stays distinguishable under
+    red-green colour vision deficiency. Covers the ~99% of CVD cases
+    that are red-green.
+
+  No schema bump, no migration. Default theme is unchanged (Hellion
+  Arctic). Existing custom themes keep working.
+
+  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+  **Hellion Chat 1.2.1 — Settings Cleanup**
+
+  Re-sorted the settings menu so related options live together. Card names
+  now describe their contents in plain words — "Theme & Layout", "Fonts &
+  Colours", "Data Management" — and each card has a short subtitle so you
+  don't have to guess where a setting lives. No new features, just
+  housekeeping.
+
+  Card changes:
+
+  - Theme & Layout (new) collects the theme picker, window frame style
+    (title bar, sidebar, hide button, pop-out title bar) and the timestamp
+    style options.
+  - Fonts & Colours (new) is the new home for font choice, font size and
+    per-channel chat colours.
+  - Data Management (new) is everything you do with stored messages:
+    retention windows, cleanup, export, the database viewer and the
+    advanced shift-click tools. All previously scattered between Privacy
+    and Database.
+  - Privacy is now focused on one job: the privacy filter.
+  - Chat absorbs the Auto-Tell-Tabs history preload slider that used to
+    live under Privacy.
+  - General groups the keybind mode under Input where it belongs.
+
+  Cleanup:
+
+  - Removed legacy "Style override" option and the unused style-name field
+    — both made obsolete by the Themes system in 1.1.0.
+  - Removed the legacy WindowAlpha slider; if you had it set, the value is
+    automatically migrated to Theme & Layout → Window Style → Window
+    Transparency.
+  - Removed the unused ShowThemeQuickPicker schema field.
+
+  Migration v15 → v16:
+
+  - A backup of your previous config is written to
+    pluginConfigs/HellionChat.json.pre-v16-backup before the schema change,
+    in case you want to roll back manually.
+  - All other settings are preserved unchanged.
+  - One-time toast on first start if you previously had Style override
+    enabled — it explains the change. Users who never touched that setting
+    see no toast.
+
+  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+  **Hellion Chat 1.2.0 — Layout Refresh**
+
+  Second UI cycle: tab layouts modernised in both modes, a new
+  bottom status bar, card-rows as default message render, and
+  Auto-Tell tabs that you can finally tell apart at a glance.
+
+  Sidebar (icon-only, fixed 44 px):
+
+  - Tab name on hover-tooltip, vertical accent pill on the
+    active tab, child background no longer paints the top
+    padding area.
+  - Per-tab custom icons via Settings → Tabs.
+  - Auto-Tell tabs: each partner gets a hashed icon (envelope/
+    star/heart/bell/bookmark/flag/fire) plus hashed color
+    (12-color palette) — 84 distinct combinations.
+  - Pulsing red dot in the top-right of any tab with unread
+    messages, subtle 2-second sine pulse, respects
+    Configuration.ReduceMotion.
+
+  Top tabs:
+
+  - Accent underline pill on the active tab instead of the old
+    background fill. Icon prefixes were attempted but reverted
+    — Dalamud's default font atlas has no FontAwesome glyphs.
+
+  Bottom status bar (22 px, 1×/sec cached):
+
+  - Active channel with color dot, Privacy-First badge, tab +
+    message counters, auto-tell counter (hidden at zero),
+    plugin version (right-aligned, muted).
+
+  Message rendering:
+
+  - Card rows by default — sender header in channel color, body
+    on its own line, subtle border between cards.
+  - Compact-Density toggle in Appearance returns the classic
+    single-line `[HH:mm] Sender: Text` layout.
+
+  Bug fixes from in-game testing:
+
+  - Settings save no longer wipes chat history. Refilter cycle
+    only runs when filter-relevant settings actually changed
+    (privacy, channel selection); cosmetic changes leave the
+    chat intact. Persistent and Auto-Tell tabs both survive.
+  - Hellion Schrift (Exo 2) no longer blocks font-size
+    adjustment — 4K users can scale up properly.
+  - Sidebar buttons align with the first message row, status
+    bar version slot is no longer clipped.
+
+  Migration v14 → v15: legacy theme fields removed
+  (HellionThemeEnabled, HellionThemeWindowOpacity). All other
+  settings preserved.
+
+  Polish (lerps, theme crossfade, header quick-picker) follows
+  in v1.3.0.
+
+  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+  **Hellion Chat 1.1.0 — Theme Foundation**
+
+  First major UI cycle after the standalone v1.0.0 cut. Theme engine,
+  five built-in themes, customisable JSON themes, modernised settings
+  layout.
+
+  New themes (Settings → Themes):
+
+  - **Hellion Arctic** — the brand default, Arctic Cyan + Ember Glow
+    on industrial slate.
+  - **Chat 2 Klassik** — Steel Blue on neutral grey, eckige Kanten.
+    The upstream Chat 2 look on the new engine.
+  - **Event Horizon** — Cosmic Purple on near-black. Deep-space mood.
+  - **Moonlit Bloom** — Bloom Magenta + Soft Sage on deep-violet
+    night.
+  - **Mint Grove** — Mint Green + Honey Amber on deep forest. First
+    member of the Grove family.
+
+  Theme engine highlights:
+
+  - Slug-based selection in Settings → Themes with mini-mockup
+    previews per theme.
+  - Click a theme card and the whole plugin (chat, settings,
+    pop-outs, viewer) repaints instantly.
+  - Custom themes via JSON in pluginConfigs/HellionChat/themes/.
+    Example template seeded on first launch.
+  - Optional per-theme chat-channel colours. When a theme proposes
+    its own chat colours and yours differ, a dezent banner offers
+    Apply / Keep — never auto-overwriting.
+  - Migration v13 → v14: existing users land on Hellion Arctic. Pick
+    Chat 2 Klassik to keep the upstream look.
+
+  Settings layout:
+
+  - New card-grid overview on Settings open. Click a card to drill
+    into the section.
+  - Breadcrumb back to overview, ESC also returns.
+  - Detail view drops the redundant tab list — section content uses
+    the full width.
+
+  Branding:
+
+  - Plugin icon swapped from the ChatTwo derivative to the Hellion
+    Forge hammer.
+  - New docs/THEME-AUTHORING.md walks you through writing your own
+    themes with the Forge logo on top.
+
+  Technical:
+
+  - HellionStyle.PushGlobal is now theme-driven. Configuration.
+    HellionThemeEnabled is deprecated and will be removed in v1.2.0.
+  - New ThemeRegistry singleton with LastWriteTime-cached custom-
+    theme loader.
+  - 51 local unit tests cover the data model, registry, JSON round-
+    trip and built-in sanity checks.
+
+  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
  **Hellion Chat 1.0.3 — Polish patch**

  - New: optionally hide chat (and every other plugin window) while the
@@ -20,10 +20,14 @@ public sealed class ExtraChat : IDisposable

    internal (string, uint)? ChannelOverride { get; set; }

-    private Dictionary<string, uint> ChannelCommandColoursInternal { get; set; } = new();
+    // Volatile reference: IPC callbacks (OnChannelCommandColours/OnChannelNames) fire on a
+    // Dalamud-dispatcher thread while the ImGui thread reads the IReadOnlyDictionary projections.
+    // Reference assignment is atomic on x64, but the JIT (especially Mono on Wine/Linux) needs
+    // the volatile barrier to guarantee visibility across threads. See AUDIT-2026-05-05 [SEC-01].
+    private volatile Dictionary<string, uint> ChannelCommandColoursInternal = new();
    internal IReadOnlyDictionary<string, uint> ChannelCommandColours => ChannelCommandColoursInternal;

-    private Dictionary<Guid, string> ChannelNamesInternal { get; set; } = new();
+    private volatile Dictionary<Guid, string> ChannelNamesInternal = new();
    internal IReadOnlyDictionary<Guid, string> ChannelNames => ChannelNamesInternal;

    internal ExtraChat()
@@ -40,9 +44,10 @@ public sealed class ExtraChat : IDisposable
            ChannelCommandColoursInternal = ChannelCommandColoursGate.InvokeFunc(null!);
            ChannelNamesInternal = ChannelNamesGate.InvokeFunc(null!);
        }
-        catch (Exception)
+        catch (Exception ex)
        {
-            // no-op
+            // ExtraChat is optional; missing IPC peer is normal when the plugin isn't loaded.
+            Plugin.Log.Verbose(ex, "ExtraChat IPC initial state query failed (peer not loaded?)");
        }
    }

@@ -34,7 +34,10 @@ internal class MessageManager : IAsyncDisposable
    // After that, the message is enqueued in the PendingAsync queue, which will
    // be consumed in a separate thread and perform more processing (emotes,
    // URLs) as well as inserting the message into the database.
-    private Queue<PendingMessage> PendingSync { get; } = [];
+    // LinkedList instead of Queue: ContentIdResolver hits PendingSync.Last
+    // every hook call. Queue<T>.Last() is the LINQ extension and walks the
+    // whole queue (O(n)); LinkedList<T>.Last is an O(1) node reference.
+    private LinkedList<PendingMessage> PendingSync { get; } = [];
    private ConcurrentQueue<PendingMessage> PendingAsync { get; } = [];
    private readonly Thread PendingMessageThread;
    private readonly CancellationTokenSource PendingThreadCancellationToken = new();
@@ -93,6 +96,10 @@ internal class MessageManager : IAsyncDisposable
            Plugin.Log.Debug("Sleeping because PendingMessageThread thread still alive");
        }

+        // CancellationTokenSource owns an unmanaged WaitHandle; dispose after the
+        // worker thread has drained, otherwise it leaks across plugin reloads.
+        PendingThreadCancellationToken.Dispose();
+
        Store.Dispose();
    }

@@ -113,8 +120,11 @@ internal class MessageManager : IAsyncDisposable
            LastContentId = contentId;

        // Drain the PendingSync queue into the PendingAsync queue.
-        while (PendingSync.TryDequeue(out var pending))
-            PendingAsync.Enqueue(pending);
+        while (PendingSync.First is { } first)
+        {
+            PendingSync.RemoveFirst();
+            PendingAsync.Enqueue(first.Value);
+        }
    }

    private void ProcessPendingMessages(CancellationToken token)
@@ -141,7 +151,13 @@ internal class MessageManager : IAsyncDisposable

    internal void ClearAllTabs()
    {
-        foreach (var tab in Plugin.Config.Tabs)
+        // Hellion Chat — TempTabs haben keine DB-Persistenz (session-only,
+        // direkt vom AutoTellTabsService befüllt). Ein Clear+Refilter würde
+        // sie leer hinterlassen weil FilterAllTabs nichts aus der DB
+        // findet — Tells sind oft durch Privacy-Filter blockiert oder
+        // schlicht session-flüchtig. TempTabs vom Clear-Pfad ausschließen
+        // damit Settings-Save den Tell-Verlauf nicht zerstört.
+        foreach (var tab in Plugin.Config.Tabs.Where(t => !t.IsTempTab))
            tab.Clear();
    }

@@ -155,7 +171,11 @@ internal class MessageManager : IAsyncDisposable

        // We store the pending messages to be added to the chat log in a
        // temporary list, and apply them all at once after filtering.
-        var pendingTabs = Plugin.Config.Tabs.Select(tab => (tab, new List<Message>())).ToList();
+        // TempTabs werden ausgeschlossen — sie bleiben live-state aus dem
+        // AutoTellTabsService, ein DB-Refilter würde sie nur partial
+        // wiederherstellen falls Tells in DB liegen, oder leer lassen wenn
+        // Privacy-Filter sie blockiert hat.
+        var pendingTabs = Plugin.Config.Tabs.Where(t => !t.IsTempTab).Select(tab => (tab, new List<Message>())).ToList();
        foreach (var message in messages)
            foreach (var (_, pendingMessages) in pendingTabs.Where(ptab => ptab.Item1.Matches(message)))
                pendingMessages.Add(message);
@@ -219,7 +239,7 @@ internal class MessageManager : IAsyncDisposable
        // We delay messages to be handed off to the async processing thread
        // in the next tick, otherwise we can't get the content ID from the hook
        // below.
-        PendingSync.Enqueue(pendingMessage);
+        PendingSync.AddLast(pendingMessage);
    }

    // This hook is called immediately after receiving a message with the
@@ -231,11 +251,11 @@ internal class MessageManager : IAsyncDisposable
        try
        {
            ContentIdResolverHook?.Original(agent, contentId, accountId, messageIndex, worldId, chatType);
-            if (PendingSync.Count == 0)
+            if (PendingSync.Last is not { } last)
                return;

-            PendingSync.Last().ContentId = contentId;
-            PendingSync.Last().AccountId = accountId;
+            last.Value.ContentId = contentId;
+            last.Value.AccountId = accountId;
        }
        catch (Exception ex)
        {
@@ -452,7 +452,10 @@ internal class MessageStore : IDisposable
        // covers any future write paths e.g. webinterface backfill).
        if (!Plugin.Config.IsAllowedForStorage(message.Code.Type))
        {
-            Plugin.Log.Debug($"Privacy filter dropped message: ChatType={message.Code.Type}");
+            // Verbose-only: this fires for every dropped message, which is
+            // the common case for users with a tight privacy whitelist. Keep
+            // it for diagnostics but stay out of the default xllog stream.
+            Plugin.Log.Verbose($"Privacy filter dropped message: ChatType={message.Code.Type}");
            return;
        }

@@ -63,6 +63,8 @@ public sealed class Plugin : IDalamudPlugin
    internal ExtraChat ExtraChat { get; }
    internal TypingIpc TypingIpc { get; }
    internal FontManager FontManager { get; }
+    internal Themes.ThemeRegistry ThemeRegistry { get; private set; } = null!;
+    internal Ui.StatusBar StatusBar { get; private set; } = null!;

    internal int DeferredSaveFrames = -1;

@@ -237,6 +239,168 @@ public sealed class Plugin : IDalamudPlugin
                });
            }

+            // Hellion Chat v13 → v14 — theme-engine migration. Alle User landen
+            // auf "hellion-arctic" als neues Default-Theme; die alte
+            // HellionThemeEnabled-Flag wird deprecated und nur noch ein Release
+            // als Safety-Net im JSON behalten. Window-Opacity wandert von
+            // HellionThemeWindowOpacity in das neue WindowOpacity-Feld.
+            if (Config.Version < 14)
+            {
+                Config.Theme = "hellion-arctic";
+                // v1.2.0: alter Opacity-Wert wird nicht mehr migriert (Field entfernt).
+                // User die direkt v13 → v15 springen bekommen den Default 0.85.
+                Config.ReduceMotion = false;
+                Config.UseCompactDensity = false;
+                Config.Version = 14;
+                SaveConfig();
+                Log.Information(
+                    "Migrated config v13 → v14: theme engine introduced, all users land on hellion-arctic; " +
+                    "pick chat2-classic in Settings → Themes for the upstream look");
+            }
+
+            if (Config.Version < 15)
+            {
+                // v1.2.0 — keine Datenmigration nötig. Removal der deprecated
+                // Theme-Felder ist reine Schema-Bereinigung (System.Text.Json
+                // ignoriert unbekannte Felder im JSON, daher kein Crash bei
+                // Configs die noch HellionThemeEnabled/HellionThemeWindowOpacity
+                // serialisiert haben — die Werte verfallen einfach).
+                Config.Version = 15;
+                SaveConfig();
+                Log.Information(
+                    "Migrated config v14 → v15: legacy theme fields removed " +
+                    "(HellionThemeEnabled, HellionThemeWindowOpacity)");
+            }
+
+            // Hellion Chat v15 → v16 — Settings Cleanup. Re-Sortierung der
+            // Tabs auf der UI-Seite (datenneutral). 4 tote Felder verfallen
+            // beim System.Text.Json-Deserialize (OverrideStyle, ChosenStyle,
+            // WindowAlpha, ShowThemeQuickPicker — sind alle nicht mehr im
+            // Configuration-Schema definiert). WindowAlpha wird zuvor auf
+            // WindowOpacity gemappt damit User die ihn gesetzt hatten ihre
+            // Transparenz-Einstellung behalten.
+            if (Config.Version < 16)
+            {
+                var pluginConfigsDir = Interface.ConfigDirectory.Parent?.FullName;
+                var liveConfigPath = pluginConfigsDir is not null
+                    ? Path.Combine(pluginConfigsDir, $"{Interface.InternalName}.json")
+                    : null;
+
+                // Backup-Datei neben der live Config — Pattern aus v13 Branch.
+                if (pluginConfigsDir is not null && liveConfigPath is not null)
+                {
+                    var backupPath = Path.Combine(pluginConfigsDir, $"{Interface.InternalName}.json.pre-v16-backup");
+                    try
+                    {
+                        if (File.Exists(liveConfigPath))
+                            File.Copy(liveConfigPath, backupPath, overwrite: true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Log.Warning(ex, "HellionChat: pre-v16 config backup failed");
+                    }
+                }
+
+                // Pre-v16 Felder einmalig roh aus dem JSON lesen, da sie nicht
+                // mehr im Configuration-Schema sind (und damit aus Config nicht
+                // mehr abrufbar). WindowAlpha → WindowOpacity Mapping nur wenn
+                // User WindowOpacity noch nicht selbst angefasst hat (Default
+                // 0.85), sonst gewinnt der User-Wert.
+                float oldWindowAlpha = 100f;
+                bool oldOverrideStyle = false;
+                if (liveConfigPath is not null)
+                {
+                    try
+                    {
+                        if (File.Exists(liveConfigPath))
+                        {
+                            var rawJson = File.ReadAllText(liveConfigPath);
+                            using var doc = System.Text.Json.JsonDocument.Parse(rawJson);
+                            if (doc.RootElement.TryGetProperty("WindowAlpha", out var alphaProp)
+                                && alphaProp.ValueKind == System.Text.Json.JsonValueKind.Number)
+                            {
+                                oldWindowAlpha = alphaProp.GetSingle();
+                            }
+                            if (doc.RootElement.TryGetProperty("OverrideStyle", out var ovProp)
+                                && ovProp.ValueKind is System.Text.Json.JsonValueKind.True)
+                            {
+                                oldOverrideStyle = true;
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Log.Warning(ex, "HellionChat: pre-v16 legacy-field lookup failed, defaults assumed");
+                    }
+                }
+
+                if (oldWindowAlpha != 100f
+                    && Math.Abs(Config.WindowOpacity - 0.85f) < 0.001f)
+                {
+                    Config.WindowOpacity = Math.Clamp(oldWindowAlpha / 100f, 0.5f, 1.0f);
+                    Log.Information(
+                        $"Migrated WindowAlpha {oldWindowAlpha} to WindowOpacity {Config.WindowOpacity}");
+                }
+                else if (oldWindowAlpha != 100f)
+                {
+                    Log.Information(
+                        $"Skipped WindowAlpha→WindowOpacity migration: WindowOpacity already user-set " +
+                        $"({Config.WindowOpacity}), legacy WindowAlpha value {oldWindowAlpha} dropped.");
+                }
+
+                if (oldOverrideStyle)
+                {
+                    Notification.AddNotification(new Dalamud.Interface.ImGuiNotification.Notification
+                    {
+                        Title = "Hellion Chat 1.2.1",
+                        Content = HellionStrings.Migration_v16_OverrideStyle_Toast,
+                        Type = Dalamud.Interface.ImGuiNotification.NotificationType.Info,
+                        InitialDuration = TimeSpan.FromSeconds(25),
+                    });
+                }
+
+                // v1.2.1 Default-Bumps für UX-Verbesserungen. Pattern: nur
+                // migrieren wenn der User noch auf dem alten Default ist.
+                // Bei bool-Werten ist die Erkennung pragmatisch — wer den
+                // alten Default aktiv ausgeschaltet hatte, erlebt das als
+                // Regression und stellt es einmal in den Settings zurück.
+                // Der Trade-Off ist akzeptabel weil die alten Defaults in
+                // v1.2.0 erst neu eingeführt wurden und kaum jemand aktiv
+                // umgeschaltet hat.
+                if (!Config.UseCompactDensity)
+                {
+                    Config.UseCompactDensity = true;
+                    Log.Information("v16 default-bump: UseCompactDensity false → true");
+                }
+                if (!Config.HideInNewGamePlusMenu)
+                {
+                    Config.HideInNewGamePlusMenu = true;
+                    Log.Information("v16 default-bump: HideInNewGamePlusMenu false → true");
+                }
+                if (!Config.HideSameTimestamps)
+                {
+                    Config.HideSameTimestamps = true;
+                    Log.Information("v16 default-bump: HideSameTimestamps false → true");
+                }
+                if (Config.MaxLinesToRender == 5000)
+                {
+                    Config.MaxLinesToRender = 2500;
+                    Log.Information("v16 default-bump: MaxLinesToRender 5000 → 2500");
+                }
+                if (Config.ChatColours.Count == 0)
+                {
+                    foreach (var (channel, colour) in Resources.ChatColourPresets.All["Hellion"].Colours)
+                        Config.ChatColours[channel] = colour;
+                    Log.Information("v16 default-bump: ChatColours empty → Hellion brand preset");
+                }
+
+                Config.Version = 16;
+                SaveConfig();
+                Log.Information(
+                    "Migrated config v15 → v16: settings cleanup, " +
+                    "OverrideStyle/ChosenStyle/WindowAlpha/ShowThemeQuickPicker dropped from schema");
+            }
+
            // Hellion v1.0.0 default tab layout. Five thematically separated
            // tabs: General catches the immediate-surroundings public chat
            // (Say/Yell/Shout) only; System absorbs the rest of the technical
@@ -266,6 +430,16 @@ public sealed class Plugin : IDalamudPlugin
            ExtraChat = new ExtraChat();
            FontManager = new FontManager();

+            // v1.1.0 — Theme-Engine init. Custom-Themes liegen in
+            // pluginConfigs/HellionChat/themes/, lazy geladen beim ersten Get.
+            var customThemesDir = Path.Combine(Interface.ConfigDirectory.FullName, "themes");
+            Directory.CreateDirectory(customThemesDir);
+            SeedExampleThemeIfEmpty(customThemesDir);
+            ThemeRegistry = new Themes.ThemeRegistry(customThemesDir);
+            ThemeRegistry.Switch(Config.Theme);
+
+            StatusBar = new Ui.StatusBar();
+
            MessageManager = new MessageManager(this); // Does it require UI?

            // Hellion Chat — Auto-Tell-Tabs service. Subscribes to the
@@ -529,10 +703,15 @@ public sealed class Plugin : IDalamudPlugin
                if (deleted > 0)
                {
                    Log.Information($"Retention sweep deleted {deleted} expired messages.");
+                    // Run the clear+refilter synchronously on the framework thread.
+                    // Earlier this called FilterAllTabsAsync(), which is fire-and-forget
+                    // — the .Wait() here would return as soon as the inner Task.Run was
+                    // dispatched, racing the next sweep cycle against the still-running
+                    // filter pass. See AUDIT-2026-05-05 [QUAL-02].
                    Framework.Run(() =>
                    {
                        MessageManager.ClearAllTabs();
-                        MessageManager.FilterAllTabsAsync();
+                        MessageManager.FilterAllTabs();
                    }).Wait();
                }
                else
@@ -554,13 +733,10 @@ public sealed class Plugin : IDalamudPlugin

    private void Draw()
    {
-        // Hellion theme is pushed once per frame here so every plugin window
-        // (chat log, settings, viewers, wizard, file dialog) renders with
-        // the same palette. Skipping the push leaves the upstream Dalamud
-        // look untouched for users who flipped the toggle off.
-        using IDisposable? _style = Config.HellionThemeEnabled
-            ? HellionStyle.PushGlobal(Config.HellionThemeWindowOpacity)
-            : null;
+        // Theme-Engine ist ab v14 immer aktiv; Klassik ist jetzt ein eigenes
+        // Theme statt einem deaktivierten Hellion-Theme. Active wird einmal
+        // pro Frame aus der Registry gelesen.
+        using IDisposable _style = HellionStyle.PushGlobal(ThemeRegistry.Active, Config.WindowOpacity);

        ChatLogWindow.BeginFrame();

@@ -645,4 +821,36 @@ public sealed class Plugin : IDalamudPlugin
    public static bool InBattle => Condition[ConditionFlag.InCombat];
    public static bool GposeActive => Condition[ConditionFlag.WatchingCutscene];
    public static bool CutsceneActive => Condition[ConditionFlag.OccupiedInCutSceneEvent] || Condition[ConditionFlag.WatchingCutscene78];
+
+    // v1.1.0 — wenn der themes/-Ordner leer ist, schreiben wir die embedded
+    // example-theme.json als Vorlage rein. Bestehende User-Customs werden
+    // nicht angefasst (existing JSONs lassen den Block überspringen).
+    private static void SeedExampleThemeIfEmpty(string dir)
+    {
+        if (Directory.EnumerateFiles(dir, "*.json").Any())
+            return;
+
+        var examplePath = Path.Combine(dir, "example-theme.json");
+        var resourceStream = typeof(Plugin).Assembly.GetManifestResourceStream("HellionChat.Themes.Builtin.example-theme.json");
+        if (resourceStream is null)
+        {
+            Log.Warning("Themes example template not found in assembly resources; skipping seed.");
+            return;
+        }
+
+        try
+        {
+            using var fileStream = File.Create(examplePath);
+            resourceStream.CopyTo(fileStream);
+            Log.Information($"Seeded example-theme.json into {dir}");
+        }
+        catch (IOException ex)
+        {
+            Log.Warning(ex, "Failed to seed example-theme.json; user can create custom themes manually.");
+        }
+        finally
+        {
+            resourceStream.Dispose();
+        }
+    }
 }
@@ -203,6 +203,37 @@ internal class HellionStrings
    internal static string Settings_Tab_Database => Get(nameof(Settings_Tab_Database));
    internal static string Settings_Tab_Information => Get(nameof(Settings_Tab_Information));

+    // v1.1.0 — Settings card-grid overview
+    internal static string Settings_Card_General_Title => Get(nameof(Settings_Card_General_Title));
+    internal static string Settings_Card_General_Subtext => Get(nameof(Settings_Card_General_Subtext));
+    internal static string Settings_Card_Appearance_Title => Get(nameof(Settings_Card_Appearance_Title));
+    internal static string Settings_Card_Appearance_Subtext => Get(nameof(Settings_Card_Appearance_Subtext));
+    internal static string Settings_Card_Themes_Title => Get(nameof(Settings_Card_Themes_Title));
+    internal static string Settings_Card_Themes_Subtext => Get(nameof(Settings_Card_Themes_Subtext));
+    internal static string Settings_Card_Window_Title => Get(nameof(Settings_Card_Window_Title));
+    internal static string Settings_Card_Window_Subtext => Get(nameof(Settings_Card_Window_Subtext));
+    internal static string Settings_Card_Chat_Title => Get(nameof(Settings_Card_Chat_Title));
+    internal static string Settings_Card_Chat_Subtext => Get(nameof(Settings_Card_Chat_Subtext));
+    internal static string Settings_Card_Tabs_Title => Get(nameof(Settings_Card_Tabs_Title));
+    internal static string Settings_Card_Tabs_Subtext => Get(nameof(Settings_Card_Tabs_Subtext));
+    internal static string Settings_Card_Privacy_Title => Get(nameof(Settings_Card_Privacy_Title));
+    internal static string Settings_Card_Privacy_Subtext => Get(nameof(Settings_Card_Privacy_Subtext));
+    internal static string Settings_Card_Database_Title => Get(nameof(Settings_Card_Database_Title));
+    internal static string Settings_Card_Database_Subtext => Get(nameof(Settings_Card_Database_Subtext));
+    internal static string Settings_Card_Information_Title => Get(nameof(Settings_Card_Information_Title));
+    internal static string Settings_Card_Information_Subtext => Get(nameof(Settings_Card_Information_Subtext));
+
+    // v1.1.0 — Themes-Settings-Tab
+    internal static string Settings_Tab_Themes => Get(nameof(Settings_Tab_Themes));
+    internal static string Settings_Themes_Active => Get(nameof(Settings_Themes_Active));
+    internal static string Settings_Themes_BuiltIns => Get(nameof(Settings_Themes_BuiltIns));
+    internal static string Settings_Themes_Custom => Get(nameof(Settings_Themes_Custom));
+    internal static string Settings_Themes_OpenFolder => Get(nameof(Settings_Themes_OpenFolder));
+    internal static string Settings_Themes_ExportActive => Get(nameof(Settings_Themes_ExportActive));
+    internal static string Settings_Themes_ApplyChatColors_Hint => Get(nameof(Settings_Themes_ApplyChatColors_Hint));
+    internal static string Settings_Themes_ApplyChatColors_Apply => Get(nameof(Settings_Themes_ApplyChatColors_Apply));
+    internal static string Settings_Themes_ApplyChatColors_Keep => Get(nameof(Settings_Themes_ApplyChatColors_Keep));
+
    // Hellion Chat — General-Tab section headings
    internal static string Settings_General_Input_Heading => Get(nameof(Settings_General_Input_Heading));
    internal static string Settings_General_Audio_Heading => Get(nameof(Settings_General_Audio_Heading));
@@ -245,6 +276,11 @@ internal class HellionStrings
    internal static string Tabs_Presets_Linkshell => Get(nameof(Tabs_Presets_Linkshell));
    internal static string Tabs_Presets_Linkshell_Hint => Get(nameof(Tabs_Presets_Linkshell_Hint));

+    // Hellion Chat — v1.2.0 per-tab icon override
+    internal static string Tabs_Icon_Label => Get(nameof(Tabs_Icon_Label));
+    internal static string Tabs_Icon_HelpMarker => Get(nameof(Tabs_Icon_HelpMarker));
+    internal static string Tabs_Icon_DefaultOption => Get(nameof(Tabs_Icon_DefaultOption));
+
    // Hellion Chat — v0.6.0 chat colour presets (display labels)
    internal static string ChatColourPresets_Default => Get(nameof(ChatColourPresets_Default));
    internal static string ChatColourPresets_HighContrast => Get(nameof(ChatColourPresets_HighContrast));
@@ -279,4 +315,45 @@ internal class HellionStrings
    internal static string ChatTwoConflictTitle => Get(nameof(ChatTwoConflictTitle));
    internal static string ChatTwoConflictBody => Get(nameof(ChatTwoConflictBody));
    internal static string ChatTwoConflictAction => Get(nameof(ChatTwoConflictAction));
+
+    // Hellion Chat — v1.2.0 Bottom-Status-Bar Privacy-Badge labels
+    internal static string StatusBar_Privacy_Enabled => Get(nameof(StatusBar_Privacy_Enabled));
+    internal static string StatusBar_Privacy_Open => Get(nameof(StatusBar_Privacy_Open));
+
+    // Hellion Chat — v1.2.0 Appearance / Compact-Density toggle
+    internal static string Appearance_UseCompactDensity_Name => Get(nameof(Appearance_UseCompactDensity_Name));
+    internal static string Appearance_UseCompactDensity_Description => Get(nameof(Appearance_UseCompactDensity_Description));
+
+    // Hellion Chat — v1.2.1 Settings Cleanup: new card titles + subtexts
+    internal static string Settings_Card_ThemeAndLayout_Title => Get(nameof(Settings_Card_ThemeAndLayout_Title));
+    internal static string Settings_Card_ThemeAndLayout_Subtext => Get(nameof(Settings_Card_ThemeAndLayout_Subtext));
+    internal static string Settings_Card_FontsAndColours_Title => Get(nameof(Settings_Card_FontsAndColours_Title));
+    internal static string Settings_Card_FontsAndColours_Subtext => Get(nameof(Settings_Card_FontsAndColours_Subtext));
+    internal static string Settings_Card_DataManagement_Title => Get(nameof(Settings_Card_DataManagement_Title));
+    internal static string Settings_Card_DataManagement_Subtext => Get(nameof(Settings_Card_DataManagement_Subtext));
+
+    // Hellion Chat — v1.2.1 Theme & Layout tab section headings + WindowOpacity slider
+    internal static string Settings_ThemeAndLayout_Theme_Heading => Get(nameof(Settings_ThemeAndLayout_Theme_Heading));
+    internal static string Settings_ThemeAndLayout_WindowStyle_Heading => Get(nameof(Settings_ThemeAndLayout_WindowStyle_Heading));
+    internal static string Settings_ThemeAndLayout_TimestampStyle_Heading => Get(nameof(Settings_ThemeAndLayout_TimestampStyle_Heading));
+    internal static string Settings_ThemeAndLayout_WindowOpacity_Name => Get(nameof(Settings_ThemeAndLayout_WindowOpacity_Name));
+    internal static string Settings_ThemeAndLayout_WindowOpacity_Description => Get(nameof(Settings_ThemeAndLayout_WindowOpacity_Description));
+
+    // Hellion Chat — v1.2.1 Fonts & Colours tab section headings
+    internal static string Settings_FontsAndColours_Fonts_Heading => Get(nameof(Settings_FontsAndColours_Fonts_Heading));
+    internal static string Settings_FontsAndColours_Colours_Heading => Get(nameof(Settings_FontsAndColours_Colours_Heading));
+
+    // Hellion Chat — v1.2.1 Data Management tab section headings
+    internal static string Settings_DataManagement_Storage_Heading => Get(nameof(Settings_DataManagement_Storage_Heading));
+    internal static string Settings_DataManagement_Retention_Heading => Get(nameof(Settings_DataManagement_Retention_Heading));
+    internal static string Settings_DataManagement_Cleanup_Heading => Get(nameof(Settings_DataManagement_Cleanup_Heading));
+    internal static string Settings_DataManagement_Export_Heading => Get(nameof(Settings_DataManagement_Export_Heading));
+    internal static string Settings_DataManagement_DbViewer_Heading => Get(nameof(Settings_DataManagement_DbViewer_Heading));
+    internal static string Settings_DataManagement_Advanced_Heading => Get(nameof(Settings_DataManagement_Advanced_Heading));
+
+    // Hellion Chat — v1.2.1 Window-tab Behaviour heading (replaces Frame heading)
+    internal static string Settings_Window_Frame_Behaviour_Heading => Get(nameof(Settings_Window_Frame_Behaviour_Heading));
+
+    // Hellion Chat — v1.2.1 Migration v15 → v16 toast
+    internal static string Migration_v16_OverrideStyle_Toast => Get(nameof(Migration_v16_OverrideStyle_Toast));
 }
@@ -561,6 +561,17 @@
  <data name="Tabs_Presets_Linkshell_Hint" xml:space="preserve">
    <value>Wenn du mehrere Linkshells benutzt, empfiehlt der Maintainer einen Tab pro Shell für eine sauberere Übersicht. Tab duplizieren und je Kopie die Kanalauswahl einschränken.</value>
  </data>
+
+  <!-- Hellion Chat — v1.2.0 per-tab icon override -->
+  <data name="Tabs_Icon_Label" xml:space="preserve">
+    <value>Tab-Icon</value>
+  </data>
+  <data name="Tabs_Icon_HelpMarker" xml:space="preserve">
+    <value>FontAwesome-Glyph für die Sidebar. Default greift auf Tab-Name oder Channel-Typ.</value>
+  </data>
+  <data name="Tabs_Icon_DefaultOption" xml:space="preserve">
+    <value>(Default-Mapping)</value>
+  </data>
  <data name="ChatColourPresets_Default" xml:space="preserve">
    <value>Klassik (Chat 2 Default)</value>
  </data>
@@ -624,4 +635,160 @@
  <data name="ChatTwoConflictAction" xml:space="preserve">
    <value>Chat 2 in /xlplugins deaktivieren, danach Hellion Chat erneut aktivieren.</value>
  </data>
+  <data name="Settings_Card_General_Title" xml:space="preserve">
+    <value>Allgemein</value>
+  </data>
+  <data name="Settings_Card_General_Subtext" xml:space="preserve">
+    <value>Plugin-globale Einstellungen — Sprache, Eingabe, Audio, Performance.</value>
+  </data>
+  <data name="Settings_Card_Appearance_Title" xml:space="preserve">
+    <value>Erscheinungsbild</value>
+  </data>
+  <data name="Settings_Card_Appearance_Subtext" xml:space="preserve">
+    <value>Fensterdeckkraft, Schriften, Bewegung</value>
+  </data>
+  <data name="Settings_Card_Themes_Title" xml:space="preserve">
+    <value>Themes</value>
+  </data>
+  <data name="Settings_Card_Themes_Subtext" xml:space="preserve">
+    <value>Theme wählen oder eigenes importieren</value>
+  </data>
+  <data name="Settings_Card_Window_Title" xml:space="preserve">
+    <value>Fenster</value>
+  </data>
+  <data name="Settings_Card_Window_Subtext" xml:space="preserve">
+    <value>Verhalten des Fensters — wann es da ist, ob es bewegt werden kann.</value>
+  </data>
+  <data name="Settings_Card_Chat_Title" xml:space="preserve">
+    <value>Chat</value>
+  </data>
+  <data name="Settings_Card_Chat_Subtext" xml:space="preserve">
+    <value>Wie Nachrichten angezeigt werden — Tells, Vorschau, Verhalten, Emotes.</value>
+  </data>
+  <data name="Settings_Card_Tabs_Title" xml:space="preserve">
+    <value>Tabs</value>
+  </data>
+  <data name="Settings_Card_Tabs_Subtext" xml:space="preserve">
+    <value>Tab-Verwaltung — eigene Chat-Tabs anlegen und konfigurieren.</value>
+  </data>
+  <data name="Settings_Card_Privacy_Title" xml:space="preserve">
+    <value>Datenschutz</value>
+  </data>
+  <data name="Settings_Card_Privacy_Subtext" xml:space="preserve">
+    <value>Was darf gespeichert werden — Privacy-Filter pro Channel.</value>
+  </data>
+  <data name="Settings_Card_Database_Title" xml:space="preserve">
+    <value>Datenbank</value>
+  </data>
+  <data name="Settings_Card_Database_Subtext" xml:space="preserve">
+    <value>Speicher, Migration, alte Bereinigung</value>
+  </data>
+  <data name="Settings_Card_Information_Title" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="Settings_Card_Information_Subtext" xml:space="preserve">
+    <value>Über das Plugin — Version, Mission, Lizenz, Changelog.</value>
+  </data>
+  <data name="Settings_Tab_Themes" xml:space="preserve">
+    <value>Themes</value>
+  </data>
+  <data name="Settings_Themes_Active" xml:space="preserve">
+    <value>Aktiv: {0}</value>
+  </data>
+  <data name="Settings_Themes_BuiltIns" xml:space="preserve">
+    <value>Eingebaute Themes</value>
+  </data>
+  <data name="Settings_Themes_Custom" xml:space="preserve">
+    <value>Eigene Themes</value>
+  </data>
+  <data name="Settings_Themes_OpenFolder" xml:space="preserve">
+    <value>Themes-Ordner öffnen</value>
+  </data>
+  <data name="Settings_Themes_ExportActive" xml:space="preserve">
+    <value>Aktives exportieren...</value>
+  </data>
+  <data name="Settings_Themes_ApplyChatColors_Hint" xml:space="preserve">
+    <value>Dieses Theme schlägt eigene Channel-Farben vor.</value>
+  </data>
+  <data name="Settings_Themes_ApplyChatColors_Apply" xml:space="preserve">
+    <value>Übernehmen</value>
+  </data>
+  <data name="Settings_Themes_ApplyChatColors_Keep" xml:space="preserve">
+    <value>Behalten</value>
+  </data>
+  <data name="StatusBar_Privacy_Enabled" xml:space="preserve">
+    <value>Privacy-First</value>
+  </data>
+  <data name="StatusBar_Privacy_Open" xml:space="preserve">
+    <value>Offen</value>
+  </data>
+  <data name="Appearance_UseCompactDensity_Name" xml:space="preserve">
+    <value>Kompakte Dichte</value>
+  </data>
+  <data name="Appearance_UseCompactDensity_Description" xml:space="preserve">
+    <value>Schaltet das Message-Layout vom Card-Row-Default zurück auf einzeilige `[HH:mm] Sender: Text` Zeilen.</value>
+  </data>
+  <data name="Settings_Card_ThemeAndLayout_Title" xml:space="preserve">
+    <value>Theme &amp; Layout</value>
+  </data>
+  <data name="Settings_Card_ThemeAndLayout_Subtext" xml:space="preserve">
+    <value>Wie das Fenster aussieht — Theme, Rahmen, Zeitstempel-Style.</value>
+  </data>
+  <data name="Settings_Card_FontsAndColours_Title" xml:space="preserve">
+    <value>Schriften &amp; Farben</value>
+  </data>
+  <data name="Settings_Card_FontsAndColours_Subtext" xml:space="preserve">
+    <value>Lesbarkeit — Schriftart, Schriftgröße, Chat-Farben pro Channel.</value>
+  </data>
+  <data name="Settings_Card_DataManagement_Title" xml:space="preserve">
+    <value>Daten-Verwaltung</value>
+  </data>
+  <data name="Settings_Card_DataManagement_Subtext" xml:space="preserve">
+    <value>Was passiert mit gespeicherten Daten — Aufbewahrung, Aufräumen, Export, DB-Stats.</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowStyle_Heading" xml:space="preserve">
+    <value>Fenster-Style</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_TimestampStyle_Heading" xml:space="preserve">
+    <value>Zeitstempel-Style</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowOpacity_Name" xml:space="preserve">
+    <value>Fenster-Transparenz</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowOpacity_Description" xml:space="preserve">
+    <value>Wie durchsichtig der Fensterhintergrund ist. Niedrigere Werte lassen mehr vom Spiel durchscheinen. Tipp: Dalamud's Per-Window-Menü (Hamburger in der Titelleiste) bietet pro Fenster eigene Overrides für Deckkraft, Hintergrund-Blur, Durchklick und Anpinnen — die haben Vorrang über diesen Slider für das jeweilige Fenster.</value>
+  </data>
+  <data name="Settings_FontsAndColours_Fonts_Heading" xml:space="preserve">
+    <value>Schriftarten</value>
+  </data>
+  <data name="Settings_FontsAndColours_Colours_Heading" xml:space="preserve">
+    <value>Chat-Farben</value>
+  </data>
+  <data name="Settings_DataManagement_Storage_Heading" xml:space="preserve">
+    <value>Speicherung</value>
+  </data>
+  <data name="Settings_DataManagement_Retention_Heading" xml:space="preserve">
+    <value>Aufbewahrung</value>
+  </data>
+  <data name="Settings_DataManagement_Cleanup_Heading" xml:space="preserve">
+    <value>Cleanup</value>
+  </data>
+  <data name="Settings_DataManagement_Export_Heading" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="Settings_DataManagement_DbViewer_Heading" xml:space="preserve">
+    <value>Datenbank-Viewer</value>
+  </data>
+  <data name="Settings_DataManagement_Advanced_Heading" xml:space="preserve">
+    <value>Erweitert (Shift+Klick zum Öffnen)</value>
+  </data>
+  <data name="Settings_Window_Frame_Behaviour_Heading" xml:space="preserve">
+    <value>Verhalten</value>
+  </data>
+  <data name="Migration_v16_OverrideStyle_Toast" xml:space="preserve">
+    <value>Hellion Chat 1.2.1 hat das Settings-Menü neu sortiert und die alte „Stilüberschreiben"-Option entfernt (überholt durch das Theme-System aus 1.1.0). Deine restlichen Einstellungen bleiben unverändert. Die Fenster-Transparenz ist nach „Theme &amp; Layout" migriert. Ein Backup der vorherigen Config liegt unter pluginConfigs/HellionChat.json.pre-v16-backup neben der aktiven HellionChat.json.</value>
+  </data>
 </root>
@@ -561,6 +561,17 @@
  <data name="Tabs_Presets_Linkshell_Hint" xml:space="preserve">
    <value>If you use multiple linkshells, the maintainer recommends one tab per shell for cleaner readability. Duplicate this tab and narrow the channel selection per copy.</value>
  </data>
+
+  <!-- Hellion Chat — v1.2.0 per-tab icon override -->
+  <data name="Tabs_Icon_Label" xml:space="preserve">
+    <value>Tab-Icon</value>
+  </data>
+  <data name="Tabs_Icon_HelpMarker" xml:space="preserve">
+    <value>FontAwesome-Glyph für die Sidebar. Default greift auf Tab-Name oder Channel-Typ.</value>
+  </data>
+  <data name="Tabs_Icon_DefaultOption" xml:space="preserve">
+    <value>(Default-Mapping)</value>
+  </data>
  <data name="ChatColourPresets_Default" xml:space="preserve">
    <value>Klassik (Chat 2 Default)</value>
  </data>
@@ -624,4 +635,160 @@
  <data name="ChatTwoConflictAction" xml:space="preserve">
    <value>Disable Chat 2 in /xlplugins, then re-enable Hellion Chat.</value>
  </data>
+  <data name="Settings_Card_General_Title" xml:space="preserve">
+    <value>General</value>
+  </data>
+  <data name="Settings_Card_General_Subtext" xml:space="preserve">
+    <value>Plugin-wide settings — language, input, audio, performance.</value>
+  </data>
+  <data name="Settings_Card_Appearance_Title" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+  <data name="Settings_Card_Appearance_Subtext" xml:space="preserve">
+    <value>Window opacity, fonts, motion</value>
+  </data>
+  <data name="Settings_Card_Themes_Title" xml:space="preserve">
+    <value>Themes</value>
+  </data>
+  <data name="Settings_Card_Themes_Subtext" xml:space="preserve">
+    <value>Choose a theme or import your own</value>
+  </data>
+  <data name="Settings_Card_Window_Title" xml:space="preserve">
+    <value>Window</value>
+  </data>
+  <data name="Settings_Card_Window_Subtext" xml:space="preserve">
+    <value>Window behaviour — when it shows, whether it can move.</value>
+  </data>
+  <data name="Settings_Card_Chat_Title" xml:space="preserve">
+    <value>Chat</value>
+  </data>
+  <data name="Settings_Card_Chat_Subtext" xml:space="preserve">
+    <value>How messages are displayed — tells, preview, behaviour, emotes.</value>
+  </data>
+  <data name="Settings_Card_Tabs_Title" xml:space="preserve">
+    <value>Tabs</value>
+  </data>
+  <data name="Settings_Card_Tabs_Subtext" xml:space="preserve">
+    <value>Tab management — create and configure your own chat tabs.</value>
+  </data>
+  <data name="Settings_Card_Privacy_Title" xml:space="preserve">
+    <value>Privacy</value>
+  </data>
+  <data name="Settings_Card_Privacy_Subtext" xml:space="preserve">
+    <value>What's allowed to be stored — privacy filter per channel.</value>
+  </data>
+  <data name="Settings_Card_Database_Title" xml:space="preserve">
+    <value>Database</value>
+  </data>
+  <data name="Settings_Card_Database_Subtext" xml:space="preserve">
+    <value>Storage, migration, legacy cleanup</value>
+  </data>
+  <data name="Settings_Card_Information_Title" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="Settings_Card_Information_Subtext" xml:space="preserve">
+    <value>About the plugin — version, mission, license, changelog.</value>
+  </data>
+  <data name="Settings_Tab_Themes" xml:space="preserve">
+    <value>Themes</value>
+  </data>
+  <data name="Settings_Themes_Active" xml:space="preserve">
+    <value>Active: {0}</value>
+  </data>
+  <data name="Settings_Themes_BuiltIns" xml:space="preserve">
+    <value>Built-in themes</value>
+  </data>
+  <data name="Settings_Themes_Custom" xml:space="preserve">
+    <value>Custom themes</value>
+  </data>
+  <data name="Settings_Themes_OpenFolder" xml:space="preserve">
+    <value>Open themes folder</value>
+  </data>
+  <data name="Settings_Themes_ExportActive" xml:space="preserve">
+    <value>Export active...</value>
+  </data>
+  <data name="Settings_Themes_ApplyChatColors_Hint" xml:space="preserve">
+    <value>This theme suggests its own chat channel colours.</value>
+  </data>
+  <data name="Settings_Themes_ApplyChatColors_Apply" xml:space="preserve">
+    <value>Apply</value>
+  </data>
+  <data name="Settings_Themes_ApplyChatColors_Keep" xml:space="preserve">
+    <value>Keep current</value>
+  </data>
+  <data name="StatusBar_Privacy_Enabled" xml:space="preserve">
+    <value>Privacy-First</value>
+  </data>
+  <data name="StatusBar_Privacy_Open" xml:space="preserve">
+    <value>Open</value>
+  </data>
+  <data name="Appearance_UseCompactDensity_Name" xml:space="preserve">
+    <value>Compact Density</value>
+  </data>
+  <data name="Appearance_UseCompactDensity_Description" xml:space="preserve">
+    <value>Schaltet das Message-Layout vom Card-Row-Default zurück auf einzeilige `[HH:mm] Sender: Text` Zeilen.</value>
+  </data>
+  <data name="Settings_Card_ThemeAndLayout_Title" xml:space="preserve">
+    <value>Theme &amp; Layout</value>
+  </data>
+  <data name="Settings_Card_ThemeAndLayout_Subtext" xml:space="preserve">
+    <value>How the window looks — theme, frame, timestamp style.</value>
+  </data>
+  <data name="Settings_Card_FontsAndColours_Title" xml:space="preserve">
+    <value>Fonts &amp; Colours</value>
+  </data>
+  <data name="Settings_Card_FontsAndColours_Subtext" xml:space="preserve">
+    <value>Readability — font, font size, per-channel chat colours.</value>
+  </data>
+  <data name="Settings_Card_DataManagement_Title" xml:space="preserve">
+    <value>Data Management</value>
+  </data>
+  <data name="Settings_Card_DataManagement_Subtext" xml:space="preserve">
+    <value>What happens to stored data — retention, cleanup, export, DB stats.</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowStyle_Heading" xml:space="preserve">
+    <value>Window Style</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_TimestampStyle_Heading" xml:space="preserve">
+    <value>Timestamp Style</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowOpacity_Name" xml:space="preserve">
+    <value>Window Transparency</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowOpacity_Description" xml:space="preserve">
+    <value>How transparent the window background is. Lower values let the game show through more. Tip: Dalamud's per-window menu (Hamburger in the title bar) gives you per-window overrides for opacity, background blur, click-through and pinning — those override this slider for that window.</value>
+  </data>
+  <data name="Settings_FontsAndColours_Fonts_Heading" xml:space="preserve">
+    <value>Fonts</value>
+  </data>
+  <data name="Settings_FontsAndColours_Colours_Heading" xml:space="preserve">
+    <value>Chat Colours</value>
+  </data>
+  <data name="Settings_DataManagement_Storage_Heading" xml:space="preserve">
+    <value>Storage</value>
+  </data>
+  <data name="Settings_DataManagement_Retention_Heading" xml:space="preserve">
+    <value>Retention</value>
+  </data>
+  <data name="Settings_DataManagement_Cleanup_Heading" xml:space="preserve">
+    <value>Cleanup</value>
+  </data>
+  <data name="Settings_DataManagement_Export_Heading" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="Settings_DataManagement_DbViewer_Heading" xml:space="preserve">
+    <value>Database Viewer</value>
+  </data>
+  <data name="Settings_DataManagement_Advanced_Heading" xml:space="preserve">
+    <value>Advanced (Shift+Click to open)</value>
+  </data>
+  <data name="Settings_Window_Frame_Behaviour_Heading" xml:space="preserve">
+    <value>Behaviour</value>
+  </data>
+  <data name="Migration_v16_OverrideStyle_Toast" xml:space="preserve">
+    <value>Hellion Chat 1.2.1 reorganised the Settings menu and removed the legacy "Style override" option (made obsolete by the Themes system in 1.1.0). Your other settings are unchanged. Window opacity was migrated to Theme &amp; Layout. A backup of your previous config is at pluginConfigs/HellionChat.json.pre-v16-backup next to the live HellionChat.json.</value>
+  </data>
 </root>
@@ -0,0 +1,50 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class Chat2Classic
+{
+    public const string Slug = "chat2-classic";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Chat 2 Klassik",
+        Author: "Upstream (Infi & Anna)",
+        Description: "Steel-blue accents on neutral dark grey, eckige Kanten. Vertraut für ChatTwo-Veteranen.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#3D6E92"),
+            Primary:        ColourUtil.HexToRgba("#4682B4"),
+            PrimaryLight:   ColourUtil.HexToRgba("#5C9DC8"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#4682B466"),
+
+            AccentDark:     ColourUtil.HexToRgba("#3D6E92"),
+            Accent:         ColourUtil.HexToRgba("#4682B4"),
+            AccentLight:    ColourUtil.HexToRgba("#5C9DC8"),
+
+            Identity:       ColourUtil.HexToRgba("#4682B4"),
+
+            WindowBg:       ColourUtil.HexToRgba("#0F0F0FF2"),
+            ChildBg:        ColourUtil.HexToRgba("#141414"),
+            FrameBg:        ColourUtil.HexToRgba("#1A1A1A"),
+            Surface:        ColourUtil.HexToRgba("#202020"),
+            SurfaceHover:   ColourUtil.HexToRgba("#2C2C2C"),
+            Border:         ColourUtil.HexToRgba("#404040"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#E6E6E6"),
+            TextMuted:      ColourUtil.HexToRgba("#999999"),
+            TextDim:        ColourUtil.HexToRgba("#666666"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#5CB85C"),
+            StatusDanger:   ColourUtil.HexToRgba("#D9534F"),
+            StatusWarning:  ColourUtil.HexToRgba("#F0AD4E"),
+            StatusInfo:     ColourUtil.HexToRgba("#4682B4")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 0f, ChildRounding: 0f, PopupRounding: 0f,
+            FrameRounding: 0f, GrabRounding: 0f, TabRounding: 0f,
+            ScrollbarRounding: 0f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true
+    );
+}
@@ -0,0 +1,77 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class EventHorizon
+{
+    public const string Slug = "event-horizon";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Event Horizon",
+        Author: "Hellion Online Media",
+        Description: "Cosmic Purple auf Near-Black. Deep-Space-Stimmung.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#7B3FCF"),
+            Primary:        ColourUtil.HexToRgba("#9D5CFF"),
+            PrimaryLight:   ColourUtil.HexToRgba("#B585FF"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#9D5CFF99"),
+
+            AccentDark:     ColourUtil.HexToRgba("#C9982E"),
+            Accent:         ColourUtil.HexToRgba("#E0AB36"),
+            AccentLight:    ColourUtil.HexToRgba("#F2C25C"),
+
+            Identity:       ColourUtil.HexToRgba("#9D5CFF"),
+
+            WindowBg:       ColourUtil.HexToRgba("#040308"),
+            ChildBg:        ColourUtil.HexToRgba("#0A081A"),
+            FrameBg:        ColourUtil.HexToRgba("#140F23"),
+            Surface:        ColourUtil.HexToRgba("#1B1530"),
+            SurfaceHover:   ColourUtil.HexToRgba("#251D40"),
+            Border:         ColourUtil.HexToRgba("#9D5CFF44"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#E6E0F5"),
+            TextMuted:      ColourUtil.HexToRgba("#9890B5"),
+            TextDim:        ColourUtil.HexToRgba("#5A5570"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#26A269"),
+            StatusDanger:   ColourUtil.HexToRgba("#ED333B"),
+            StatusWarning:  ColourUtil.HexToRgba("#E0AB36"),
+            StatusInfo:     ColourUtil.HexToRgba("#9D5CFF")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
+            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
+            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true,
+        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
+        {
+            // Event Horizon — Cosmic-Purple-Drift: helle Pastelle bekommen
+            // Lavender-Tinte, Akzent-Channels (Tell) ziehen Richtung Magenta-
+            // Lila. Channel-Identität bleibt klar erkennbar.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#E6E0F5"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F2C25C"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#FF9050"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#E090FF"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#E090FF"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#90A0FF"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#FFAA80"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#9090E8"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A0E090"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#90A0FF"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A0E090"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#F0B070"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F2C25C"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E0B0"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#90A0FF"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#B585FF"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#E090FF"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#D0A0F0"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E0B870"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E0B870"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#9890B5"),
+        })
+    );
+}
@@ -0,0 +1,76 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class ForgeMerchantman
+{
+    public const string Slug = "forge-merchantman";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Forge Merchantman",
+        Author: "Hellion Online Media",
+        Description: "Patina Bronze auf Workshop-Slate — Hellion Forge im Plugin.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#1F8A82"),
+            Primary:        ColourUtil.HexToRgba("#2DB39E"),
+            PrimaryLight:   ColourUtil.HexToRgba("#4FC9B0"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#2DB39E99"),
+
+            AccentDark:     ColourUtil.HexToRgba("#B86A20"),
+            Accent:         ColourUtil.HexToRgba("#D9892C"),
+            AccentLight:    ColourUtil.HexToRgba("#E8A04A"),
+
+            Identity:       ColourUtil.HexToRgba("#1F8A82"),
+
+            WindowBg:       ColourUtil.HexToRgba("#050B0A"),
+            ChildBg:        ColourUtil.HexToRgba("#0B1413"),
+            FrameBg:        ColourUtil.HexToRgba("#11201D"),
+            Surface:        ColourUtil.HexToRgba("#182925"),
+            SurfaceHover:   ColourUtil.HexToRgba("#213631"),
+            Border:         ColourUtil.HexToRgba("#2DB39E66"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#D8EFE8"),
+            TextMuted:      ColourUtil.HexToRgba("#8FA39B"),
+            TextDim:        ColourUtil.HexToRgba("#5A6E66"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#5CB85C"),
+            StatusDanger:   ColourUtil.HexToRgba("#D9534F"),
+            StatusWarning:  ColourUtil.HexToRgba("#F0AD4E"),
+            StatusInfo:     ColourUtil.HexToRgba("#2DB39E")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 4f, ChildRounding: 3f, PopupRounding: 3f,
+            FrameRounding: 2f, GrabRounding: 2f, TabRounding: 2f,
+            ScrollbarRounding: 2f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true,
+        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
+        {
+            // Forge Merchantman — Patina-Tinte in Party/FC, Bernstein-Tinte in
+            // Yell/Alliance/CustomEmote. Channel-identity bleibt voll erhalten.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#FFFFFF"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F0C060"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#E8902C"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#6AC9B0"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#E8A04A"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#4FB8A0"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A8E060"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#6AC9B0"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A8E060"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#E8A04A"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F0C060"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E8B0"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#6AC9B0"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#A8A0F0"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#E8B0F0"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8C880"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8C880"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#8FA39B"),
+        })
+    );
+}
@@ -0,0 +1,76 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class HellionArctic
+{
+    public const string Slug = "hellion-arctic";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Hellion Arctic",
+        Author: "Hellion Online Media",
+        Description: "Arctic Cyan + Ember Glow on industrial slate. Plugin default.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#0097A7"),
+            Primary:        ColourUtil.HexToRgba("#00BED2"),
+            PrimaryLight:   ColourUtil.HexToRgba("#4DD9E8"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#00BED299"),
+
+            AccentDark:     ColourUtil.HexToRgba("#E85D04"),
+            Accent:         ColourUtil.HexToRgba("#F97316"),
+            AccentLight:    ColourUtil.HexToRgba("#FB923C"),
+
+            Identity:       ColourUtil.HexToRgba("#0097A7"),
+
+            WindowBg:       ColourUtil.HexToRgba("#070B12"),
+            ChildBg:        ColourUtil.HexToRgba("#0C1220"),
+            FrameBg:        ColourUtil.HexToRgba("#141E30"),
+            Surface:        ColourUtil.HexToRgba("#1A2538"),
+            SurfaceHover:   ColourUtil.HexToRgba("#22303F"),
+            Border:         ColourUtil.HexToRgba("#00BED266"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#E6F4F1"),
+            TextMuted:      ColourUtil.HexToRgba("#8FA3B5"),
+            TextDim:        ColourUtil.HexToRgba("#566273"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#5CB85C"),
+            StatusDanger:   ColourUtil.HexToRgba("#D9534F"),
+            StatusWarning:  ColourUtil.HexToRgba("#F0AD4E"),
+            StatusInfo:     ColourUtil.HexToRgba("#00BED2")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 4f, ChildRounding: 3f, PopupRounding: 3f,
+            FrameRounding: 2f, GrabRounding: 2f, TabRounding: 2f,
+            ScrollbarRounding: 2f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true,
+        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
+        {
+            // Hellion Arctic — FFXIV-Standard mit dezenter Cyan-Tinte in den
+            // blauen Channels (Party/FC). Channel-Identität bleibt klar.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#FFFFFF"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#FFE066"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#FFA040"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#80C0E8"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#FFB870"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#4DD9E8"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A8E060"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#80C0E8"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A8E060"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#FFC080"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#FFE066"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E8A8"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#80C0E8"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#A8A0F0"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#E8B0F0"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8C880"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8C880"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#C0C0C0"),
+        })
+    );
+}
@@ -0,0 +1,83 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+// Hellion Spectrum: Deuteran/Protan-safe channel colours.
+// Palette derived from Bang Wong, "Points of view: Color blindness",
+// Nature Methods 8, 441 (2011). Channel identity (Tell pink, Yell yellow,
+// Shout orange, Party blue, FC green) is preserved per Channel-Identity-
+// Rule in docs/THEME-AUTHORING.md; tones are chosen so every channel
+// stays distinguishable under red-green colour-vision deficiency.
+internal static class HellionSpectrum
+{
+    public const string Slug = "hellion-spectrum";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Hellion Spectrum",
+        Author: "Hellion Online Media",
+        Description: "Deuteran/Protan-safe channels — Wong palette tones, channel identity preserved.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#005983"),
+            Primary:        ColourUtil.HexToRgba("#0072B2"),
+            PrimaryLight:   ColourUtil.HexToRgba("#3E9BD0"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#0072B299"),
+
+            AccentDark:     ColourUtil.HexToRgba("#B07F00"),
+            Accent:         ColourUtil.HexToRgba("#E69F00"),
+            AccentLight:    ColourUtil.HexToRgba("#F0B73A"),
+
+            Identity:       ColourUtil.HexToRgba("#005983"),
+
+            WindowBg:       ColourUtil.HexToRgba("#0A0F14"),
+            ChildBg:        ColourUtil.HexToRgba("#101620"),
+            FrameBg:        ColourUtil.HexToRgba("#1A222E"),
+            Surface:        ColourUtil.HexToRgba("#22303F"),
+            SurfaceHover:   ColourUtil.HexToRgba("#2D3E51"),
+            Border:         ColourUtil.HexToRgba("#0072B266"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#F0F4F8"),
+            TextMuted:      ColourUtil.HexToRgba("#9AA8B5"),
+            TextDim:        ColourUtil.HexToRgba("#5E6B78"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#009E73"),
+            StatusDanger:   ColourUtil.HexToRgba("#D55E00"),
+            StatusWarning:  ColourUtil.HexToRgba("#F0E442"),
+            StatusInfo:     ColourUtil.HexToRgba("#56B4E9")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
+            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
+            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true,
+        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
+        {
+            // Hellion Spectrum — Wong/Okabe-Ito tones within FFXIV channel
+            // identity. FC pulled slightly greener than vanilla cyan-teal so
+            // Party-blue and FC-green stay separable under deuteran sim.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#FFFFFF"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F0E442"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#D55E00"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#CC79A7"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#CC79A7"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#56B4E9"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#E69F00"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#009E73"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#94CC4A"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#56B4E9"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#94CC4A"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#E69F00"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F0E442"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#66D9A8"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#56B4E9"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#8B7DD0"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#E0A0C0"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#DAA0DA"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#C9A56F"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#C9A56F"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#C0C0C0"),
+        })
+    );
+}
@@ -0,0 +1,77 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class IndigoViolet
+{
+    public const string Slug = "indigo-violet";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Indigo Violet",
+        Author: "Julia Moon",
+        Description: "Royal Violet auf Deep Indigo — Glitter-Galaxy mit Türkis-Mint-Aurora.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#6B3AB0"),
+            Primary:        ColourUtil.HexToRgba("#8B4DDE"),
+            PrimaryLight:   ColourUtil.HexToRgba("#B07CFF"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#8B4DDE99"),
+
+            AccentDark:     ColourUtil.HexToRgba("#36A89C"),
+            Accent:         ColourUtil.HexToRgba("#4FC9B8"),
+            AccentLight:    ColourUtil.HexToRgba("#7AE0CF"),
+
+            Identity:       ColourUtil.HexToRgba("#6B3AB0"),
+
+            WindowBg:       ColourUtil.HexToRgba("#0D061F"),
+            ChildBg:        ColourUtil.HexToRgba("#1A0D3D"),
+            FrameBg:        ColourUtil.HexToRgba("#2A1556"),
+            Surface:        ColourUtil.HexToRgba("#3D1F78"),
+            SurfaceHover:   ColourUtil.HexToRgba("#5B2A9A"),
+            Border:         ColourUtil.HexToRgba("#8B4DDE66"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#F0E6FF"),
+            TextMuted:      ColourUtil.HexToRgba("#A890D0"),
+            TextDim:        ColourUtil.HexToRgba("#7560A0"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#3DDC97"),
+            StatusDanger:   ColourUtil.HexToRgba("#FF5C7A"),
+            StatusWarning:  ColourUtil.HexToRgba("#FFB84A"),
+            StatusInfo:     ColourUtil.HexToRgba("#8B4DDE")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
+            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
+            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true,
+        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
+        {
+            // Indigo Violet — Lavender-Pink-Drift in Tell und LS6/7. Türkis-
+            // Mint-Aurora-Counter in Party/FC und LS4. Glitter-Gold in Yell.
+            // Differenzierung zu Event Horizon: dunkler, dichter, Türkis statt Gold.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#F0E6FF"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F0D880"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#F09A60"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#E090FF"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#E090FF"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#6AB8D0"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#F0A878"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#4FC9B8"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A0E090"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#6AB8D0"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A0E090"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#F0BC92"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F0D880"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E0C0"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#6AB8D0"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#B07CFF"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#E090FF"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#C098D8"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8B590"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8B590"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#A890D0"),
+        })
+    );
+}
@@ -0,0 +1,77 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class MintGrove
+{
+    public const string Slug = "mint-grove";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Mint Grove",
+        Author: "Hellion Online Media",
+        Description: "Mint Green + Honey Amber auf Deep Forest. Naturthemen-tauglich.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#3CB371"),
+            Primary:        ColourUtil.HexToRgba("#5DD39E"),
+            PrimaryLight:   ColourUtil.HexToRgba("#8FE0B8"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#5DD39E99"),
+
+            AccentDark:     ColourUtil.HexToRgba("#F4C870"),
+            Accent:         ColourUtil.HexToRgba("#F9D580"),
+            AccentLight:    ColourUtil.HexToRgba("#FCDD93"),
+
+            Identity:       ColourUtil.HexToRgba("#5DD39E"),
+
+            WindowBg:       ColourUtil.HexToRgba("#0A1410"),
+            ChildBg:        ColourUtil.HexToRgba("#10201A"),
+            FrameBg:        ColourUtil.HexToRgba("#162B22"),
+            Surface:        ColourUtil.HexToRgba("#1E372B"),
+            SurfaceHover:   ColourUtil.HexToRgba("#284335"),
+            Border:         ColourUtil.HexToRgba("#5DD39E55"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#E8F5EA"),
+            TextMuted:      ColourUtil.HexToRgba("#9BB5A5"),
+            TextDim:        ColourUtil.HexToRgba("#5C6F65"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#5DD39E"),
+            StatusDanger:   ColourUtil.HexToRgba("#D9534F"),
+            StatusWarning:  ColourUtil.HexToRgba("#E8B590"),
+            StatusInfo:     ColourUtil.HexToRgba("#5DA9C7")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 5f, ChildRounding: 4f, PopupRounding: 4f,
+            FrameRounding: 3f, GrabRounding: 3f, TabRounding: 3f,
+            ScrollbarRounding: 3f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true,
+        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
+        {
+            // Mint Grove — Naturthemen-Tönung: Honey-Amber in Yell-Familie,
+            // Mint-Drift in NoviceNetwork und Linkshell. Tell-Pink-Identität
+            // bleibt erhalten für Erkennbarkeit.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#E8F5EA"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F9D580"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#F0A050"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#F098C8"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#F098C8"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#80B8D0"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#F0B070"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#80C8B0"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#8FE0B8"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#80B8D0"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#8FE0B8"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#F0BC80"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F9D580"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E0A0"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#80B8D0"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#A89DC0"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#F098C8"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#D0A8C8"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8C088"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8C088"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#9BB5A5"),
+        })
+    );
+}
@@ -0,0 +1,76 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class MoonlitBloom
+{
+    public const string Slug = "moonlit-bloom";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Moonlit Bloom",
+        Author: "Hellion Online Media",
+        Description: "Bloom Magenta + Soft Sage auf Deep Violet Night.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#C957D0"),
+            Primary:        ColourUtil.HexToRgba("#E374E8"),
+            PrimaryLight:   ColourUtil.HexToRgba("#EF8AF4"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#E374E899"),
+
+            AccentDark:     ColourUtil.HexToRgba("#7AAC5C"),
+            Accent:         ColourUtil.HexToRgba("#9CCB7C"),
+            AccentLight:    ColourUtil.HexToRgba("#B6E297"),
+
+            Identity:       ColourUtil.HexToRgba("#E374E8"),
+
+            WindowBg:       ColourUtil.HexToRgba("#0E0C1F"),
+            ChildBg:        ColourUtil.HexToRgba("#15122B"),
+            FrameBg:        ColourUtil.HexToRgba("#1F1A38"),
+            Surface:        ColourUtil.HexToRgba("#28224A"),
+            SurfaceHover:   ColourUtil.HexToRgba("#332B5B"),
+            Border:         ColourUtil.HexToRgba("#E374E844"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#ECE6F5"),
+            TextMuted:      ColourUtil.HexToRgba("#9A8BB0"),
+            TextDim:        ColourUtil.HexToRgba("#554B6E"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#7AAC5C"),
+            StatusDanger:   ColourUtil.HexToRgba("#E85C6A"),
+            StatusWarning:  ColourUtil.HexToRgba("#E8B590"),
+            StatusInfo:     ColourUtil.HexToRgba("#6278FF")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
+            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
+            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true,
+        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
+        {
+            // Moonlit Bloom — Bloom-Magenta-Tönung. Sage-Drift in NoviceNetwork
+            // und Linkshell4. Tell-Pink-Identität bleibt sichtbar.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#ECE6F5"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F0D080"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#F09A60"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#EF8AF4"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#EF8AF4"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#A0B0F0"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#F0B090"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#A8C8E8"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#9CCB7C"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#A0B0F0"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#9CCB7C"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#F0BC92"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F0D080"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#B6E297"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#A0B0F0"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#C098D8"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#EF8AF4"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#E8B0E8"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8B590"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8B590"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#9A8BB0"),
+        })
+    );
+}
@@ -0,0 +1,76 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class NightBlue
+{
+    public const string Slug = "night-blue";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Night Blue",
+        Author: "Julia Moon",
+        Description: "Royal Blue auf Marineblau — kühles Tech-Dashboard-Mood.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#3576C0"),
+            Primary:        ColourUtil.HexToRgba("#4A90E2"),
+            PrimaryLight:   ColourUtil.HexToRgba("#6AB0FF"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#4A90E299"),
+
+            AccentDark:     ColourUtil.HexToRgba("#C97A2E"),
+            Accent:         ColourUtil.HexToRgba("#E8A040"),
+            AccentLight:    ColourUtil.HexToRgba("#F4B968"),
+
+            Identity:       ColourUtil.HexToRgba("#3576C0"),
+
+            WindowBg:       ColourUtil.HexToRgba("#050B18"),
+            ChildBg:        ColourUtil.HexToRgba("#0A1628"),
+            FrameBg:        ColourUtil.HexToRgba("#122039"),
+            Surface:        ColourUtil.HexToRgba("#1A2D4F"),
+            SurfaceHover:   ColourUtil.HexToRgba("#234070"),
+            Border:         ColourUtil.HexToRgba("#4A90E266"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#E6EDF7"),
+            TextMuted:      ColourUtil.HexToRgba("#8CA0BF"),
+            TextDim:        ColourUtil.HexToRgba("#5A6F8F"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#3DDC97"),
+            StatusDanger:   ColourUtil.HexToRgba("#FF5C7A"),
+            StatusWarning:  ColourUtil.HexToRgba("#FFB84A"),
+            StatusInfo:     ColourUtil.HexToRgba("#4A90E2")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
+            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
+            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true,
+        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
+        {
+            // Night Blue — Royal-Blue-Tinte in Party/FC, Bronze-Gold in Yell/
+            // Alliance. Channel-identity (Tell-Pink, NN-Lime) bleibt erhalten.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#FFFFFF"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#FFD060"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#FFA040"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#6AA8E8"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#E8B070"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#4FA8E8"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A8E060"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#6AA8E8"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A8E060"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#E8B070"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#FFD060"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E8A8"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#6AA8E8"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#A8A0F0"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#E8B0F0"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8B070"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8B070"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#8CA0BF"),
+        })
+    );
+}
@@ -0,0 +1,41 @@
+{
+  "schemaVersion": 1,
+  "slug": "example-custom",
+  "name": "Example Custom",
+  "author": "You",
+  "description": "Starting template — duplicate, rename, edit colors and reload.",
+  "colors": {
+    "primaryDark":   "#0097A7",
+    "primary":       "#00BED2",
+    "primaryLight":  "#4DD9E8",
+    "primaryGlow":   "#00BED299",
+    "accentDark":    "#E85D04",
+    "accent":        "#F97316",
+    "accentLight":   "#FB923C",
+    "identity":      "#0097A7",
+    "windowBg":      "#070B12",
+    "childBg":       "#0C1220",
+    "frameBg":       "#141E30",
+    "surface":       "#1A2538",
+    "surfaceHover":  "#22303F",
+    "border":        "#00BED266",
+    "textPrimary":   "#E6F4F1",
+    "textMuted":     "#8FA3B5",
+    "textDim":       "#566273",
+    "statusSuccess": "#5CB85C",
+    "statusDanger":  "#D9534F",
+    "statusWarning": "#F0AD4E",
+    "statusInfo":    "#00BED2"
+  },
+  "layout": {
+    "windowRounding": 4,
+    "childRounding": 3,
+    "popupRounding": 3,
+    "frameRounding": 2,
+    "grabRounding": 2,
+    "tabRounding": 2,
+    "scrollbarRounding": 2,
+    "windowBorderSize": 1,
+    "frameBorderSize": 1
+  }
+}
@@ -0,0 +1,13 @@
+namespace HellionChat.Themes;
+
+public sealed record Theme(
+    string Slug,
+    string Name,
+    string Author,
+    string Description,
+    ThemeColors Colors,
+    ThemeLayout Layout,
+    ThemeTypography Typography,
+    bool IsBuiltIn,
+    ThemeChatColors? ChatColors = null
+);
@@ -0,0 +1,11 @@
+using HellionChat.Code;
+
+namespace HellionChat.Themes;
+
+// Optional pro Theme. Wenn ein Theme ChatColors mitliefert, kann der
+// User sie per Klick im Themes-Tab auf Configuration.ChatColours anwenden.
+// Ein Theme ohne ChatColors (z.B. chat2-classic) lässt die User-Channel-
+// Farben unverändert.
+public sealed record ThemeChatColors(
+    IReadOnlyDictionary<ChatType, uint> Channels
+);
@@ -0,0 +1,31 @@
+namespace HellionChat.Themes;
+
+// Color-Werte als 0xRRGGBBAA, RgbaToAbgr handled den Byte-Swap zu ImGui.
+public sealed record ThemeColors(
+    uint PrimaryDark,
+    uint Primary,
+    uint PrimaryLight,
+    uint PrimaryGlow,
+
+    uint AccentDark,
+    uint Accent,
+    uint AccentLight,
+
+    uint Identity,
+
+    uint WindowBg,
+    uint ChildBg,
+    uint FrameBg,
+    uint Surface,
+    uint SurfaceHover,
+    uint Border,
+
+    uint TextPrimary,
+    uint TextMuted,
+    uint TextDim,
+
+    uint StatusSuccess,
+    uint StatusDanger,
+    uint StatusWarning,
+    uint StatusInfo
+);
@@ -0,0 +1,131 @@
+using System.Text.Json;
+using HellionChat.Util;
+
+namespace HellionChat.Themes;
+
+internal static class ThemeJsonLoader
+{
+    public const int SupportedSchemaVersion = 1;
+
+    public static Theme LoadFromString(string json)
+    {
+        if (string.IsNullOrWhiteSpace(json))
+            throw new FormatException("Theme JSON is empty");
+
+        JsonDocument doc;
+        try { doc = JsonDocument.Parse(json); }
+        catch (JsonException ex) { throw new FormatException("Theme JSON is not valid JSON", ex); }
+
+        using (doc)
+        {
+            var root = doc.RootElement;
+
+            var schemaVersion = ReadInt(root, "schemaVersion");
+            if (schemaVersion != SupportedSchemaVersion)
+                throw new FormatException($"Unsupported schemaVersion {schemaVersion}; expected {SupportedSchemaVersion}");
+
+            var slug        = ReadString(root, "slug");
+            var name        = ReadString(root, "name");
+            var author      = ReadString(root, "author");
+            var description = ReadString(root, "description");
+
+            var colors = ReadColors(root.GetProperty("colors"));
+            var layout = ReadLayout(root.GetProperty("layout"));
+
+            ThemeChatColors? chatColors = null;
+            if (root.TryGetProperty("chatChannels", out var ch) && ch.ValueKind == JsonValueKind.Object)
+                chatColors = ReadChatColors(ch);
+
+            return new Theme(slug, name, author, description, colors, layout, new ThemeTypography(), IsBuiltIn: false, ChatColors: chatColors);
+        }
+    }
+
+    private static ThemeChatColors ReadChatColors(JsonElement el)
+    {
+        var dict = new Dictionary<HellionChat.Code.ChatType, uint>();
+        foreach (var prop in el.EnumerateObject())
+        {
+            // Property-Name ist der ChatType-Name als String (z.B. "Say", "Tell"),
+            // Value ist Hex wie bei den Theme-Colors. Unbekannte Channel-Names
+            // werden still übersprungen — Forward-Compat falls SE neue Channels
+            // einführt.
+            if (!Enum.TryParse<HellionChat.Code.ChatType>(prop.Name, ignoreCase: true, out var channel))
+                continue;
+            if (prop.Value.ValueKind != JsonValueKind.String)
+                continue;
+            var hex = prop.Value.GetString();
+            if (string.IsNullOrWhiteSpace(hex))
+                continue;
+            dict[channel] = HellionChat.Util.ColourUtil.HexToRgba(hex);
+        }
+        return new ThemeChatColors(dict);
+    }
+
+    public static Theme LoadFromFile(string path)
+    {
+        var json = File.ReadAllText(path);
+        return LoadFromString(json);
+    }
+
+    private static ThemeColors ReadColors(JsonElement el) => new(
+        PrimaryDark:   ColourUtil.HexToRgba(ReadString(el, "primaryDark")),
+        Primary:       ColourUtil.HexToRgba(ReadString(el, "primary")),
+        PrimaryLight:  ColourUtil.HexToRgba(ReadString(el, "primaryLight")),
+        PrimaryGlow:   ColourUtil.HexToRgba(ReadString(el, "primaryGlow")),
+
+        AccentDark:    ColourUtil.HexToRgba(ReadString(el, "accentDark")),
+        Accent:        ColourUtil.HexToRgba(ReadString(el, "accent")),
+        AccentLight:   ColourUtil.HexToRgba(ReadString(el, "accentLight")),
+
+        Identity:      ColourUtil.HexToRgba(ReadString(el, "identity")),
+
+        WindowBg:      ColourUtil.HexToRgba(ReadString(el, "windowBg")),
+        ChildBg:       ColourUtil.HexToRgba(ReadString(el, "childBg")),
+        FrameBg:       ColourUtil.HexToRgba(ReadString(el, "frameBg")),
+        Surface:       ColourUtil.HexToRgba(ReadString(el, "surface")),
+        SurfaceHover:  ColourUtil.HexToRgba(ReadString(el, "surfaceHover")),
+        Border:        ColourUtil.HexToRgba(ReadString(el, "border")),
+
+        TextPrimary:   ColourUtil.HexToRgba(ReadString(el, "textPrimary")),
+        TextMuted:     ColourUtil.HexToRgba(ReadString(el, "textMuted")),
+        TextDim:       ColourUtil.HexToRgba(ReadString(el, "textDim")),
+
+        StatusSuccess: ColourUtil.HexToRgba(ReadString(el, "statusSuccess")),
+        StatusDanger:  ColourUtil.HexToRgba(ReadString(el, "statusDanger")),
+        StatusWarning: ColourUtil.HexToRgba(ReadString(el, "statusWarning")),
+        StatusInfo:    ColourUtil.HexToRgba(ReadString(el, "statusInfo"))
+    );
+
+    private static ThemeLayout ReadLayout(JsonElement el) => new(
+        WindowRounding:    ReadFloat(el, "windowRounding"),
+        ChildRounding:     ReadFloat(el, "childRounding"),
+        PopupRounding:     ReadFloat(el, "popupRounding"),
+        FrameRounding:     ReadFloat(el, "frameRounding"),
+        GrabRounding:      ReadFloat(el, "grabRounding"),
+        TabRounding:       ReadFloat(el, "tabRounding"),
+        ScrollbarRounding: ReadFloat(el, "scrollbarRounding"),
+        WindowBorderSize:  ReadFloat(el, "windowBorderSize"),
+        FrameBorderSize:   ReadFloat(el, "frameBorderSize")
+    );
+
+    private static string ReadString(JsonElement el, string name)
+    {
+        if (!el.TryGetProperty(name, out var v) || v.ValueKind != JsonValueKind.String)
+            throw new FormatException($"Theme JSON missing string property '{name}'");
+        return v.GetString() ?? throw new FormatException($"Theme JSON property '{name}' is null");
+    }
+
+    private static int ReadInt(JsonElement el, string name)
+    {
+        if (!el.TryGetProperty(name, out var v) || v.ValueKind != JsonValueKind.Number)
+            throw new FormatException($"Theme JSON missing number property '{name}'");
+        return v.GetInt32();
+    }
+
+    private static float ReadFloat(JsonElement el, string name)
+    {
+        if (!el.TryGetProperty(name, out var v) || v.ValueKind != JsonValueKind.Number)
+            throw new FormatException($"Theme JSON missing number property '{name}'");
+        return (float)v.GetDouble();
+    }
+}
@@ -0,0 +1,73 @@
+using System.Text.Json;
+
+namespace HellionChat.Themes;
+
+internal static class ThemeJsonWriter
+{
+    public static string Serialize(Theme theme)
+    {
+        using var ms = new MemoryStream();
+        using (var writer = new Utf8JsonWriter(ms, new JsonWriterOptions { Indented = true }))
+        {
+            writer.WriteStartObject();
+            writer.WriteNumber("schemaVersion", ThemeJsonLoader.SupportedSchemaVersion);
+            writer.WriteString("slug", theme.Slug);
+            writer.WriteString("name", theme.Name);
+            writer.WriteString("author", theme.Author);
+            writer.WriteString("description", theme.Description);
+
+            writer.WriteStartObject("colors");
+            WriteColor(writer, "primaryDark",   theme.Colors.PrimaryDark);
+            WriteColor(writer, "primary",       theme.Colors.Primary);
+            WriteColor(writer, "primaryLight",  theme.Colors.PrimaryLight);
+            WriteColor(writer, "primaryGlow",   theme.Colors.PrimaryGlow);
+            WriteColor(writer, "accentDark",    theme.Colors.AccentDark);
+            WriteColor(writer, "accent",        theme.Colors.Accent);
+            WriteColor(writer, "accentLight",   theme.Colors.AccentLight);
+            WriteColor(writer, "identity",      theme.Colors.Identity);
+            WriteColor(writer, "windowBg",      theme.Colors.WindowBg);
+            WriteColor(writer, "childBg",       theme.Colors.ChildBg);
+            WriteColor(writer, "frameBg",       theme.Colors.FrameBg);
+            WriteColor(writer, "surface",       theme.Colors.Surface);
+            WriteColor(writer, "surfaceHover",  theme.Colors.SurfaceHover);
+            WriteColor(writer, "border",        theme.Colors.Border);
+            WriteColor(writer, "textPrimary",   theme.Colors.TextPrimary);
+            WriteColor(writer, "textMuted",     theme.Colors.TextMuted);
+            WriteColor(writer, "textDim",       theme.Colors.TextDim);
+            WriteColor(writer, "statusSuccess", theme.Colors.StatusSuccess);
+            WriteColor(writer, "statusDanger",  theme.Colors.StatusDanger);
+            WriteColor(writer, "statusWarning", theme.Colors.StatusWarning);
+            WriteColor(writer, "statusInfo",    theme.Colors.StatusInfo);
+            writer.WriteEndObject();
+
+            writer.WriteStartObject("layout");
+            writer.WriteNumber("windowRounding",    theme.Layout.WindowRounding);
+            writer.WriteNumber("childRounding",     theme.Layout.ChildRounding);
+            writer.WriteNumber("popupRounding",     theme.Layout.PopupRounding);
+            writer.WriteNumber("frameRounding",     theme.Layout.FrameRounding);
+            writer.WriteNumber("grabRounding",      theme.Layout.GrabRounding);
+            writer.WriteNumber("tabRounding",       theme.Layout.TabRounding);
+            writer.WriteNumber("scrollbarRounding", theme.Layout.ScrollbarRounding);
+            writer.WriteNumber("windowBorderSize",  theme.Layout.WindowBorderSize);
+            writer.WriteNumber("frameBorderSize",   theme.Layout.FrameBorderSize);
+            writer.WriteEndObject();
+
+            if (theme.ChatColors is { Channels.Count: > 0 } cc)
+            {
+                writer.WriteStartObject("chatChannels");
+                foreach (var kvp in cc.Channels)
+                    writer.WriteString(kvp.Key.ToString(), $"#{kvp.Value:X8}");
+                writer.WriteEndObject();
+            }
+
+            writer.WriteEndObject();
+        }
+
+        return System.Text.Encoding.UTF8.GetString(ms.ToArray());
+    }
+
+    private static void WriteColor(Utf8JsonWriter writer, string key, uint rgba)
+    {
+        writer.WriteString(key, $"#{rgba:X8}");
+    }
+}
@@ -0,0 +1,14 @@
+namespace HellionChat.Themes;
+
+// Layout-Werte spiegeln die ImGuiStyleVar-Slots, die HellionStyle pusht.
+public sealed record ThemeLayout(
+    float WindowRounding,
+    float ChildRounding,
+    float PopupRounding,
+    float FrameRounding,
+    float GrabRounding,
+    float TabRounding,
+    float ScrollbarRounding,
+    float WindowBorderSize,
+    float FrameBorderSize
+);
@@ -0,0 +1,100 @@
+using HellionChat.Themes.Builtin;
+
+namespace HellionChat.Themes;
+
+public sealed class ThemeRegistry
+{
+    public const string DefaultSlug = HellionArctic.Slug;
+
+    private readonly Dictionary<string, Theme> _builtIns;
+    private readonly Dictionary<string, (Theme Theme, DateTime Stamp)> _customCache = new(StringComparer.OrdinalIgnoreCase);
+    private readonly string? _customThemesDir;
+    private Theme _active;
+
+    public ThemeRegistry(string? customThemesDir = null)
+    {
+        _builtIns = new Dictionary<string, Theme>(StringComparer.OrdinalIgnoreCase)
+        {
+            { HellionArctic.Slug,     HellionArctic.Build() },
+            { HellionSpectrum.Slug,   HellionSpectrum.Build() },
+            { Chat2Classic.Slug,      Chat2Classic.Build() },
+            { EventHorizon.Slug,      EventHorizon.Build() },
+            { MoonlitBloom.Slug,      MoonlitBloom.Build() },
+            { NightBlue.Slug,         NightBlue.Build() },
+            { IndigoViolet.Slug,      IndigoViolet.Build() },
+            { ForgeMerchantman.Slug,  ForgeMerchantman.Build() },
+            { MintGrove.Slug,         MintGrove.Build() },
+        };
+        _active = _builtIns[DefaultSlug];
+        _customThemesDir = customThemesDir;
+    }
+
+    public Theme Active => _active;
+
+    public Theme Get(string slug)
+    {
+        if (_builtIns.TryGetValue(slug, out var b)) return b;
+
+        var custom = LoadCustomBySlug(slug);
+        if (custom != null) return custom;
+
+        return _builtIns[DefaultSlug];
+    }
+
+    public IEnumerable<Theme> AllBuiltIns() => _builtIns.Values;
+
+    public IEnumerable<Theme> AllCustom() => RefreshCustomCache();
+
+    public void Switch(string slug) => _active = Get(slug);
+
+    // Custom-Themes werden lazy aus dem Verzeichnis geladen, Cache mit
+    // LastWriteTime-Token. Eine geänderte JSON wird beim nächsten Lookup
+    // neu eingelesen.
+    private Theme? LoadCustomBySlug(string slug)
+    {
+        if (_customThemesDir is null) return null;
+        if (!Directory.Exists(_customThemesDir)) return null;
+
+        foreach (var theme in RefreshCustomCache())
+            if (string.Equals(theme.Slug, slug, StringComparison.OrdinalIgnoreCase))
+                return theme;
+        return null;
+    }
+
+    private IEnumerable<Theme> RefreshCustomCache()
+    {
+        if (_customThemesDir is null || !Directory.Exists(_customThemesDir))
+            yield break;
+
+        var seenSlugs = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var path in Directory.EnumerateFiles(_customThemesDir, "*.json"))
+        {
+            Theme? theme = null;
+            var stamp = File.GetLastWriteTimeUtc(path);
+            var key = path;
+            if (_customCache.TryGetValue(key, out var cached) && cached.Stamp == stamp)
+            {
+                theme = cached.Theme;
+            }
+            else
+            {
+                try
+                {
+                    theme = ThemeJsonLoader.LoadFromFile(path);
+                    _customCache[key] = (theme, stamp);
+                }
+                catch (Exception ex)
+                {
+                    // Logging passiert in Plugin.cs durch den Aufrufer; hier still
+                    // ignorieren, damit ein einzelnes kaputtes JSON nicht alle
+                    // Custom-Themes blockt.
+                    _ = ex;
+                    continue;
+                }
+            }
+
+            if (theme is not null && seenSlugs.Add(theme.Slug))
+                yield return theme;
+        }
+    }
+}
@@ -0,0 +1,8 @@
+namespace HellionChat.Themes;
+
+// Optional pro Theme. v1.1.0 nutzt das nicht aktiv; ist als Erweiterungspunkt
+// für zukünftige Theme-Slots vorbereitet.
+public sealed record ThemeTypography(
+    float? OverrideGlobalFontSizePt = null,
+    float? OverrideSymbolsFontSizePt = null
+);
@@ -0,0 +1,107 @@
+namespace HellionChat.Ui;
+
+/// <summary>
+/// Hash-Color-Tinting für Auto-Tell-Tabs in der Sidebar (v1.2.0).
+/// Differenziert Tells visuell ohne dass User pro Tab manuell ein
+/// Custom-Icon setzen muss. Gleicher Tell-Partner (Name+World) liefert
+/// konsistent dieselbe Farbe über Sessions hinweg.
+///
+/// Kuratierte 12-Farb-Palette aus dem Hellion-Theme-Pool: alle saturiert
+/// mid-bright, lesbar gegen Dark-Theme-Backgrounds. Bei realistischen
+/// 1-5 parallelen Tells ist Kollisions-Wahrscheinlichkeit gering.
+///
+/// Reine String-Logik (kein Dalamud-Dep) — testbar im HellionChat.Tests-
+/// Projekt das ohne Dalamud-Reference baut.
+/// </summary>
+internal static class AutoTellTabTint
+{
+    /// <summary>
+    /// Fallback bei ungültigem Input (leerer Name, World=0). Standard-
+    /// Text-Color (weiß) — passt mit existierendem TextPrimary-Default
+    /// zusammen, sodass die Sidebar visuell konsistent bleibt.
+    /// </summary>
+    public const uint Fallback = 0xFFFFFFFFu;
+
+    /// <summary>
+    /// 12 saturierte mid-bright Farben aus den 5 Built-In-Themes
+    /// (Hellion-Arctic, Chat2-Klassik, Event-Horizon, Moonlit-Bloom,
+    /// Mint-Grove). Reihenfolge ist deterministisch — Hash-Index wählt
+    /// Farbe per Modulo. RGBA-Format (passt zu ColourUtil.RgbaToAbgr-
+    /// Konvention im restlichen Code).
+    /// </summary>
+    public static readonly IReadOnlyList<uint> Palette = new uint[]
+    {
+        0x00BED2FFu, // Arctic Cyan
+        0xF97316FFu, // Ember Orange
+        0xB585FFFFu, // Light Cosmic Purple
+        0xE374E8FFu, // Bloom Magenta
+        0x5DD39EFFu, // Mint Green
+        0xF0AD4EFFu, // Warning Yellow
+        0xE85C6AFFu, // Coral
+        0x5CB85CFFu, // Status Green
+        0x6278FFFFu, // Bloom Blue
+        0xC9982EFFu, // Warm Gold
+        0x9CCB7CFFu, // Soft Sage
+        0xE85D04FFu, // Deep Ember
+    };
+
+    /// <summary>
+    /// Liefert eine konsistente Tint-Color für einen Tell-Partner.
+    /// Hash basiert auf "Name@World" — Cross-World-Namen kollidieren
+    /// nur bei Hash-Bucket-Kollision, nicht durch Identitäts-Annahme.
+    /// </summary>
+    public static uint For(string name, uint world)
+    {
+        if (string.IsNullOrEmpty(name) || world == 0)
+            return Fallback;
+
+        // GetHashCode kann negativ sein; Bitmaske auf positive Range
+        // damit Modulo-Division immer einen validen Index liefert.
+        var key = $"{name}@{world}";
+        var hash = (uint)(key.GetHashCode() & 0x7FFFFFFF);
+        return Palette[(int)(hash % Palette.Count)];
+    }
+
+    /// <summary>
+    /// Tell-spezifischer Icon-Pool. 7 visuell distinkte FontAwesome-Glyphen
+    /// die im Tell-Kontext sinnvoll wirken (envelope = Tell-Default, star/
+    /// heart/bell = personalisiert, bookmark/flag/fire = markiert/wichtig).
+    /// Bewusst kein cog/comment/users — die wären für System-/Group-Tabs
+    /// reserviert und würden im Tell-Bereich verwirrend wirken.
+    /// </summary>
+    public static readonly IReadOnlyList<string> IconPool = new[]
+    {
+        "envelope",
+        "star",
+        "heart",
+        "bell",
+        "bookmark",
+        "flag",
+        "fire",
+    };
+
+    /// <summary>
+    /// Fallback-Icon bei ungültigem Input. "envelope" passt semantisch zum
+    /// Tell-Kontext besser als das alte hardcoded "clock".
+    /// </summary>
+    public const string IconFallback = "envelope";
+
+    /// <summary>
+    /// Liefert ein konsistentes Icon-Glyph für einen Tell-Partner.
+    /// Nutzt einen anderen Hash-Bias als For() (Color), damit Icon und
+    /// Color unabhängig variieren — gibt 7 × 12 = 84 distinct Combinations.
+    /// </summary>
+    public static string IconFor(string name, uint world)
+    {
+        if (string.IsNullOrEmpty(name) || world == 0)
+            return IconFallback;
+
+        // Anderer Hash-Bias als For() (verschiedene Modulo-Basis): wir
+        // nutzen "world@name" statt "name@world" damit Icon und Color
+        // nicht synchron variieren. Ohne Bias-Trennung würden alle Tells
+        // mit derselben Color auch dasselbe Icon haben.
+        var key = $"{world}@{name}";
+        var hash = (uint)(key.GetHashCode() & 0x7FFFFFFF);
+        return IconPool[(int)(hash % IconPool.Count)];
+    }
+}
@@ -104,7 +104,7 @@ public sealed class ChatInputBar
    // window's logic but operates on _state.HistoryCursor and the shared
    // InputHistoryService. Index semantics match v0.5.x InputBacklog:
    // 0 = oldest, Count-1 = newest.
-    private unsafe int CompactCallback(scoped ref ImGuiInputTextCallbackData data)
+    private int CompactCallback(scoped ref ImGuiInputTextCallbackData data)
    {
        if (data.EventFlag != ImGuiInputTextFlags.CallbackHistory)
            return 0;
@@ -34,6 +34,9 @@ public sealed class ChatLogWindow : Window

    internal Plugin Plugin { get; }

+    private readonly CommandWrapper _clearHellionCommand;
+    private readonly CommandWrapper _hellionCommand;
+
    internal bool ScreenshotMode;
    private string Salt { get; }

@@ -103,6 +106,9 @@ public sealed class ChatLogWindow : Window
        IsOpen = true;
        RespectCloseHotkey = false;
        DisableWindowSounds = true;
+        // AllowBackgroundBlur wird nach AddWindow zentral in Plugin.Setup
+        // für alle registrierten Windows gesetzt — keine Per-Window-Logik
+        // hier nötig.

        PayloadHandler = new PayloadHandler(this);
        HandlerLender = new Lender<PayloadHandler>(() => new PayloadHandler(this));
@@ -110,8 +116,14 @@ public sealed class ChatLogWindow : Window
        SetUpTextCommandChannels();
        SetUpAllCommands();

-        Plugin.Commands.Register("/clearhellion", "Clear the Hellion Chat log").Execute += ClearLog;
-        Plugin.Commands.Register("/hellion").Execute += ToggleChat;
+        // Cache the registered wrapper instances so Dispose can detach the same
+        // event objects the constructor attached to, without going through
+        // Register() again (which would re-create the wrapper if the command
+        // happened to be missing from the dictionary).
+        _clearHellionCommand = Plugin.Commands.Register("/clearhellion", "Clear the Hellion Chat log");
+        _hellionCommand = Plugin.Commands.Register("/hellion");
+        _clearHellionCommand.Execute += ClearLog;
+        _hellionCommand.Execute += ToggleChat;

        Plugin.ClientState.Login += Login;
        Plugin.ClientState.Logout += Logout;
@@ -126,8 +138,8 @@ public sealed class ChatLogWindow : Window
        Plugin.AddonLifecycle.UnregisterListener(AddonEvent.PostUpdate, "ActionDetail", PayloadHandler.MoveTooltip);
        Plugin.ClientState.Logout -= Logout;
        Plugin.ClientState.Login -= Login;
-        Plugin.Commands.Register("/hellion").Execute -= ToggleChat;
-        Plugin.Commands.Register("/clearhellion").Execute -= ClearLog;
+        _hellionCommand.Execute -= ToggleChat;
+        _clearHellionCommand.Execute -= ClearLog;
    }

    private void Logout(int _, int __)
@@ -366,6 +378,9 @@ public sealed class ChatLogWindow : Window
        // weil der Cursor schon weiter unten steht — kein eigener Abzug.
        height -= ImGui.GetFrameHeightWithSpacing();

+        // v1.2.0 — Status-Bar am Window-Boden reserviert 22 px + 2 px Spacing.
+        height -= StatusBar.Height + 2;
+
        return height;
    }

@@ -484,10 +499,14 @@ public sealed class ChatLogWindow : Window
        if (!Plugin.Config.ShowTitleBar)
            Flags |= ImGuiWindowFlags.NoTitleBar;

+        // BgAlpha wird auf den Style-WindowBg-Alpha aus HellionStyle.PushGlobal
+        // multipliziert (HellionStyle pusht eine voll-deckende Theme-Color, der
+        // tatsächliche transparent-Effekt entsteht über BgAlpha). Wenn der User
+        // im Dalamud-Pinning-Menü (Hamburger oben rechts) eine eigene
+        // Window-Deckkraft eingestellt hat, hat dieses Per-Window-Override
+        // Vorrang über unseren Slider — wir dokumentieren das im HelpMarker.
        if (LastViewport == ImGuiHelpers.MainViewport.Handle && !WasDocked)
-            BgAlpha = Plugin.Config.HellionThemeEnabled
-                ? Plugin.Config.HellionThemeWindowOpacity
-                : Plugin.Config.WindowAlpha / 100f;
+            BgAlpha = Plugin.Config.WindowOpacity;

        LastViewport = ImGui.GetWindowViewport().Handle;
        WasDocked = ImGui.IsWindowDocked();
@@ -519,8 +538,11 @@ public sealed class ChatLogWindow : Window
        if (Plugin.Config.KeepInputFocus && Activate)
            ImGui.SetWindowFocus(WindowName);

-        if (Plugin.Config is { OverrideStyle: true, ChosenStyle: not null })
-            StyleModel.GetConfiguredStyles()?.FirstOrDefault(style => style.Name == Plugin.Config.ChosenStyle)?.Push();
+        // Hellion Chat v1.1.0+ — Theme-Engine ist Source-of-Truth, kein
+        // zusätzlicher Dalamud-StyleModel-Override mehr pro Window. Plugin.Draw
+        // pusht das aktive Hellion-Theme global; ChatLogWindow zeichnet sich
+        // damit konsistent zu Settings/Pop-Out/Wizard. Wer den Upstream-Look
+        // will, wählt das Built-In-Theme "Chat 2 Klassik" in Settings → Themes.
    }

    public override void PostDraw()
@@ -531,9 +553,6 @@ public sealed class ChatLogWindow : Window
        // doesn't get called if the input is disabled.
        if (Plugin.CurrentTab.InputDisabled)
            Activate = false;
-
-        if (Plugin.Config is { OverrideStyle: true, ChosenStyle: not null })
-            StyleModel.GetConfiguredStyles()?.FirstOrDefault(style => style.Name == Plugin.Config.ChosenStyle)?.Pop();
    }

    public override void OnClose()
@@ -597,10 +616,11 @@ public sealed class ChatLogWindow : Window
            Plugin.InputPreview.CalculatePreview();

        // Hellion Chat v0.6.1 — render the one-time hint banner first so it
-        // sits above the tab area / sidebar in full window width. Stash the
-        // height for GetRemainingHeightForMessageLog so the message log
-        // shrinks accordingly while the banner is visible.
-        _v061HintBannerHeight = DrawV061HintBannerIfNeeded();
+        // sits above the tab area / sidebar in full window width. ImGui's
+        // GetContentRegionAvail subtracts its height automatically because the
+        // cursor advances past it before the message log calls
+        // GetRemainingHeightForMessageLog, so we don't track the height here.
+        DrawV061HintBannerIfNeeded();

        if (Plugin.Config.SidebarTabView)
            DrawTabSidebar();
@@ -782,13 +802,17 @@ public sealed class ChatLogWindow : Window
        if (ImGui.IsWindowHovered(ImGuiHoveredFlags.ChildWindows))
            LastActivityTime = FrameTime;

-        if (!showNovice)
-            return;
+        if (showNovice)
+        {
+            ImGui.SameLine();

-        ImGui.SameLine();
+            if (ImGuiUtil.IconButton(FontAwesomeIcon.Leaf))
+                GameFunctions.GameFunctions.ClickNoviceNetworkButton();
+        }

-        if (ImGuiUtil.IconButton(FontAwesomeIcon.Leaf))
-            GameFunctions.GameFunctions.ClickNoviceNetworkButton();
+        // v1.2.0 — Bottom-Status-Bar. Letzter Render-Step in DrawChatLog,
+        // damit alle Zeilen-Operationen davor keine Layout-Sprünge auslösen.
+        Plugin.StatusBar.Draw(Plugin);
    }

    internal Dictionary<string, InputChannel> GetValidChannels()
@@ -1308,17 +1332,63 @@ public sealed class ChatLogWindow : Window
                    ImGui.TableNextColumn();

                var lineWidth = ImGui.GetContentRegionAvail().X;
-                if (message.Sender.Count > 0)
-                {
-                    DrawChunks(message.Sender, true, handler, lineWidth);
-                    ImGui.SameLine();
-                }

-                // We need to draw something otherwise the item visibility check below won't work.
-                if (message.Content.Count == 0)
-                    DrawChunks([new TextChunk(ChunkSource.Content, null, " ")], true, handler, lineWidth);
+                // v1.2.0 — Card-Rows als Default, Compact-Density als Opt-Out.
+                // Card-Mode: Sender-Header in Channel-Color auf eigener Zeile,
+                // dann Body, dann subtile Border-Bottom als Card-Trenner.
+                // Compact-Mode: bisheriges Verhalten — Sender + Space + Content
+                // auf einer Zeile via SameLine.
+                var useCard = !Plugin.Config.UseCompactDensity;
+                if (useCard)
+                {
+                    if (message.Sender.Count > 0)
+                    {
+                        var theme = Plugin.ThemeRegistry.Active;
+                        var senderColor = Plugin.Functions.Chat.GetChannelColor(message.Code.Type)
+                                          ?? theme.Colors.TextPrimary;
+                        using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(senderColor)))
+                        {
+                            DrawChunks(message.Sender, true, handler, lineWidth);
+                        }
+                        // KEIN SameLine — Body landet auf eigener Zeile.
+                    }
+
+                    // We need to draw something otherwise the item visibility check below won't work.
+                    if (message.Content.Count == 0)
+                        DrawChunks([new TextChunk(ChunkSource.Content, null, " ")], true, handler, lineWidth);
+                    else
+                        DrawChunks(message.Content, true, handler, lineWidth);
+
+                    // Subtile Border-Bottom als Card-Trenner. Border-Farbe mit
+                    // reduzierter Alpha (RGBA → 0x33) für dezente Trennung.
+                    {
+                        var theme = Plugin.ThemeRegistry.Active;
+                        var rowEndY = ImGui.GetCursorScreenPos().Y;
+                        var winLeft = ImGui.GetWindowPos().X;
+                        var winRight = winLeft + ImGui.GetWindowSize().X;
+                        var borderRgba = (theme.Colors.Border & 0xFFFFFF00u) | 0x33u;
+                        ImGui.GetWindowDrawList().AddLine(
+                            new Vector2(winLeft + 4, rowEndY - 1),
+                            new Vector2(winRight - 4, rowEndY - 1),
+                            ColourUtil.RgbaToAbgr(borderRgba),
+                            1f);
+                        ImGui.Dummy(new Vector2(0, 2));
+                    }
+                }
                else
-                    DrawChunks(message.Content, true, handler, lineWidth);
+                {
+                    if (message.Sender.Count > 0)
+                    {
+                        DrawChunks(message.Sender, true, handler, lineWidth);
+                        ImGui.SameLine();
+                    }
+
+                    // We need to draw something otherwise the item visibility check below won't work.
+                    if (message.Content.Count == 0)
+                        DrawChunks([new TextChunk(ChunkSource.Content, null, " ")], true, handler, lineWidth);
+                    else
+                        DrawChunks(message.Content, true, handler, lineWidth);
+                }

                message.IsVisible[tab.Identifier] = ImGui.IsItemVisible();
            }
@@ -1358,6 +1428,20 @@ public sealed class ChatLogWindow : Window
            if (!tabItem.Success)
                continue;

+            // v1.2.0 — Active-Tab-Underline-Pill (2 px Akzent statt Background-Fill).
+            // Bewusst direkt nach TabItem-Setup; GetItemRectMin/Max referenziert noch
+            // das Tab. ImGui hat keine native Underline-API, daher direkter DrawList-Pass.
+            {
+                var theme = Plugin.ThemeRegistry.Active;
+                var min = ImGui.GetItemRectMin();
+                var max = ImGui.GetItemRectMax();
+                const float pillHeight = 2f;
+                ImGui.GetWindowDrawList().AddRectFilled(
+                    new Vector2(min.X, max.Y - pillHeight),
+                    new Vector2(max.X, max.Y),
+                    ColourUtil.RgbaToAbgr(theme.Colors.Accent));
+            }
+
            var hasTabSwitched = Plugin.LastTab != tabI;
            Plugin.LastTab = tabI;

@@ -1375,21 +1459,36 @@ public sealed class ChatLogWindow : Window
    private void DrawTabSidebar()
    {
        var currentTab = -1;
-        using var tabTable = ImRaii.Table("tabs-table", 2, ImGuiTableFlags.BordersInnerV | ImGuiTableFlags.SizingStretchProp | ImGuiTableFlags.Resizable);
+        // v1.2.0 — Sidebar fix 44 px, kein Resize. Mehr Platz fürs Chat-Log.
+        using var tabTable = ImRaii.Table("tabs-table", 2, ImGuiTableFlags.BordersInnerV | ImGuiTableFlags.SizingFixedFit);
        if (!tabTable.Success)
            return;

-        ImGui.TableSetupColumn("tabs", ImGuiTableColumnFlags.WidthStretch, 1);
-        ImGui.TableSetupColumn("chat", ImGuiTableColumnFlags.WidthStretch, 4);
+        ImGui.TableSetupColumn("tabs", ImGuiTableColumnFlags.WidthFixed, 44f);
+        ImGui.TableSetupColumn("chat", ImGuiTableColumnFlags.WidthStretch, 1);

        ImGui.TableNextColumn();

        var hasTabSwitched = false;
        var childHeight = GetRemainingHeightForMessageLog();
+        // v1.2.0 — Sidebar-Child ohne Theme-ChildBg, sonst füllt das
+        // bläuliche Frame-Rect auch den oberen HeaderToolbar-Padding-Bereich
+        // aus (sieht aus wie ein angeschnittener Block oberhalb der Buttons).
+        // Vertikale Trennung zur Message-Spalte bleibt durch BordersInnerV
+        // der Tab-Table erhalten.
+        using (ImRaii.PushColor(ImGuiCol.ChildBg, 0u))
        using (var child = ImRaii.Child("##chat2-tab-sidebar", new Vector2(-1, childHeight)))
        {
            if (child)
            {
+                // v1.2.0 — Top-Padding spiegelt die HeaderToolbar-Höhe der
+                // rechten Spalte (DrawChatHeaderToolbar wird dort als erstes
+                // gerendert, eine Frame-Zeile + ItemSpacing). Ohne diesen
+                // Padding würden die Sidebar-Buttons oben am Window-Top
+                // kleben, während die Messages erst unter der Toolbar
+                // beginnen — vertikales Mismatch.
+                ImGui.Dummy(new Vector2(0, ImGui.GetFrameHeightWithSpacing()));
+
                var previousTab = Plugin.CurrentTab;
                // Hellion Chat — auto-tell-tabs section divider rendered
                // exactly once before the first temp tab, with a live unit
@@ -1414,7 +1513,6 @@ public sealed class ChatLogWindow : Window
                    }

                    var unread = tabI == Plugin.LastTab || tab.UnreadMode == UnreadMode.None || tab.Unread == 0 ? "" : $" ({tab.Unread})";
-                    var selectableLabel = $"{tab.Name}{unread}###log-tab-{tabI}";
                    var isCurrentTab = Plugin.LastTab == tabI || Plugin.WantedTab == tabI;

                    var showGreetedAffordance = tab.IsTempTab && Plugin.Config.AutoTellTabsShowGreetedToggle;
@@ -1449,34 +1547,107 @@ public sealed class ChatLogWindow : Window
                        ImGui.SameLine();
                    }

-                    bool clicked;
-                    if (showGreetedAffordance && tab.IsGreeted)
+                    // v1.2.0 — Icon-only Sidebar mit Tooltip beim Hover.
+                    // Active-Tab kriegt Akzent-Color am Icon, Greeted-Tabs
+                    // werden auf TextDim gedimmt (löst den alten Header-
+                    // Dim-Trick ab, da wir keine Selectable mehr nutzen).
+                    var theme = Plugin.ThemeRegistry.Active;
+                    var icon = TabIconMapping.Resolve(tab);
+                    uint iconColor;
+                    if (isCurrentTab)
                    {
-                        // Dim the tab name once the user marked the partner
-                        // as greeted, so a glance at the sidebar tells them
-                        // who still needs attention. Selectable has no idle
-                        // background slot in ImGui, so the dim only applies
-                        // to the selected and hovered states — the text dim
-                        // alone signals greeted in the idle state.
-                        var headerBase = ImGui.GetColorU32(ImGuiCol.Header);
-                        var hoverBase = ImGui.GetColorU32(ImGuiCol.HeaderHovered);
-                        var dimHeader = (headerBase & 0xFF000000u) | ((headerBase & 0x00FEFEFEu) >> 1);
-                        var dimHover = (hoverBase & 0xFF000000u) | ((hoverBase & 0x00FEFEFEu) >> 1);
-
-                        using (ImRaii.PushColor(ImGuiCol.Text, ImGui.GetColorU32(ImGuiCol.TextDisabled)))
-                        using (ImRaii.PushColor(ImGuiCol.Header, dimHeader))
-                        using (ImRaii.PushColor(ImGuiCol.HeaderHovered, dimHover))
-                        {
-                            clicked = ImGui.Selectable(selectableLabel, isCurrentTab);
-                        }
+                        iconColor = theme.Colors.Accent;
+                    }
+                    else if (showGreetedAffordance && tab.IsGreeted)
+                    {
+                        iconColor = theme.Colors.TextDim;
+                    }
+                    else if (tab.IsTempTab && tab.TellTarget != null && tab.TellTarget.IsSet())
+                    {
+                        // v1.2.0 — Hash-Color-Tint differenziert parallele Auto-Tell-Tabs
+                        // visuell ohne dass User pro Tab manuell ein Custom-Icon setzen muss.
+                        iconColor = AutoTellTabTint.For(tab.TellTarget.Name, tab.TellTarget.World);
                    }
                    else
                    {
-                        clicked = ImGui.Selectable(selectableLabel, isCurrentTab);
+                        iconColor = theme.Colors.TextPrimary;
+                    }
+
+                    bool clicked;
+                    using (ImRaii.PushColor(ImGuiCol.Button, 0u))
+                    using (ImRaii.PushColor(ImGuiCol.ButtonHovered, ColourUtil.RgbaToAbgr(theme.Colors.SurfaceHover)))
+                    using (ImRaii.PushColor(ImGuiCol.ButtonActive, ColourUtil.RgbaToAbgr(theme.Colors.Surface)))
+                    using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(iconColor)))
+                    using (Plugin.FontManager.FontAwesome.Push())
+                    {
+                        clicked = ImGui.Button($"{icon.ToIconString()}##sidebar-tab-{tabI}", new Vector2(36f, ImGui.GetFrameHeight()));
+                    }
+
+                    if (isCurrentTab)
+                    {
+                        // v1.2.0 — Vertikale Akzent-Pill an der linken Window-Kante.
+                        // 3 px breit, halbe Tab-Höhe, vertikal zentriert. ImGui hat keine
+                        // native Pill-API, daher direkter DrawList-Pass.
+                        var min = ImGui.GetItemRectMin();
+                        var max = ImGui.GetItemRectMax();
+                        const float pillWidth = 3f;
+                        var pillHeight = (max.Y - min.Y) * 0.5f;
+                        var pillCenterY = (min.Y + max.Y) * 0.5f;
+                        ImGui.GetWindowDrawList().AddRectFilled(
+                            new Vector2(min.X, pillCenterY - pillHeight * 0.5f),
+                            new Vector2(min.X + pillWidth, pillCenterY + pillHeight * 0.5f),
+                            ColourUtil.RgbaToAbgr(theme.Colors.Accent),
+                            1.5f); // leichter Rounding
+                    }
+
+                    // v1.2.0 — Unread-Dot oben rechts am Icon. Sichtbar ohne Hover, damit
+                    // User Tabs mit ungelesenen Messages sofort erkennt. Aktive Tabs haben
+                    // per Konvention Unread = 0 (LastTab-Branch in ChatLogWindow), daher
+                    // kollidiert der Dot nicht mit der Active-Pill.
+                    if (!isCurrentTab && tab.UnreadMode != UnreadMode.None && tab.Unread > 0)
+                    {
+                        var min = ImGui.GetItemRectMin();
+                        var max = ImGui.GetItemRectMax();
+                        const float dotRadius = 4f;
+                        const float dotPadding = 3f;
+                        var dotCenter = new Vector2(
+                            max.X - dotRadius - dotPadding,
+                            min.Y + dotRadius + dotPadding);
+
+                        // v1.2.0 — Sanfter Pulse-Effekt: Alpha schwankt zwischen 60% und
+                        // 100% mit ~2-Sekunden-Cycle (subtil, nicht hektisch).
+                        // Plugin.Config.ReduceMotion (Field seit v1.1.0) skipt den Pulse
+                        // und rendert statisch — Default ist Animation an.
+                        var dotColor = theme.Colors.StatusDanger;
+                        if (!Plugin.Config.ReduceMotion)
+                        {
+                            // Sin-basierter 2s-Cycle: -1..1 → 0..1 → 0.6..1.0 Alpha-Skala.
+                            var phase = (float)((Math.Sin(Environment.TickCount64 / 1000.0 * Math.PI) + 1.0) * 0.5);
+                            var alphaScale = 0.6f + 0.4f * phase;
+                            var origAlpha = dotColor & 0xFFu;
+                            var pulsedAlpha = (uint)(origAlpha * alphaScale);
+                            dotColor = (dotColor & 0xFFFFFF00u) | pulsedAlpha;
+                        }
+
+                        ImGui.GetWindowDrawList().AddCircleFilled(
+                            dotCenter,
+                            dotRadius,
+                            ColourUtil.RgbaToAbgr(dotColor),
+                            12);
+                    }
+
+                    // Tooltip mit Tab-Name + Unread-Counter beim Hover.
+                    if (ImGui.IsItemHovered())
+                    {
+                        using var tt = ImRaii.Tooltip();
+                        ImGui.TextUnformatted($"{tab.Name}{unread}");
                    }

                    DrawTabContextMenu(tab, tabI);

+                    if (clicked)
+                        Plugin.WantedTab = tabI;
+
                    if (!clicked && Plugin.WantedTab != tabI)
                        continue;

@@ -1540,11 +1711,14 @@ public sealed class ChatLogWindow : Window
        var startY = ImGui.GetCursorPosY();

        var bg = new System.Numerics.Vector4(0.16f, 0.20f, 0.28f, 1f);
-        ImGui.PushStyleColor(ImGuiCol.ChildBg, bg);
-        ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 1f);
-
        var dismiss = false;
        var openSettings = false;
+        // RAII for the style stack so an early return in this block
+        // (or a later refactor that introduces one) can never leave the
+        // ImGui style stack unbalanced. Matches the convention used
+        // elsewhere in this file.
+        using (ImRaii.PushColor(ImGuiCol.ChildBg, bg))
+        using (ImRaii.PushStyle(ImGuiStyleVar.FrameBorderSize, 1f))
        using (var child = ImRaii.Child("##v061-pop-out-header-hint", new System.Numerics.Vector2(0f, 84f), true))
        {
            if (child)
@@ -1561,8 +1735,6 @@ public sealed class ChatLogWindow : Window
            }
        }

-        ImGui.PopStyleVar();
-        ImGui.PopStyleColor();
        ImGui.Spacing();

        if (dismiss)
@@ -1636,13 +1808,6 @@ public sealed class ChatLogWindow : Window
    internal readonly List<bool> PopOutDocked = [];
    internal readonly HashSet<Guid> PopOutWindows = [];

-    // Hellion Chat v0.6.1 — height the v0.6.1 hint banner consumed in the
-    // current frame, read by GetRemainingHeightForMessageLog so the message
-    // log can shrink. Unconditionally reassigned at the top of DrawChatLog
-    // (before any tab-area render) so the value is always in sync with the
-    // current frame. Returns 0 once the banner is dismissed.
-    private float _v061HintBannerHeight;
-
    // v0.6.0 — live enumeration of all active Popout windows so the
    // KeybindManager can find a focused ChatInputBar to forward tab-cycle
    // keybinds to. Filter on IsOpen prevents touching closed-but-still-
@@ -1745,47 +1910,55 @@ public sealed class ChatLogWindow : Window
            return;

        var clipper = new ImGuiListClipperPtr(ImGuiNative.ImGuiListClipper());
-
-        clipper.Begin(AutoCompleteList.Count);
-        while (clipper.Step())
+        try
        {
-            for (var i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
+            clipper.Begin(AutoCompleteList.Count);
+            while (clipper.Step())
            {
-                var entry = AutoCompleteList[i];
-
-                var highlight = AutoCompleteSelection == i;
-                var clicked = ImGui.Selectable($"{entry.Text}##{entry.Group}/{entry.Row}", highlight) || selected == i;
-                if (i < 10)
+                for (var i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
                {
-                    var button = (i + 1) % 10;
-                    var text = string.Format(Language.AutoTranslate_Completion_Key, button);
-                    var size = ImGui.CalcTextSize(text);
+                    var entry = AutoCompleteList[i];

-                    ImGui.SameLine(ImGui.GetContentRegionAvail().X - size.X);
+                    var highlight = AutoCompleteSelection == i;
+                    var clicked = ImGui.Selectable($"{entry.Text}##{entry.Group}/{entry.Row}", highlight) || selected == i;
+                    if (i < 10)
+                    {
+                        var button = (i + 1) % 10;
+                        var text = string.Format(Language.AutoTranslate_Completion_Key, button);
+                        var size = ImGui.CalcTextSize(text);

-                    using (ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]))
-                        ImGui.TextUnformatted(text);
+                        ImGui.SameLine(ImGui.GetContentRegionAvail().X - size.X);
+
+                        using (ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]))
+                            ImGui.TextUnformatted(text);
+                    }
+
+                    if (!clicked)
+                        continue;
+
+                    var before = Chat[..AutoCompleteInfo.StartPos];
+                    var after = Chat[AutoCompleteInfo.EndPos..];
+                    var replacement = $"<at:{entry.Group},{entry.Row}>";
+                    Chat = $"{before}{replacement}{after}";
+                    ImGui.CloseCurrentPopup();
+                    Activate = true;
+                    ActivatePos = AutoCompleteInfo.StartPos + replacement.Length;
                }
-
-                if (!clicked)
-                    continue;
-
-                var before = Chat[..AutoCompleteInfo.StartPos];
-                var after = Chat[AutoCompleteInfo.EndPos..];
-                var replacement = $"<at:{entry.Group},{entry.Row}>";
-                Chat = $"{before}{replacement}{after}";
-                ImGui.CloseCurrentPopup();
-                Activate = true;
-                ActivatePos = AutoCompleteInfo.StartPos + replacement.Length;
            }
+
+            if (!AutoCompleteShouldScroll)
+                return;
+
+            AutoCompleteShouldScroll = false;
+            var selectedPos = clipper.StartPosY + clipper.ItemsHeight * (AutoCompleteSelection * 1f);
+            ImGui.SetScrollFromPosY(selectedPos - ImGui.GetWindowPos().Y);
+        }
+        finally
+        {
+            // ImGuiListClipperPtr wraps an unmanaged ImGuiListClipper allocated above.
+            // Without Destroy() the unmanaged block leaks per autocomplete render.
+            clipper.Destroy();
        }
-
-        if (!AutoCompleteShouldScroll)
-            return;
-
-        AutoCompleteShouldScroll = false;
-        var selectedPos = clipper.StartPosY + clipper.ItemsHeight * (AutoCompleteSelection * 1f);
-        ImGui.SetScrollFromPosY(selectedPos - ImGui.GetWindowPos().Y);
    }

    private int AutoCompleteCallback(scoped ref ImGuiInputTextCallbackData data)
@@ -47,8 +47,11 @@ public class CommandHelpWindow : Window {
        Position = pos;
        SizeConstraints = new WindowSizeConstraints
        {
-            MinimumSize = new Vector2(width, 0),
-            MaximumSize = LogWindow.LastWindowSize with { X = width }
+            // Use scaledWidth here so the size constraints stay in the same
+            // coordinate space as Position above; otherwise the help window
+            // ends up the wrong width at non-100% DPI.
+            MinimumSize = new Vector2(scaledWidth, 0),
+            MaximumSize = LogWindow.LastWindowSize with { X = scaledWidth }
        };

        IsOpen = true;
@@ -1,3 +1,4 @@
+using HellionChat.Themes;
 using HellionChat.Util;
 using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility.Raii;
@@ -5,207 +6,130 @@ using Dalamud.Interface.Utility.Raii;
 namespace HellionChat.Ui;

 /// <summary>
-/// ImGui style override for Hellion Chat. Industrial HUD palette with three
-/// distinct accents — cyan-teal as the primary action color, industrial
-/// amber for active state highlights, slate-violet for title bars and
-/// active tabs — on a deep-slate frame background with steel borders.
-///
-/// Two entry points:
-///   Push       — local color stack, scoped via using-block. Use inside
-///                Hellion-only surfaces (Privacy tab, first-run wizard).
-///   PushGlobal — full color + style variable stack. Pushed once per frame
-///                in Plugin.Draw so every Hellion-rendered window inherits
-///                the look. Cheap to pop because ImGui keeps its own stack.
+/// ImGui style override for Hellion Chat. v1.1.0 ist die Engine
+/// theme-getrieben: PushGlobal nimmt eine Theme-Instance + Window-
+/// Opacity, die gesamten Color- und Style-Slots werden aus dem Theme
+/// gelesen statt aus einer fixen Konstanten-Tabelle.
 /// </summary>
 internal static class HellionStyle
 {
-    // Encoded as 0xRRGGBBAA, matching ChatTwo convention (see Settings.cs
-    // Ko-fi buttons). RgbaToAbgr handles the byte swap to the format ImGui
-    // expects. Hex values are sourced from the Hellion Online Media brand
-    // guide ("Arctic Cyan + Ember Glow", BRANDING.md in the website repo).
-
-    // Primary — Arctic Cyan, used for every interactive control (buttons,
-    // checks, sliders, separators when hovered). Three brand stages plus a
-    // hover that lifts to brand-color-light and a press that drops to
-    // brand-color-dark.
-    private const uint PrimaryRgba = 0x00BED2FF;       // brand-color
-    private const uint PrimaryHoverRgba = 0x4DD9E8FF;  // brand-color-light
-    private const uint PrimaryActiveRgba = 0x0097A7FF; // brand-color-dark
-
-    // Identity — brand-color-dark teal for window title bars and the
-    // active tab. Sits visibly below the primary cyan on buttons so the
-    // user sees "where am I" (deep teal) versus "what can I click"
-    // (brand cyan) without leaving the cyan family.
-    private const uint IdentityRgba = 0x0097A7FF;       // brand-color-dark
-    private const uint IdentityHoverRgba = 0x4DD9E8FF;  // brand-color-light
-    private const uint IdentityDeepRgba = 0x005670FF;   // dimmer teal for unfocused-active tab
-
-    // Accent — Ember Orange for warm highlights on grips and scrollbar
-    // pulls. Replaces the previous industrial amber so the plugin matches
-    // the website's CTA palette. AccentActive is reserved for any future
-    // pressed-state on accent surfaces; the current slots only need
-    // AccentRgba and AccentHoverRgba.
-    private const uint AccentRgba = 0xF97316FF;        // accent-color
-    private const uint AccentHoverRgba = 0xFB923CFF;   // accent-color-light
-
-    // Surfaces — Hellion brand background ladder. Window darkest, frame
-    // hover ladder climbs into surface tones. Matches the website's
-    // background / background-medium / background-light / surface vars.
-    private const uint WindowBgRgba = 0x070B12FF;       // background
-    private const uint ChildBgRgba = 0x0C1220FF;        // background-medium
-    private const uint PopupBgRgba = 0x0C1220FF;        // background-medium
-    private const uint FrameBgRgba = 0x141E30FF;        // background-light
-    private const uint FrameBgHoverRgba = 0x1A2538FF;   // surface
-    private const uint FrameBgActiveRgba = 0x22303FFF;  // surface-hover
-    // Cyan-tinted border — matches website --border-brand (cyan @ 40% α).
-    private const uint BorderRgba = 0x00BED266;
-    private const uint BorderShadowRgba = 0x00000000;
-
-    // Headers / collapsing-headers / tree nodes / selectables — same
-    // surface ladder as frames so panels feel consistent.
-    private const uint HeaderRgba = 0x141E30FF;
-    private const uint HeaderHoverRgba = 0x1A2538FF;
-    private const uint HeaderActiveRgba = 0x22303FFF;
-
-    // Title bars — Identity teal on active so the focused window reads
-    // as "yours" without using accent or primary slots.
-    private const uint TitleBgRgba = 0x070B12FF;
-    private const uint TitleBgActiveRgba = IdentityRgba;
-    private const uint TitleBgCollapsedRgba = 0x05080EFF;
-
-    // Tabs — neutral inactive, Identity-light on hover, Identity teal on
-    // active. Unfocused-active uses the deeper Identity stage so an
-    // unfocused window's active tab still reads but does not pull focus.
-    private const uint TabRgba = 0x141E30FF;
-    private const uint TabHoveredRgba = IdentityHoverRgba;
-    private const uint TabActiveRgba = IdentityRgba;
-    private const uint TabUnfocusedRgba = 0x0C1220FF;
-    private const uint TabUnfocusedActiveRgba = IdentityDeepRgba;
-
-    // Scrollbar — Ember on grab so the pull stands out without competing
-    // with the cyan action buttons. Idle grab is a subtle surface tone,
-    // hover/active climb into accent.
-    private const uint ScrollbarBgRgba = 0x070B12FF;
-    private const uint ScrollbarGrabRgba = 0x22303FFF;       // surface-hover
-    private const uint ScrollbarGrabHoveredRgba = AccentHoverRgba;
-    private const uint ScrollbarGrabActiveRgba = AccentRgba;
-
-    // Resize grip — same Ember treatment as the scrollbar.
-    private const uint ResizeGripRgba = 0x141E30FF;
-    private const uint ResizeGripHoveredRgba = AccentHoverRgba;
-    private const uint ResizeGripActiveRgba = AccentRgba;
-
-    // Separator and check mark / slider follow the primary cyan.
-
    /// <summary>
-    /// Local color stack for Hellion-only surfaces. Cheap. Use inside a
-    /// `using var _ = HellionStyle.Push();` block.
+    /// Local color stack auf Basis des aktiven Themes. Cheap. Use inside a
+    /// `using var _ = HellionStyle.Push(theme);` block.
    /// </summary>
-    internal static IDisposable Push()
+    internal static IDisposable Push(Theme theme)
    {
+        var c = theme.Colors;
        var stack = new StackHandle();
-        stack.PushColor(ImGuiCol.Button, PrimaryRgba);
-        stack.PushColor(ImGuiCol.ButtonHovered, PrimaryHoverRgba);
-        stack.PushColor(ImGuiCol.ButtonActive, PrimaryActiveRgba);
-        stack.PushColor(ImGuiCol.FrameBg, FrameBgRgba);
-        stack.PushColor(ImGuiCol.FrameBgHovered, FrameBgHoverRgba);
-        stack.PushColor(ImGuiCol.FrameBgActive, FrameBgActiveRgba);
-        stack.PushColor(ImGuiCol.Border, BorderRgba);
-        stack.PushColor(ImGuiCol.Header, HeaderRgba);
-        stack.PushColor(ImGuiCol.HeaderHovered, HeaderHoverRgba);
-        stack.PushColor(ImGuiCol.HeaderActive, HeaderActiveRgba);
-        stack.PushColor(ImGuiCol.CheckMark, PrimaryRgba);
-        stack.PushColor(ImGuiCol.SliderGrab, PrimaryRgba);
-        stack.PushColor(ImGuiCol.SliderGrabActive, PrimaryHoverRgba);
+        stack.PushColor(ImGuiCol.Button,           c.Primary);
+        stack.PushColor(ImGuiCol.ButtonHovered,    c.PrimaryLight);
+        stack.PushColor(ImGuiCol.ButtonActive,     c.PrimaryDark);
+        stack.PushColor(ImGuiCol.FrameBg,          c.FrameBg);
+        stack.PushColor(ImGuiCol.FrameBgHovered,   c.SurfaceHover);
+        stack.PushColor(ImGuiCol.FrameBgActive,    c.Surface);
+        stack.PushColor(ImGuiCol.Border,           c.Border);
+        stack.PushColor(ImGuiCol.Header,           c.Surface);
+        stack.PushColor(ImGuiCol.HeaderHovered,    c.SurfaceHover);
+        stack.PushColor(ImGuiCol.HeaderActive,     c.Identity);
+        stack.PushColor(ImGuiCol.CheckMark,        c.Primary);
+        stack.PushColor(ImGuiCol.SliderGrab,       c.Primary);
+        stack.PushColor(ImGuiCol.SliderGrabActive, c.PrimaryLight);
        return stack;
    }

    /// <summary>
    /// Global color and style-variable stack pushed once per frame in
-    /// Plugin.Draw. Covers every ImGui surface the plugin renders so the
-    /// Hellion look is consistent across upstream and Hellion tabs.
+    /// Plugin.Draw. Drives every Hellion-rendered window from the active
+    /// theme's palette and layout values.
    /// </summary>
-    /// <param name="windowOpacity">Window background alpha (0.5–1.0). Lower
-    /// values let the game shine through the plugin panes.</param>
-    internal static IDisposable PushGlobal(float windowOpacity = 1.0f)
+    /// <param name="theme">Active theme from ThemeRegistry.</param>
+    /// <param name="windowOpacity">Window background alpha (0.5–1.0).</param>
+    internal static IDisposable PushGlobal(Theme theme, float windowOpacity = 1.0f)
    {
+        var c = theme.Colors;
+        var l = theme.Layout;
        var stack = new StackHandle();

-        // Mix the configured opacity into both the outer window and the
-        // inner content child backgrounds — without ChildBg following the
-        // slider the chat log stays opaque inside even when the user
-        // wants to see the game behind it during combat. Form fields and
-        // popups (FrameBg, PopupBg) still stay opaque so input is readable.
        var alphaByte = (uint)Math.Clamp((int)(windowOpacity * 255f), 0x55, 0xFF);
-        var windowBgWithAlpha = (WindowBgRgba & 0xFFFFFF00u) | alphaByte;
-        var childBgWithAlpha = (ChildBgRgba & 0xFFFFFF00u) | alphaByte;
+        var windowBgWithAlpha = (c.WindowBg & 0xFFFFFF00u) | alphaByte;

-        // Layout — geometric edges, modest rounding, single-pixel borders.
-        stack.PushStyleVar(ImGuiStyleVar.WindowRounding, 4f);
-        stack.PushStyleVar(ImGuiStyleVar.ChildRounding, 3f);
-        stack.PushStyleVar(ImGuiStyleVar.PopupRounding, 3f);
-        stack.PushStyleVar(ImGuiStyleVar.FrameRounding, 2f);
-        stack.PushStyleVar(ImGuiStyleVar.GrabRounding, 2f);
-        stack.PushStyleVar(ImGuiStyleVar.TabRounding, 2f);
-        stack.PushStyleVar(ImGuiStyleVar.ScrollbarRounding, 2f);
-        stack.PushStyleVar(ImGuiStyleVar.WindowBorderSize, 1f);
-        stack.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 1f);
+        // ChildBg-Alpha: Sub-Bereiche (Tab-Sidebar, Message-Area, Input-Bar)
+        // werden im ChatLog-Window als BeginChild gezeichnet. Würde der ChildBg
+        // mit dem gleichen Alpha wie WindowBg gerendert, multiplizieren sich
+        // die Layer (1 - (1-α)² Deckung), und 50 % WindowOpacity kommt mit
+        // 75 % Deckung im Child-Bereich an — das Fenster wirkt solider als der
+        // Slider verspricht. Bei voller Opacity bleibt der Theme-Akzent
+        // erhalten (Theme-eigene Alpha-Komponente, i.d.R. FF); sobald der User
+        // Transparenz zieht, wird ChildBg vollständig durchsichtig damit nur
+        // der WindowBg-Layer die finale Deckung bestimmt.
+        var childBgAlpha = windowOpacity >= 0.999f ? (c.ChildBg & 0xFFu) : 0u;
+        var childBgWithAlpha = (c.ChildBg & 0xFFFFFF00u) | childBgAlpha;

-        // Surfaces.
-        stack.PushColor(ImGuiCol.WindowBg, windowBgWithAlpha);
-        stack.PushColor(ImGuiCol.ChildBg, childBgWithAlpha);
-        stack.PushColor(ImGuiCol.PopupBg, PopupBgRgba);
-        stack.PushColor(ImGuiCol.Border, BorderRgba);
-        stack.PushColor(ImGuiCol.BorderShadow, BorderShadowRgba);
+        // Layout
+        stack.PushStyleVar(ImGuiStyleVar.WindowRounding,    l.WindowRounding);
+        stack.PushStyleVar(ImGuiStyleVar.ChildRounding,     l.ChildRounding);
+        stack.PushStyleVar(ImGuiStyleVar.PopupRounding,     l.PopupRounding);
+        stack.PushStyleVar(ImGuiStyleVar.FrameRounding,     l.FrameRounding);
+        stack.PushStyleVar(ImGuiStyleVar.GrabRounding,      l.GrabRounding);
+        stack.PushStyleVar(ImGuiStyleVar.TabRounding,       l.TabRounding);
+        stack.PushStyleVar(ImGuiStyleVar.ScrollbarRounding, l.ScrollbarRounding);
+        stack.PushStyleVar(ImGuiStyleVar.WindowBorderSize,  l.WindowBorderSize);
+        stack.PushStyleVar(ImGuiStyleVar.FrameBorderSize,   l.FrameBorderSize);

-        // Frames (input fields, combos, sliders).
-        stack.PushColor(ImGuiCol.FrameBg, FrameBgRgba);
-        stack.PushColor(ImGuiCol.FrameBgHovered, FrameBgHoverRgba);
-        stack.PushColor(ImGuiCol.FrameBgActive, FrameBgActiveRgba);
+        // Surfaces
+        stack.PushColor(ImGuiCol.WindowBg,    windowBgWithAlpha);
+        stack.PushColor(ImGuiCol.ChildBg,     childBgWithAlpha);
+        stack.PushColor(ImGuiCol.PopupBg,     c.ChildBg);
+        stack.PushColor(ImGuiCol.Border,      c.Border);
+        stack.PushColor(ImGuiCol.BorderShadow, 0u);

-        // Title bars — tertiary identity on active.
-        stack.PushColor(ImGuiCol.TitleBg, TitleBgRgba);
-        stack.PushColor(ImGuiCol.TitleBgActive, TitleBgActiveRgba);
-        stack.PushColor(ImGuiCol.TitleBgCollapsed, TitleBgCollapsedRgba);
+        // Frames
+        stack.PushColor(ImGuiCol.FrameBg,        c.FrameBg);
+        stack.PushColor(ImGuiCol.FrameBgHovered, c.SurfaceHover);
+        stack.PushColor(ImGuiCol.FrameBgActive,  c.Surface);

-        // Buttons — primary cyan.
-        stack.PushColor(ImGuiCol.Button, PrimaryRgba);
-        stack.PushColor(ImGuiCol.ButtonHovered, PrimaryHoverRgba);
-        stack.PushColor(ImGuiCol.ButtonActive, PrimaryActiveRgba);
+        // Title bars
+        stack.PushColor(ImGuiCol.TitleBg,          c.WindowBg);
+        stack.PushColor(ImGuiCol.TitleBgActive,    c.Identity);
+        stack.PushColor(ImGuiCol.TitleBgCollapsed, c.WindowBg);

-        // Headers / selectables — slate with subtle steps.
-        stack.PushColor(ImGuiCol.Header, HeaderRgba);
-        stack.PushColor(ImGuiCol.HeaderHovered, HeaderHoverRgba);
-        stack.PushColor(ImGuiCol.HeaderActive, HeaderActiveRgba);
+        // Buttons
+        stack.PushColor(ImGuiCol.Button,        c.Primary);
+        stack.PushColor(ImGuiCol.ButtonHovered, c.PrimaryLight);
+        stack.PushColor(ImGuiCol.ButtonActive,  c.PrimaryDark);

-        // Tabs — tertiary identity for the active tab.
-        stack.PushColor(ImGuiCol.Tab, TabRgba);
-        stack.PushColor(ImGuiCol.TabHovered, TabHoveredRgba);
-        stack.PushColor(ImGuiCol.TabActive, TabActiveRgba);
-        stack.PushColor(ImGuiCol.TabUnfocused, TabUnfocusedRgba);
-        stack.PushColor(ImGuiCol.TabUnfocusedActive, TabUnfocusedActiveRgba);
+        // Headers / selectables
+        stack.PushColor(ImGuiCol.Header,        c.Surface);
+        stack.PushColor(ImGuiCol.HeaderHovered, c.SurfaceHover);
+        stack.PushColor(ImGuiCol.HeaderActive,  c.Identity);

-        // Scrollbar.
-        stack.PushColor(ImGuiCol.ScrollbarBg, ScrollbarBgRgba);
-        stack.PushColor(ImGuiCol.ScrollbarGrab, ScrollbarGrabRgba);
-        stack.PushColor(ImGuiCol.ScrollbarGrabHovered, ScrollbarGrabHoveredRgba);
-        stack.PushColor(ImGuiCol.ScrollbarGrabActive, ScrollbarGrabActiveRgba);
+        // Tabs
+        stack.PushColor(ImGuiCol.Tab,                c.FrameBg);
+        stack.PushColor(ImGuiCol.TabHovered,         c.PrimaryLight);
+        stack.PushColor(ImGuiCol.TabActive,          c.Identity);
+        stack.PushColor(ImGuiCol.TabUnfocused,       c.ChildBg);
+        stack.PushColor(ImGuiCol.TabUnfocusedActive, c.PrimaryDark);

-        // Resize grip — secondary amber on active.
-        stack.PushColor(ImGuiCol.ResizeGrip, ResizeGripRgba);
-        stack.PushColor(ImGuiCol.ResizeGripHovered, ResizeGripHoveredRgba);
-        stack.PushColor(ImGuiCol.ResizeGripActive, ResizeGripActiveRgba);
+        // Scrollbar
+        stack.PushColor(ImGuiCol.ScrollbarBg,          c.WindowBg);
+        stack.PushColor(ImGuiCol.ScrollbarGrab,        c.Surface);
+        stack.PushColor(ImGuiCol.ScrollbarGrabHovered, c.AccentLight);
+        stack.PushColor(ImGuiCol.ScrollbarGrabActive,  c.Accent);

-        // Check mark + slider grab — primary cyan.
-        stack.PushColor(ImGuiCol.CheckMark, PrimaryRgba);
-        stack.PushColor(ImGuiCol.SliderGrab, PrimaryRgba);
-        stack.PushColor(ImGuiCol.SliderGrabActive, PrimaryHoverRgba);
+        // Resize grip
+        stack.PushColor(ImGuiCol.ResizeGrip,        c.FrameBg);
+        stack.PushColor(ImGuiCol.ResizeGripHovered, c.AccentLight);
+        stack.PushColor(ImGuiCol.ResizeGripActive,  c.Accent);

-        // Separator — primary cyan when hovered/active so the eye
-        // immediately sees that splitters are interactive.
-        stack.PushColor(ImGuiCol.Separator, BorderRgba);
-        stack.PushColor(ImGuiCol.SeparatorHovered, PrimaryHoverRgba);
-        stack.PushColor(ImGuiCol.SeparatorActive, PrimaryRgba);
+        // Check mark + slider grab
+        stack.PushColor(ImGuiCol.CheckMark,         c.Primary);
+        stack.PushColor(ImGuiCol.SliderGrab,        c.Primary);
+        stack.PushColor(ImGuiCol.SliderGrabActive,  c.PrimaryLight);
+
+        // Separator
+        stack.PushColor(ImGuiCol.Separator,         c.Border);
+        stack.PushColor(ImGuiCol.SeparatorHovered,  c.PrimaryLight);
+        stack.PushColor(ImGuiCol.SeparatorActive,   c.Primary);

        return stack;
    }
@@ -177,7 +177,10 @@ public partial class InputPreview : Window
                return;

            NextChunkIsAutoTranslate = true;
-            var payload = (AutoTranslatePayload) chunk.Link!;
+            // Malformed chunks could carry an AutoTranslateBegin icon without the matching
+            // payload; bail out instead of dereferencing a null Link.
+            if (chunk.Link is not AutoTranslatePayload payload)
+                return;
            CursorPosition += $"<at:{payload.Group},{payload.Key}>".Length;

            return;
@@ -39,6 +39,12 @@ internal class Popout : Window
        IsOpen = true;
        RespectCloseHotkey = false;
        DisableWindowSounds = true;
+        // v1.2.1 — KEIN AllowBackgroundBlur. Pop-Outs werden vom User häufig
+        // im Dalamud-Tab-Container mit anderen Plugin-Windows kombiniert; in
+        // dem Render-Pfad blurt Dalamud den gesamten Container, nicht nur
+        // das Pop-Out — würde die Tab-Bar oben und benachbarte Plugins
+        // mitziehen. Wer Blur in Pop-Outs will, kann ihn via Dalamud-
+        // Hamburger-Menü pro Window selbst aktivieren.
    }

    public override void PreOpenCheck()
@@ -67,9 +73,10 @@ internal class Popout : Window

    public override void PreDraw()
    {
-        if (Plugin.Config is { OverrideStyle: true, ChosenStyle: not null })
-            StyleModel.GetConfiguredStyles()?.FirstOrDefault(style => style.Name == Plugin.Config.ChosenStyle)?.Push();
-
+        // Hellion Chat v1.1.0+ — Theme-Engine ist Source-of-Truth, kein
+        // zusätzlicher Dalamud-StyleModel-Override mehr pro Window. Plugin.Draw
+        // pusht das aktive Hellion-Theme global; Pop-Out zeichnet sich damit
+        // konsistent zum Haupt-Chat-Window.
        Flags = ImGuiWindowFlags.None;
        if (!Plugin.Config.ShowPopOutTitleBar)
            Flags |= ImGuiWindowFlags.NoTitleBar;
@@ -91,9 +98,7 @@ internal class Popout : Window
            }
            else
            {
-                BgAlpha = Plugin.Config.HellionThemeEnabled
-                    ? Plugin.Config.HellionThemeWindowOpacity
-                    : Plugin.Config.WindowAlpha / 100f;
+                BgAlpha = Plugin.Config.WindowOpacity;
            }
        }
    }
@@ -200,9 +205,6 @@ internal class Popout : Window
    {
        if (Idx >= 0 && Idx < ChatLogWindow.PopOutDocked.Count)
            ChatLogWindow.PopOutDocked[Idx] = ImGui.IsWindowDocked();
-
-        if (Plugin.Config is { OverrideStyle: true, ChosenStyle: not null })
-            StyleModel.GetConfiguredStyles()?.FirstOrDefault(style => style.Name == Plugin.Config.ChosenStyle)?.Pop();
    }

    public override void OnClose()
@@ -222,7 +222,16 @@ public class SeStringDebugger : Window
                default:
                    var payloadData = payload.Encode();

-                    var initialByte = payloadData.First();
+                    if (payloadData.Length == 0)
+                    {
+                        RenderMetadataDictionary("Empty Payload", new Dictionary<string, string?>
+                        {
+                            { "Type", payload.GetType().Name },
+                        });
+                        break;
+                    }
+
+                    var initialByte = payloadData[0];
                    if (initialByte != 0x02)
                    {
                        RenderMetadataDictionary("Text Payload", new Dictionary<string, string?>
@@ -9,13 +9,21 @@ using Dalamud.Bindings.ImGui;

 namespace HellionChat.Ui;

+internal enum SettingsView
+{
+    Overview,
+    Detail,
+}
+
 public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
 {
-    private readonly Plugin Plugin;
+    internal readonly Plugin Plugin;

    private Configuration Mutable { get; }
    private List<ISettingsTab> Tabs { get; }
    private int CurrentTab;
+    private SettingsView View = SettingsView.Overview;
+    private readonly SettingsOverview Overview;

    internal SettingsWindow(Plugin plugin) : base($"{Language.Settings_Title.Format(Plugin.PluginName)}###chat2-settings")
    {
@@ -31,15 +39,18 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
        Plugin = plugin;
        Mutable = new Configuration();

+        Overview = new SettingsOverview(this);
+
        Tabs =
        [
            new General(Plugin, Mutable),
-            new Appearance(Plugin, Mutable),
+            new ThemeAndLayout(Plugin, Mutable),
+            new FontsAndColours(Plugin, Mutable),
            new SettingsTabs.Window(Plugin, Mutable),
            new Chat(Plugin, Mutable),
            new SettingsTabs.Tabs(Plugin, Mutable),
            new SettingsTabs.Privacy(Plugin, Mutable),
-            new Database(Plugin, Mutable),
+            new DataManagement(Plugin, Mutable),
            new Information(Mutable),
        ];

@@ -72,40 +83,81 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
    public override void Draw()
    {
        if (ImGui.IsWindowAppearing())
-            Initialise();
-
-        using (var table = ImRaii.Table("##chat2-settings-table", 2))
        {
-            if (table.Success)
-            {
-                ImGui.TableSetupColumn("tab", ImGuiTableColumnFlags.WidthFixed);
-                ImGui.TableSetupColumn("settings", ImGuiTableColumnFlags.WidthStretch);
-
-                ImGui.TableNextColumn();
-
-                var changed = false;
-                for (var i = 0; i < Tabs.Count; i++)
-                {
-                    if (!ImGui.Selectable($"{Tabs[i].Name}###tab-{i}", CurrentTab == i))
-                        continue;
-
-                    CurrentTab = i;
-                    changed = true;
-                }
-
-                ImGui.TableNextColumn();
-
-                var style = ImGui.GetStyle();
-                var height = ImGui.GetContentRegionAvail().Y - style.FramePadding.Y * 2 - style.ItemSpacing.Y - style.ItemInnerSpacing.Y * 2 - ImGui.CalcTextSize("A").Y;
-
-                using var child = ImRaii.Child("##chat2-settings", new Vector2(-1, height));
-                if (child.Success)
-                    Tabs[CurrentTab].Draw(changed);
-            }
+            Initialise();
+            View = SettingsView.Overview;
        }

-        ImGui.Separator();
+        // ESC im Detail-View kehrt zur Overview zurück. Window-Focus-Check ist
+        // Pflicht — sonst triggert ESC auch wenn der User ein anderes Fenster
+        // fokussiert hat und ESC fürs Game-Menü drückt (Codebase-Pattern siehe
+        // Util/SearchSelector.cs:37).
+        if (View == SettingsView.Detail
+            && ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows)
+            && ImGui.IsKeyPressed(ImGuiKey.Escape))
+        {
+            View = SettingsView.Overview;
+            return;
+        }

+        if (View == SettingsView.Overview)
+            Overview.Draw();
+        else
+            DrawDetail();
+
+        ImGui.Separator();
+        DrawSaveButtons();
+    }
+
+    internal void OpenSection(int tabIndex)
+    {
+        CurrentTab = tabIndex;
+        View = SettingsView.Detail;
+    }
+
+    internal void OpenOverview()
+    {
+        View = SettingsView.Overview;
+    }
+
+    private void DrawDetail()
+    {
+        // Breadcrumb-Header — Akzent-Cyan, klickbar, führt zurück zur Overview
+        using (ImRaii.PushColor(ImGuiCol.Text, 0xFF00BED2u))
+        using (ImRaii.PushColor(ImGuiCol.Button, 0u))
+        using (ImRaii.PushColor(ImGuiCol.ButtonHovered, 0x33FFFFFFu))
+        using (ImRaii.PushColor(ImGuiCol.ButtonActive, 0x55FFFFFFu))
+        {
+            if (ImGui.SmallButton("← Settings"))
+            {
+                View = SettingsView.Overview;
+                return;
+            }
+        }
+        ImGui.SameLine();
+        ImGui.TextUnformatted("·");
+        ImGui.SameLine();
+        ImGui.TextUnformatted(Tabs[CurrentTab].Name.Split("###")[0]);
+
+        ImGui.Spacing();
+        ImGui.Separator();
+        ImGui.Spacing();
+
+        // Section-Content in voller Breite. Die Tab-Liste links ist überholt:
+        // der User ist bereits über die Card-Übersicht navigiert, eine zweite
+        // Tab-Liste daneben würde nur den Vanilla-Look zurückbringen. Falls
+        // der User in eine andere Section will, geht er zurück zur Overview
+        // (Breadcrumb / ESC).
+        var style = ImGui.GetStyle();
+        var height = ImGui.GetContentRegionAvail().Y - style.FramePadding.Y * 2 - style.ItemSpacing.Y - style.ItemInnerSpacing.Y * 2 - ImGui.CalcTextSize("A").Y;
+
+        using var child = ImRaii.Child("##chat2-settings-detail", new Vector2(-1, height));
+        if (child.Success)
+            Tabs[CurrentTab].Draw(false);
+    }
+
+    private void DrawSaveButtons()
+    {
        var save = ImGui.Button(Language.Settings_Save);

        ImGui.SameLine();
@@ -158,14 +210,24 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
        var fontSizeChanged = Math.Abs(Mutable.SymbolsFontSizeV2 - Plugin.Config.SymbolsFontSizeV2) > 0.001
                          || Math.Abs(Mutable.FontSizeV2 - Plugin.Config.FontSizeV2) > 0.001;
        var italicStateChanged = Mutable.ItalicEnabled != Plugin.Config.ItalicEnabled;
+        // v1.2.0 — Refilter only if a filter-relevant setting actually
+        // changed. The Clear+Refilter cycle reloads messages from the DB,
+        // which silently wipes any in-session message that wasn't
+        // persisted (Privacy-First config blocks most channels from DB).
+        // Cosmetic changes (theme, tab icons, layout flags) trigger no
+        // refilter — chat history stays intact.
+        var filtersChanged = HasFilterRelevantChanges();

        Plugin.Config.UpdateFrom(Mutable, true);

        // save after 60 frames have passed, which should hopefully not
        // commit any changes that cause a crash
        Plugin.DeferredSaveFrames = 60;
-        Plugin.MessageManager.ClearAllTabs();
-        Plugin.MessageManager.FilterAllTabsAsync();
+        if (filtersChanged)
+        {
+            Plugin.MessageManager.ClearAllTabs();
+            Plugin.MessageManager.FilterAllTabsAsync();
+        }

        if (fontChanged || fontSizeChanged || italicStateChanged)
            Plugin.FontManager.BuildFonts();
@@ -181,4 +243,59 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window

        Initialise();
    }
+
+    /// <summary>
+    /// v1.2.0 — Detects whether any setting that influences message
+    /// filtering changed between Plugin.Config and the Mutable working
+    /// copy. Used to gate the heavy ClearAllTabs+FilterAllTabsAsync cycle
+    /// in Save: cosmetic changes (theme, tab icons, layout flags) do not
+    /// touch the chat log, only filter-relevant changes do. Without this
+    /// gate, every settings save wipes the chat history of any channel
+    /// the Privacy filter blocks from being persisted to the DB —
+    /// reported by Flo from in-game testing 2026-05-05/06.
+    /// </summary>
+    private bool HasFilterRelevantChanges()
+    {
+        // Top-level privacy controls.
+        if (Mutable.PrivacyFilterEnabled != Plugin.Config.PrivacyFilterEnabled) return true;
+        if (Mutable.PrivacyPersistUnknownChannels != Plugin.Config.PrivacyPersistUnknownChannels) return true;
+        if (!Mutable.PrivacyPersistChannels.SetEquals(Plugin.Config.PrivacyPersistChannels)) return true;
+
+        // FilterIncludePreviousSessions changes the GetMostRecentMessages
+        // window in MessageManager.FilterAllTabs and is therefore filter-
+        // relevant even though it lives outside the Privacy block.
+        if (Mutable.FilterIncludePreviousSessions != Plugin.Config.FilterIncludePreviousSessions) return true;
+
+        // Per-tab channel selection. Compare persistent tabs only —
+        // TempTabs are session-only and never refiltered anyway.
+        var origPersistent = Plugin.Config.Tabs.Where(t => !t.IsTempTab).ToList();
+        var newPersistent = Mutable.Tabs.Where(t => !t.IsTempTab).ToList();
+
+        if (origPersistent.Count != newPersistent.Count) return true; // add or delete
+
+        for (var i = 0; i < origPersistent.Count; i++)
+        {
+            var orig = origPersistent[i];
+            var neu = newPersistent[i];
+
+            // Identifier mismatch at the same index means reorder or
+            // a slot got swapped — treat as filter-relevant so the new
+            // channel-selection layout actually applies.
+            if (orig.Identifier != neu.Identifier) return true;
+
+            if (orig.ExtraChatAll != neu.ExtraChatAll) return true;
+            if (!orig.ExtraChatChannels.SetEquals(neu.ExtraChatChannels)) return true;
+
+            // SelectedChannels is a Dictionary<ChatType, (ChatSource, ChatSource)>
+            // — value-tuple equality already does the right thing per-pair.
+            if (orig.SelectedChannels.Count != neu.SelectedChannels.Count) return true;
+            foreach (var pair in orig.SelectedChannels)
+            {
+                if (!neu.SelectedChannels.TryGetValue(pair.Key, out var nv)) return true;
+                if (!pair.Value.Equals(nv)) return true;
+            }
+        }
+
+        return false;
+    }
 }
@@ -0,0 +1,105 @@
+using System.Numerics;
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface;
+using Dalamud.Interface.Utility.Raii;
+using HellionChat.Resources;
+using HellionChat.Util;
+
+namespace HellionChat.Ui;
+
+internal sealed class SettingsOverview
+{
+    private readonly SettingsWindow _window;
+
+    // Card-Reihenfolge entspricht 1:1 dem Tabs-Index in SettingsWindow.
+    // v1.2.1: Cards thematisch re-sortiert. Theme & Layout vereint Theme-
+    // Picker + Frame-Style + Timestamps; Fonts & Colours vereint Schriften
+    // + Chat-Farben; Data Management vereint Storage + Retention + Cleanup
+    // + Export + DB-Viewer + Advanced.
+    private static readonly (FontAwesomeIcon Icon, string TitleKey, string SubtextKey)[] CardDefs =
+    [
+        (FontAwesomeIcon.SlidersH,        "Settings_Card_General_Title",         "Settings_Card_General_Subtext"),
+        (FontAwesomeIcon.Palette,         "Settings_Card_ThemeAndLayout_Title",  "Settings_Card_ThemeAndLayout_Subtext"),
+        (FontAwesomeIcon.Font,            "Settings_Card_FontsAndColours_Title", "Settings_Card_FontsAndColours_Subtext"),
+        (FontAwesomeIcon.WindowMaximize,  "Settings_Card_Window_Title",          "Settings_Card_Window_Subtext"),
+        (FontAwesomeIcon.Comments,        "Settings_Card_Chat_Title",            "Settings_Card_Chat_Subtext"),
+        (FontAwesomeIcon.FolderTree,      "Settings_Card_Tabs_Title",            "Settings_Card_Tabs_Subtext"),
+        (FontAwesomeIcon.ShieldAlt,       "Settings_Card_Privacy_Title",         "Settings_Card_Privacy_Subtext"),
+        (FontAwesomeIcon.Database,        "Settings_Card_DataManagement_Title",  "Settings_Card_DataManagement_Subtext"),
+        (FontAwesomeIcon.InfoCircle,      "Settings_Card_Information_Title",     "Settings_Card_Information_Subtext"),
+    ];
+
+    public SettingsOverview(SettingsWindow window)
+    {
+        _window = window;
+    }
+
+    public void Draw()
+    {
+        var avail = ImGui.GetContentRegionAvail();
+        var columns = avail.X >= 700f ? 3 : 2;
+        var cardWidth = (avail.X - (columns - 1) * 8f) / columns;
+        // v1.2.1 — Subtexte wrappen jetzt auf zwei Zeilen, daher 110f statt der
+        // v1.1.0-Höhe 96f. Wrap-Breite + Y-Position der Subtext-Zeile sind in
+        // DrawCard auf den Card-Innenrand abgestimmt.
+        var cardHeight = 110f;
+
+        for (var i = 0; i < CardDefs.Length; i++)
+        {
+            var (icon, titleKey, subtextKey) = CardDefs[i];
+            var title = HellionStrings.ResourceManager.GetString(titleKey) ?? titleKey;
+            var subtext = HellionStrings.ResourceManager.GetString(subtextKey) ?? subtextKey;
+            DrawCard(i, icon, title, subtext, cardWidth, cardHeight);
+
+            if ((i + 1) % columns != 0 && i != CardDefs.Length - 1)
+                ImGui.SameLine();
+        }
+    }
+
+    private void DrawCard(int index, FontAwesomeIcon icon, string title, string subtext, float w, float h)
+    {
+        // BeginGroup macht den Card-Bereich zu einem einzelnen ImGui-Layout-Item.
+        // Damit funktioniert SameLine() im Caller-Loop — sonst tracked ImGui die
+        // einzelnen InvisibleButton/Text-Items separat und das Wrapping bricht.
+        ImGui.BeginGroup();
+
+        var cursorBefore = ImGui.GetCursorScreenPos();
+        var clicked = ImGui.InvisibleButton($"##settings-card-{index}", new Vector2(w, h));
+        var hovered = ImGui.IsItemHovered();
+        var bgColor = hovered ? 0xFF22303Fu : 0xFF1A2538u;
+
+        var draw = ImGui.GetWindowDrawList();
+        draw.AddRectFilled(cursorBefore, cursorBefore + new Vector2(w, h), bgColor, 4f);
+
+        // Inhalts-Overlay: Icon + Title via DrawList (kein Wrap nötig). Subtext
+        // läuft über ImGui-Cursor + PushTextWrapPos damit der Text bei
+        // Card-Innenbreite umbricht statt rechts geclippt zu werden.
+        var iconPos = cursorBefore + new Vector2(16f, 12f);
+        var titlePos = cursorBefore + new Vector2(16f, 40f);
+        var subtextPos = cursorBefore + new Vector2(16f, 62f);
+
+        var titleColor = ColourUtil.RgbaToAbgr(0xE6F4F1FFu);
+        var subtextColor = ColourUtil.RgbaToAbgr(0x8FA3B5FFu);
+
+        using (_window.Plugin.FontManager.FontAwesome.Push())
+        {
+            draw.AddText(iconPos, titleColor, icon.ToIconString());
+        }
+
+        draw.AddText(titlePos, titleColor, title);
+
+        // Subtext mit Wrap auf Card-Innenbreite (16 px Padding links + rechts).
+        // Cursor-basiertes TextUnformatted würde die ImGui-Group-Bounds
+        // erweitern und das SameLine-Wrapping in der Card-Reihe brechen, daher
+        // bleibt der Subtext bewusst beim DrawList-Overlay-Pattern.
+        var subtextWrapWidth = w - 32f;
+        draw.AddText(ImGui.GetFont(), ImGui.GetFontSize(), subtextPos, subtextColor, subtext, subtextWrapWidth);
+
+        ImGui.EndGroup();
+
+        if (clicked)
+        {
+            _window.OpenSection(index);
+        }
+    }
+}
@@ -21,6 +21,10 @@ internal sealed class Chat : ISettingsTab
    public string Name => HellionStrings.Settings_Tab_Chat + "###tabs-chat";

    private SearchSelector.SelectorPopupOptions WordPopupOptions;
+    // Snapshot of EmoteCache.State for which we last built WordPopupOptions.
+    // Without this, an empty FilteredSheet (e.g., the user blocked every emote)
+    // would trigger a refill every frame the settings tab is open.
+    private EmoteCache.LoadingState? WordPopupOptionsBuiltFor;

    internal Chat(Plugin plugin, Configuration mutable)
    {
@@ -28,6 +32,7 @@ internal sealed class Chat : ISettingsTab
        Mutable = mutable;

        WordPopupOptions = RefillSheet();
+        WordPopupOptionsBuiltFor = EmoteCache.State;
    }

    private SearchSelector.SelectorPopupOptions RefillSheet()
@@ -84,6 +89,21 @@ internal sealed class Chat : ISettingsTab

            ImGui.Spacing();
            ImGuiUtil.WarningText(HellionStrings.ChatLog_AutoTellTabs_ConflictHint);
+
+            ImGui.Spacing();
+            ImGui.Separator();
+            ImGui.Spacing();
+
+            var preload = Mutable.AutoTellTabsHistoryPreload;
+            ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
+            if (ImGui.SliderInt(HellionStrings.Privacy_AutoTellTabs_Preload_Name, ref preload, 0, 100))
+            {
+                Mutable.AutoTellTabsHistoryPreload = preload;
+            }
+            ImGuiUtil.HelpMarker(HellionStrings.Privacy_AutoTellTabs_Preload_Description);
+
+            ImGui.Spacing();
+            ImGuiUtil.HelpText(HellionStrings.Privacy_AutoTellTabs_Preload_Hint);
        }
    }

@@ -160,9 +180,12 @@ internal sealed class Chat : ISettingsTab
            ImGui.TextUnformatted(Language.Options_Emote_BlockedEmotes);
            ImGui.Spacing();

-            if (EmoteCache.State is EmoteCache.LoadingState.Done && WordPopupOptions.FilteredSheet.Length == 0)
+            if (EmoteCache.State is EmoteCache.LoadingState.Done
+                && WordPopupOptions.FilteredSheet.Length == 0
+                && WordPopupOptionsBuiltFor != EmoteCache.LoadingState.Done)
            {
                WordPopupOptions = RefillSheet();
+                WordPopupOptionsBuiltFor = EmoteCache.LoadingState.Done;
            }

            var buttonWidth = ImGui.GetContentRegionAvail().X / 3;
@@ -0,0 +1,741 @@
+using System.Diagnostics;
+using HellionChat.Code;
+using HellionChat.Export;
+using HellionChat.Privacy;
+using HellionChat.Resources;
+using HellionChat.Util;
+using Dalamud.Game.Text;
+using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.ImGuiNotification;
+using Dalamud.Interface.Utility.Raii;
+using Dalamud.Bindings.ImGui;
+
+namespace HellionChat.Ui.SettingsTabs;
+
+internal sealed class DataManagement : ISettingsTab
+{
+    private Plugin Plugin { get; }
+    private Configuration Mutable { get; }
+
+    public string Name => HellionStrings.Settings_Card_DataManagement_Title + "###tabs-datamanagement";
+
+    // Cleanup state (was in Privacy.cs)
+    private Dictionary<int, long>? CleanupCounts;
+    private long CleanupKeepCount;
+    private long CleanupDeleteCount;
+    private bool CleanupRunning;
+    private bool CleanupPreviewStale;
+    private HashSet<ChatType>? CleanupPreviewSnapshot;
+    private bool RetentionRunning => Plugin.RetentionSweepRunning;
+
+    // Export form state (was in Privacy.cs)
+    private int ExportRangeDays = 30;
+    private string ExportSenderSubstring = string.Empty;
+    private readonly HashSet<ChatType> ExportSelectedChannels = [];
+    private ExportFormat ExportFormat = ExportFormat.Markdown;
+    private bool ExportRunning;
+
+    // DB-Viewer + Advanced state (was in Database.cs)
+    private bool ShowAdvanced;
+    private long DatabaseLastRefreshTicks;
+    private long DatabaseSize;
+    private long DatabaseLogSize;
+    private int DatabaseMessageCount;
+
+    // Channel groupings shared by Cleanup-Breakdown, Retention and Export
+    // sections. Heading is resolved per-frame so a runtime LanguageChanged
+    // call updates the labels immediately. 1:1 from Privacy.cs Groups.
+    private static readonly (Func<string> Heading, ChatType[] Types)[] Groups =
+    [
+        (() => HellionStrings.Privacy_Group_DirectMessages, [ChatType.TellIncoming, ChatType.TellOutgoing]),
+        (() => HellionStrings.Privacy_Group_PartyAlliance, [ChatType.Party, ChatType.CrossParty, ChatType.Alliance, ChatType.PvpTeam]),
+        (() => HellionStrings.Privacy_Group_FreeCompany, [ChatType.FreeCompany, ChatType.FreeCompanyAnnouncement, ChatType.FreeCompanyLoginLogout]),
+        (() => HellionStrings.Privacy_Group_Linkshells, [
+            ChatType.Linkshell1, ChatType.Linkshell2, ChatType.Linkshell3, ChatType.Linkshell4,
+            ChatType.Linkshell5, ChatType.Linkshell6, ChatType.Linkshell7, ChatType.Linkshell8,
+        ]),
+        (() => HellionStrings.Privacy_Group_CrossLinkshells, [
+            ChatType.CrossLinkshell1, ChatType.CrossLinkshell2, ChatType.CrossLinkshell3, ChatType.CrossLinkshell4,
+            ChatType.CrossLinkshell5, ChatType.CrossLinkshell6, ChatType.CrossLinkshell7, ChatType.CrossLinkshell8,
+        ]),
+        (() => HellionStrings.Privacy_Group_ExtraChat, [
+            ChatType.ExtraChatLinkshell1, ChatType.ExtraChatLinkshell2, ChatType.ExtraChatLinkshell3, ChatType.ExtraChatLinkshell4,
+            ChatType.ExtraChatLinkshell5, ChatType.ExtraChatLinkshell6, ChatType.ExtraChatLinkshell7, ChatType.ExtraChatLinkshell8,
+        ]),
+        (() => HellionStrings.Privacy_Group_PublicChat, [ChatType.Say, ChatType.Shout, ChatType.Yell, ChatType.NoviceNetwork, ChatType.CustomEmote, ChatType.StandardEmote]),
+        (() => HellionStrings.Privacy_Group_SystemLogs, [
+            ChatType.System, ChatType.Notice, ChatType.Urgent, ChatType.Echo,
+            ChatType.NpcDialogue, ChatType.NpcAnnouncement,
+            ChatType.LootNotice, ChatType.LootRoll, ChatType.RetainerSale,
+            ChatType.Crafting, ChatType.Gathering, ChatType.Sign, ChatType.RandomNumber,
+        ]),
+    ];
+
+    internal DataManagement(Plugin plugin, Configuration mutable)
+    {
+        Plugin = plugin;
+        Mutable = mutable;
+    }
+
+    public void Draw(bool changed)
+    {
+        // Shift-on-open keeps the Advanced tools available without a permanent
+        // toggle in the UI, mirroring upstream Chat 2 behaviour.
+        if (changed)
+            ShowAdvanced = ImGui.GetIO().KeyShift;
+
+        DrawStorageSection();
+        ImGui.Spacing();
+        DrawRetentionSection();
+        ImGui.Spacing();
+        DrawCleanupSection();
+        ImGui.Spacing();
+        DrawExportSection();
+        ImGui.Spacing();
+        DrawDatabaseViewerSection();
+        ImGui.Spacing();
+        DrawAdvancedSection();
+    }
+
+    private void DrawStorageSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_DataManagement_Storage_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_DatabaseBattleMessages_Name, ref Mutable.DatabaseBattleMessages);
+            ImGuiUtil.HelpMarker(Language.Options_DatabaseBattleMessages_Description);
+
+            if (ImGui.Checkbox(Language.Options_LoadPreviousSession_Name, ref Mutable.LoadPreviousSession))
+                if (Mutable.LoadPreviousSession)
+                    Mutable.FilterIncludePreviousSessions = true;
+            ImGuiUtil.HelpMarker(Language.Options_LoadPreviousSession_Description);
+
+            if (ImGui.Checkbox(Language.Options_FilterIncludePreviousSessions_Name, ref Mutable.FilterIncludePreviousSessions))
+                if (!Mutable.FilterIncludePreviousSessions)
+                    Mutable.LoadPreviousSession = false;
+            ImGuiUtil.HelpMarker(Language.Options_FilterIncludePreviousSessions_Description);
+
+            var old = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat.db"));
+            var migratedOld = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat-litedb.db"));
+            if (old.Exists || migratedOld.Exists)
+            {
+                ImGui.Spacing();
+                ImGui.Separator();
+                ImGui.Spacing();
+
+                ImGui.TextUnformatted(Language.Options_Database_Old_Heading);
+                ImGui.Spacing();
+
+                if (ImGuiUtil.CtrlShiftButton(Language.Options_Database_Old_Delete, Language.Options_Database_Old_Delete_Tooltip))
+                {
+                    try
+                    {
+                        if (old.Exists)
+                            old.Delete();
+                        if (migratedOld.Exists)
+                            migratedOld.Delete();
+                        WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Success, NotificationType.Success);
+                    }
+                    catch (Exception e)
+                    {
+                        Plugin.Log.Error(e, "Unable to delete old database");
+                        WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Error, NotificationType.Error);
+                    }
+                }
+            }
+        }
+    }
+
+    private void DrawRetentionSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_DataManagement_Retention_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGuiUtil.OptionCheckbox(
+                ref Mutable.RetentionEnabled,
+                HellionStrings.Retention_Enabled_Name,
+                HellionStrings.Retention_Enabled_Description);
+
+            using (ImRaii.Disabled(!Mutable.RetentionEnabled))
+            {
+                ImGui.Spacing();
+
+                var defaultDays = Mutable.RetentionDefaultDays;
+                if (ImGui.InputInt(HellionStrings.Retention_Default_Label, ref defaultDays))
+                    Mutable.RetentionDefaultDays = Math.Max(0, defaultDays);
+                ImGuiUtil.HelpMarker(HellionStrings.Retention_Default_Help);
+
+                ImGui.Spacing();
+
+                if (ImGui.Button(HellionStrings.Retention_Reset_Spec))
+                {
+                    Mutable.RetentionPerChannelDays =
+                        PrivacyDefaults.DefaultRetentionDays.ToDictionary(p => p.Key, p => p.Value);
+                }
+                ImGui.SameLine();
+                if (ImGui.Button(HellionStrings.Retention_Clear_Overrides))
+                    Mutable.RetentionPerChannelDays.Clear();
+
+                ImGui.Spacing();
+
+                using (var perChannelTree = ImRaii.TreeNode(HellionStrings.Retention_Tree_Heading))
+                {
+                    if (perChannelTree.Success)
+                    {
+                        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+                        foreach (var (heading, types) in Groups)
+                        {
+                            using var subTree = ImRaii.TreeNode(heading());
+                            if (!subTree.Success)
+                                continue;
+
+                            using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+                            foreach (var type in types)
+                            {
+                                var hasOverride = Mutable.RetentionPerChannelDays.TryGetValue(type, out var days);
+                                var hasSpecDefault = PrivacyDefaults.DefaultRetentionDays.TryGetValue(type, out var specDays);
+                                if (!hasOverride)
+                                    days = hasSpecDefault ? specDays : Mutable.RetentionDefaultDays;
+
+                                var tag = hasOverride
+                                    ? HellionStrings.Retention_Tag_Override
+                                    : hasSpecDefault
+                                        ? HellionStrings.Retention_Tag_Spec
+                                        : HellionStrings.Retention_Tag_Global;
+                                if (ImGui.InputInt($"{type} {tag}##retention-{(int)type}", ref days))
+                                {
+                                    days = Math.Max(0, days);
+                                    Mutable.RetentionPerChannelDays[type] = days;
+                                }
+
+                                if (hasOverride)
+                                {
+                                    ImGui.SameLine();
+                                    if (ImGui.Button($"{HellionStrings.Retention_Reset_Button}##retention-reset-{(int)type}"))
+                                        Mutable.RetentionPerChannelDays.Remove(type);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                ImGui.Spacing();
+
+                ImGuiUtil.HelpText(HellionStrings.Retention_Help_SavedNote);
+                ImGui.Spacing();
+
+                using (ImRaii.Disabled(RetentionRunning))
+                {
+                    if (ImGuiUtil.CtrlShiftButton(HellionStrings.Retention_Apply_Label, HellionStrings.Retention_Apply_Tooltip))
+                        StartRetentionRun();
+                }
+
+                if (RetentionRunning)
+                    ImGuiUtil.HelpText(HellionStrings.Retention_Running);
+
+                ImGui.Spacing();
+                var lastRun = Plugin.Config.RetentionLastRunAt;
+                ImGuiUtil.HelpText(lastRun == DateTimeOffset.MinValue
+                    ? HellionStrings.Retention_LastRun_Never
+                    : string.Format(HellionStrings.Retention_LastRun_At, lastRun.ToLocalTime()));
+            }
+        }
+    }
+
+    private void StartRetentionRun()
+    {
+        lock (Plugin.RetentionSweepLock)
+        {
+            if (Plugin.RetentionSweepRunning)
+                return;
+            Plugin.RetentionSweepRunning = true;
+        }
+
+        var policy = Plugin.Config.RetentionPerChannelDays.ToDictionary(p => (int)(ushort)p.Key, p => p.Value);
+        var defaultDays = Plugin.Config.RetentionDefaultDays;
+
+        new Thread(() =>
+        {
+            try
+            {
+                var deleted = Plugin.MessageManager.Store.DeleteByRetentionPolicy(policy, defaultDays);
+                Plugin.Config.RetentionLastRunAt = DateTimeOffset.UtcNow;
+                Plugin.SaveConfig();
+
+                Plugin.Log.Information($"Manual retention run deleted {deleted} expired messages.");
+
+                if (deleted > 0)
+                {
+                    if (!Plugin.Framework.Run(() =>
+                        {
+                            Plugin.MessageManager.ClearAllTabs();
+                            Plugin.MessageManager.FilterAllTabsAsync();
+                        }).Wait(TimeSpan.FromSeconds(5)))
+                    {
+                        Plugin.Log.Warning("Retention sweep: framework refresh timed out after 5s.");
+                    }
+                }
+
+                WrapperUtil.AddNotification(string.Format(HellionStrings.Retention_Success, deleted), NotificationType.Success);
+            }
+            catch (Exception e)
+            {
+                Plugin.Log.Error(e, "Manual retention run failed");
+                WrapperUtil.AddNotification(HellionStrings.Retention_Error, NotificationType.Error);
+            }
+            finally
+            {
+                lock (Plugin.RetentionSweepLock)
+                    Plugin.RetentionSweepRunning = false;
+            }
+        }) { IsBackground = true }.Start();
+    }
+
+    private void DrawCleanupSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_DataManagement_Cleanup_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGuiUtil.HelpText(HellionStrings.Cleanup_Help_Intro);
+            ImGuiUtil.HelpText(HellionStrings.Cleanup_Help_SavedNote);
+
+            ImGui.Spacing();
+
+            if (CleanupPreviewSnapshot is not null
+                && !CleanupPreviewSnapshot.SetEquals(Mutable.PrivacyPersistChannels))
+            {
+                CleanupPreviewStale = true;
+            }
+
+            using (var emphasis = CleanupPreviewStale
+                       ? ImRaii.PushColor(ImGuiCol.Button, ImGuiColors.HealerGreen with { W = 0.6f })
+                       : null)
+            using (ImRaii.Disabled(CleanupRunning))
+            {
+                if (ImGui.Button(HellionStrings.Cleanup_RefreshPreview))
+                    RefreshCleanupPreview();
+            }
+
+            if (CleanupCounts is null)
+            {
+                ImGuiUtil.HelpText(HellionStrings.Cleanup_NoPreview);
+                return;
+            }
+
+            if (CleanupPreviewStale)
+            {
+                ImGui.Spacing();
+                ImGuiUtil.HelpText(HellionStrings.Cleanup_Preview_Stale);
+            }
+
+            ImGui.Spacing();
+
+            using (var staleColor = CleanupPreviewStale
+                       ? ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudGrey)
+                       : null)
+            {
+                ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_TotalStored, CleanupKeepCount + CleanupDeleteCount));
+                ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_WillKeep, CleanupKeepCount));
+                ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_WillDelete, CleanupDeleteCount));
+            }
+
+            using (var breakdownTree = ImRaii.TreeNode(HellionStrings.Cleanup_Breakdown))
+            {
+                if (breakdownTree.Success)
+                {
+                    using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+                    foreach (var (chatType, count) in CleanupCounts.OrderByDescending(p => p.Value))
+                    {
+                        var name = Enum.IsDefined(typeof(ChatType), (ushort)chatType)
+                            ? ((ChatType)(ushort)chatType).ToString()
+                            : $"Unknown({chatType})";
+                        var keeps = WouldBeKept(chatType);
+                        var marker = keeps ? HellionStrings.Cleanup_Marker_Keep : HellionStrings.Cleanup_Marker_Delete;
+                        ImGuiUtil.HelpText($"{marker} {name} — {count:N0}");
+                    }
+                }
+            }
+
+            ImGui.Spacing();
+
+            using (ImRaii.Disabled(CleanupRunning || CleanupDeleteCount == 0))
+            {
+                if (ImGuiUtil.CtrlShiftButton(HellionStrings.Cleanup_Apply_Label,
+                        string.Format(HellionStrings.Cleanup_Apply_Tooltip, CleanupDeleteCount)))
+                    StartCleanup();
+            }
+
+            if (CleanupRunning)
+                ImGuiUtil.HelpText(HellionStrings.Cleanup_Running);
+        }
+    }
+
+    private bool WouldBeKept(int chatType)
+    {
+        if (!Plugin.Config.PrivacyFilterEnabled)
+            return true;
+        if (Plugin.Config.PrivacyPersistChannels.Contains((ChatType)(ushort)chatType))
+            return true;
+        return Plugin.Config.PrivacyPersistUnknownChannels;
+    }
+
+    private void RefreshCleanupPreview()
+    {
+        try
+        {
+            CleanupCounts = Plugin.MessageManager.Store.GetMessageCountsByChatType();
+            CleanupKeepCount = 0;
+            CleanupDeleteCount = 0;
+            foreach (var (chatType, count) in CleanupCounts)
+            {
+                if (WouldBeKept(chatType))
+                    CleanupKeepCount += count;
+                else
+                    CleanupDeleteCount += count;
+            }
+
+            CleanupPreviewSnapshot = new HashSet<ChatType>(Mutable.PrivacyPersistChannels);
+            CleanupPreviewStale = false;
+        }
+        catch (Exception e)
+        {
+            Plugin.Log.Error(e, "Failed to compute cleanup preview");
+            WrapperUtil.AddNotification(HellionStrings.Cleanup_PreviewError, NotificationType.Error);
+        }
+    }
+
+    private void StartCleanup()
+    {
+        if (CleanupRunning)
+            return;
+
+        CleanupRunning = true;
+        var allowed = Plugin.Config.PrivacyPersistChannels.Select(t => (int)(ushort)t).ToList();
+
+        var thread = new Thread(() =>
+        {
+            try
+            {
+                var deleted = Plugin.MessageManager.Store.CleanupRetainOnly(allowed);
+                Plugin.Log.Information($"Privacy cleanup: deleted {deleted} messages");
+
+                if (!Plugin.Framework.Run(() =>
+                    {
+                        Plugin.MessageManager.ClearAllTabs();
+                        Plugin.MessageManager.FilterAllTabs();
+                    }).Wait(TimeSpan.FromSeconds(5)))
+                {
+                    Plugin.Log.Warning("Privacy cleanup: framework refresh timed out after 5s.");
+                }
+
+                WrapperUtil.AddNotification(string.Format(HellionStrings.Cleanup_Success, deleted), NotificationType.Success);
+            }
+            catch (Exception e)
+            {
+                Plugin.Log.Error(e, "Privacy cleanup failed");
+                WrapperUtil.AddNotification(HellionStrings.Cleanup_Error, NotificationType.Error);
+            }
+            finally
+            {
+                CleanupRunning = false;
+                CleanupCounts = null;
+            }
+        });
+        thread.IsBackground = true;
+        thread.Start();
+    }
+
+    private void DrawExportSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_DataManagement_Export_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGuiUtil.HelpText(HellionStrings.Export_Help);
+
+            ImGui.Spacing();
+
+            if (ImGui.InputInt(HellionStrings.Export_Range_Label, ref ExportRangeDays))
+                ExportRangeDays = Math.Max(0, ExportRangeDays);
+
+            ImGui.InputText(HellionStrings.Export_Sender_Label, ref ExportSenderSubstring, 256);
+
+            using (var channelsTree = ImRaii.TreeNode(HellionStrings.Export_Channels_Heading))
+            {
+                if (channelsTree.Success)
+                {
+                    using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+                    {
+                        ImGuiUtil.HelpText(HellionStrings.Export_Channels_AllOff);
+                        foreach (var (heading, types) in Groups)
+                        {
+                            using var subTree = ImRaii.TreeNode($"{heading()}##export-group-{heading()}");
+                            if (!subTree.Success)
+                                continue;
+
+                            using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+                            foreach (var type in types)
+                            {
+                                var enabled = ExportSelectedChannels.Contains(type);
+                                if (ImGui.Checkbox($"{type}##export-{(int)type}", ref enabled))
+                                {
+                                    if (enabled)
+                                        ExportSelectedChannels.Add(type);
+                                    else
+                                        ExportSelectedChannels.Remove(type);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            ImGui.Spacing();
+            ImGui.TextUnformatted(HellionStrings.Export_Format_Label);
+            ImGui.SameLine();
+            var fmt = (int)ExportFormat;
+            if (ImGui.RadioButton(HellionStrings.Export_Format_Markdown, ref fmt, (int)ExportFormat.Markdown))
+                ExportFormat = ExportFormat.Markdown;
+            ImGui.SameLine();
+            if (ImGui.RadioButton(HellionStrings.Export_Format_Json, ref fmt, (int)ExportFormat.Json))
+                ExportFormat = ExportFormat.Json;
+            ImGui.SameLine();
+            if (ImGui.RadioButton(HellionStrings.Export_Format_Csv, ref fmt, (int)ExportFormat.Csv))
+                ExportFormat = ExportFormat.Csv;
+
+            ImGui.Spacing();
+
+            using (ImRaii.Disabled(ExportRunning))
+            {
+                if (ImGui.Button(HellionStrings.Export_Button))
+                    PromptExport();
+            }
+
+            if (ExportRunning)
+                ImGuiUtil.HelpText(HellionStrings.Export_Running);
+        }
+    }
+
+    private void PromptExport()
+    {
+        var defaultName = $"hellion-chat-export-{DateTimeOffset.Now:yyyyMMdd-HHmm}";
+        var ext = ExportFormat.Extension();
+
+        Plugin.FileDialogManager.SaveFileDialog(
+            HellionStrings.Export_Dialog_Title,
+            ExportFormat.Filter(),
+            defaultName,
+            ext,
+            (success, path) =>
+            {
+                if (!success || string.IsNullOrWhiteSpace(path))
+                    return;
+                StartExport(path);
+            });
+    }
+
+    private void StartExport(string path)
+    {
+        if (ExportRunning)
+            return;
+        ExportRunning = true;
+
+        var types = ExportSelectedChannels.Count > 0
+            ? ExportSelectedChannels.Select(t => (int)(ushort)t).ToList()
+            : null;
+
+        DateTimeOffset? from = ExportRangeDays > 0
+            ? DateTimeOffset.UtcNow.AddDays(-ExportRangeDays)
+            : null;
+
+        var senderSubstring = string.IsNullOrWhiteSpace(ExportSenderSubstring) ? null : ExportSenderSubstring.Trim();
+        var format = ExportFormat;
+        var filterDesc = new MessageExporter.FilterDescription(types, from, null, senderSubstring);
+
+        new Thread(() =>
+        {
+            try
+            {
+                using var enumerator = Plugin.MessageManager.Store.StreamForExport(types, from, null);
+                var written = MessageExporter.ExportToFile(path, format, enumerator, filterDesc);
+
+                if (written > 0)
+                    WrapperUtil.AddNotification(string.Format(HellionStrings.Export_Success, written, path), NotificationType.Success);
+                else
+                    WrapperUtil.AddNotification(HellionStrings.Export_Empty, NotificationType.Info);
+            }
+            catch (Exception e)
+            {
+                Plugin.Log.Error(e, "Export failed");
+                WrapperUtil.AddNotification(HellionStrings.Export_Error, NotificationType.Error);
+            }
+            finally
+            {
+                ExportRunning = false;
+            }
+        }) { IsBackground = true }.Start();
+    }
+
+    private void DrawDatabaseViewerSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_DataManagement_DbViewer_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            if (DatabaseLastRefreshTicks + 5 * 1000 < Environment.TickCount64)
+            {
+                DatabaseSize = Plugin.MessageManager.Store.DatabaseSize();
+                DatabaseLogSize = Plugin.MessageManager.Store.DatabaseLogSize();
+                DatabaseMessageCount = Plugin.MessageManager.Store.MessageCount();
+                DatabaseLastRefreshTicks = Environment.TickCount64;
+            }
+
+            ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_Path, MessageManager.DatabasePath()));
+            if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
+            {
+                var path = Path.GetDirectoryName(MessageManager.DatabasePath());
+                ImGui.SetClipboardText(path);
+                WrapperUtil.AddNotification(Language.Options_Database_Metadata_CopyConfigPathNotification, NotificationType.Info);
+            }
+
+            if (ImGui.IsItemHovered())
+            {
+                ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
+                ImGuiUtil.Tooltip(Language.Options_Database_Metadata_CopyConfigPath);
+            }
+
+            ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_Size, StringUtil.BytesToString(DatabaseSize)));
+            if (ImGui.IsItemHovered())
+                ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseSize));
+
+            ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_LogSize, StringUtil.BytesToString(DatabaseLogSize)));
+            if (ImGui.IsItemHovered())
+                ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseLogSize));
+
+            ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_MessageCount, DatabaseMessageCount));
+
+            if (ImGuiUtil.CtrlShiftButton(Language.Options_ClearDatabase_Button, Language.Options_ClearDatabase_Tooltip))
+            {
+                Plugin.Log.Warning("Clearing messages from database");
+                Plugin.MessageManager.Store.ClearMessages();
+                Plugin.MessageManager.ClearAllTabs();
+
+                DatabaseLastRefreshTicks = 0;
+                WrapperUtil.AddNotification(Language.Options_ClearDatabase_Success, NotificationType.Info);
+            }
+        }
+    }
+
+    private void DrawAdvancedSection()
+    {
+        if (!ShowAdvanced)
+            return;
+
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_DataManagement_Advanced_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            using var wrap = ImRaii.TextWrapPos(0.0f);
+
+            ImGuiUtil.WarningText(Language.Options_Database_Advanced_Warning);
+            if (ImGuiUtil.CtrlShiftButton("Perform maintenance", "Ctrl+Shift: MessageManager.Store.PerformMaintenance()"))
+                Plugin.MessageManager.Store.PerformMaintenance();
+
+            if (ImGuiUtil.CtrlShiftButton("Reload messages from database", "Ctrl+Shift: MessageManager.FilterAllTabs()"))
+            {
+                Plugin.MessageManager.ClearAllTabs();
+                Plugin.MessageManager.FilterAllTabsAsync();
+            }
+
+            if (ImGuiUtil.CtrlShiftButton("Inject 10,000 messages", "Ctrl+Shift: creates 10,000 unique messages (async)"))
+                new Thread(() => InsertMessages(10_000)).Start();
+        }
+    }
+
+    private void InsertMessages(int count)
+    {
+        Plugin.Log.Info($"Inserting {count} messages due to user request");
+
+        var stopwatch = Stopwatch.StartNew();
+        var playerName = Plugin.PlayerState.CharacterName;
+        var worldId = Plugin.PlayerState.HomeWorld.ValueNullable?.RowId ?? 0;
+        var senderSource = new SeStringBuilder()
+            .AddText("<")
+            .Add(new PlayerPayload(playerName, worldId))
+            .AddText("Random Message")
+            .Add(RawPayload.LinkTerminator)
+            .AddText(">: ")
+            .Build();
+        var senderChunks = ChunkUtil.ToChunks(senderSource, ChunkSource.Sender, ChatType.Debug).ToList();
+        var messages = new List<Message>(count);
+        for (var i = 0; i < count; i++)
+        {
+            var contentSource = new SeStringBuilder()
+                .AddText("Random message payload - ")
+                .AddItalics(Guid.NewGuid().ToString())
+                .Build();
+            var contentChunks = ChunkUtil.ToChunks(contentSource, ChunkSource.Content, ChatType.Debug).ToList();
+
+            var chatCode = new ChatCode(XivChatType.Say, 0, 0);
+            messages.Add(new Message(
+                Guid.NewGuid(),
+                Plugin.MessageManager.CurrentContentId,
+                Plugin.MessageManager.CurrentContentId,
+                DateTimeOffset.UtcNow,
+                chatCode,
+                senderChunks,
+                contentChunks,
+                senderSource,
+                contentSource,
+                Guid.Empty
+            ));
+        }
+
+        var elapsedTicks = stopwatch.ElapsedTicks;
+        stopwatch.Stop();
+        Plugin.Log.Info($"Crafted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)");
+
+        stopwatch = Stopwatch.StartNew();
+        foreach (var message in messages)
+            Plugin.MessageManager.Store.UpsertMessage(message);
+
+        elapsedTicks = stopwatch.ElapsedTicks;
+        stopwatch.Stop();
+        Plugin.Log.Info($"Upserted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)");
+
+        Plugin.Framework.Run(() =>
+        {
+            stopwatch = Stopwatch.StartNew();
+            Plugin.MessageManager.ClearAllTabs();
+            elapsedTicks = stopwatch.ElapsedTicks;
+            stopwatch.Stop();
+            Plugin.Log.Info($"Cleared {Plugin.Config.Tabs.Count} tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)");
+        }).Wait();
+
+        Plugin.Framework.Run(() =>
+        {
+            stopwatch = Stopwatch.StartNew();
+            Plugin.MessageManager.FilterAllTabs();
+            elapsedTicks = stopwatch.ElapsedTicks;
+            stopwatch.Stop();
+            Plugin.Log.Info($"Fetched and filtered all tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)");
+        }).Wait();
+    }
+}
@@ -1,259 +0,0 @@
-using System.Diagnostics;
-using HellionChat.Code;
-using HellionChat.Resources;
-using HellionChat.Util;
-using Dalamud.Game.Text.SeStringHandling;
-using Dalamud.Game.Text.SeStringHandling.Payloads;
-using Dalamud.Interface.ImGuiNotification;
-using Dalamud.Interface.Utility.Raii;
-using Dalamud.Bindings.ImGui;
-using Dalamud.Game.Text;
-
-namespace HellionChat.Ui.SettingsTabs;
-
-internal sealed class Database : ISettingsTab
-{
-    private Plugin Plugin { get; }
-    private Configuration Mutable { get; }
-
-    public string Name => HellionStrings.Settings_Tab_Database + "###tabs-database";
-
-    internal Database(Plugin plugin, Configuration mutable)
-    {
-        Plugin = plugin;
-        Mutable = mutable;
-    }
-
-    private bool ShowAdvanced;
-
-    private long DatabaseLastRefreshTicks;
-    private long DatabaseSize;
-    private long DatabaseLogSize;
-    private int DatabaseMessageCount;
-
-    public void Draw(bool changed)
-    {
-        // Shift-on-open keeps the Advanced tools available without a permanent
-        // toggle in the UI, mirroring upstream Chat 2 behaviour.
-        if (changed)
-            ShowAdvanced = ImGui.GetIO().KeyShift;
-
-        DrawStorageSection();
-        ImGui.Spacing();
-        DrawViewerSection();
-        ImGui.Spacing();
-        DrawStatsSection();
-    }
-
-    private void DrawStorageSection()
-    {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Database_Storage_Heading);
-        if (!tree.Success)
-            return;
-
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            ImGui.Checkbox(Language.Options_DatabaseBattleMessages_Name, ref Mutable.DatabaseBattleMessages);
-            ImGuiUtil.HelpMarker(Language.Options_DatabaseBattleMessages_Description);
-
-            if (ImGui.Checkbox(Language.Options_LoadPreviousSession_Name, ref Mutable.LoadPreviousSession))
-                if (Mutable.LoadPreviousSession)
-                    Mutable.FilterIncludePreviousSessions = true;
-            ImGuiUtil.HelpMarker(Language.Options_LoadPreviousSession_Description);
-
-            if (ImGui.Checkbox(Language.Options_FilterIncludePreviousSessions_Name, ref Mutable.FilterIncludePreviousSessions))
-                if (!Mutable.FilterIncludePreviousSessions)
-                    Mutable.LoadPreviousSession = false;
-            ImGuiUtil.HelpMarker(Language.Options_FilterIncludePreviousSessions_Description);
-
-            var old = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat.db"));
-            var migratedOld = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat-litedb.db"));
-            if (old.Exists || migratedOld.Exists)
-            {
-                ImGui.Spacing();
-                ImGui.Separator();
-                ImGui.Spacing();
-
-                ImGui.TextUnformatted(Language.Options_Database_Old_Heading);
-                ImGui.Spacing();
-
-                if (ImGuiUtil.CtrlShiftButton(Language.Options_Database_Old_Delete, Language.Options_Database_Old_Delete_Tooltip))
-                {
-                    try
-                    {
-                        if (old.Exists)
-                            old.Delete();
-                        else
-                            migratedOld.Delete();
-                        WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Success, NotificationType.Success);
-                    }
-                    catch (Exception e)
-                    {
-                        Plugin.Log.Error(e, "Unable to delete old database");
-                        WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Error, NotificationType.Error);
-                    }
-                }
-            }
-        }
-    }
-
-    private void DrawViewerSection()
-    {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Database_Viewer_Heading);
-        if (!tree.Success)
-            return;
-
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            // Refresh the database size and message count every 5 seconds to avoid
-            // constant stat calls and spamming the database.
-            if (DatabaseLastRefreshTicks + 5 * 1000 < Environment.TickCount64)
-            {
-                DatabaseSize = Plugin.MessageManager.Store.DatabaseSize();
-                DatabaseLogSize = Plugin.MessageManager.Store.DatabaseLogSize();
-                DatabaseMessageCount = Plugin.MessageManager.Store.MessageCount();
-                DatabaseLastRefreshTicks = Environment.TickCount64;
-            }
-
-            // Copy the directory path instead of the file path so people can
-            // paste it into their file explorer.
-            ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_Path, MessageManager.DatabasePath()));
-            if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
-            {
-                var path = Path.GetDirectoryName(MessageManager.DatabasePath());
-                ImGui.SetClipboardText(path);
-                WrapperUtil.AddNotification(Language.Options_Database_Metadata_CopyConfigPathNotification, NotificationType.Info);
-            }
-
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
-                ImGuiUtil.Tooltip(Language.Options_Database_Metadata_CopyConfigPath);
-            }
-
-            ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_Size, StringUtil.BytesToString(DatabaseSize)));
-            if (ImGui.IsItemHovered())
-                ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseSize));
-
-            ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_LogSize, StringUtil.BytesToString(DatabaseLogSize)));
-            if (ImGui.IsItemHovered())
-                ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseLogSize));
-
-            ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_MessageCount, DatabaseMessageCount));
-
-            if (ImGuiUtil.CtrlShiftButton(Language.Options_ClearDatabase_Button, Language.Options_ClearDatabase_Tooltip))
-            {
-                Plugin.Log.Warning("Clearing messages from database");
-                Plugin.MessageManager.Store.ClearMessages();
-                Plugin.MessageManager.ClearAllTabs();
-
-                // Refresh on next draw
-                DatabaseLastRefreshTicks = 0;
-                WrapperUtil.AddNotification(Language.Options_ClearDatabase_Success, NotificationType.Info);
-            }
-        }
-    }
-
-    private void DrawStatsSection()
-    {
-        if (!ShowAdvanced)
-            return;
-
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Database_Stats_Heading);
-        if (!tree.Success)
-            return;
-
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            using var wrap = ImRaii.TextWrapPos(0.0f);
-
-            ImGuiUtil.WarningText(Language.Options_Database_Advanced_Warning);
-            if (ImGuiUtil.CtrlShiftButton("Perform maintenance", "Ctrl+Shift: MessageManager.Store.PerformMaintenance()"))
-                Plugin.MessageManager.Store.PerformMaintenance();
-
-            if (ImGuiUtil.CtrlShiftButton("Reload messages from database", "Ctrl+Shift: MessageManager.FilterAllTabs()"))
-            {
-                Plugin.MessageManager.ClearAllTabs();
-                Plugin.MessageManager.FilterAllTabsAsync();
-            }
-
-            if (ImGuiUtil.CtrlShiftButton("Inject 10,000 messages", "Ctrl+Shift: creates 10,000 unique messages (async)"))
-                new Thread(() => InsertMessages(10_000)).Start();
-        }
-    }
-
-    private void InsertMessages(int count)
-    {
-        Plugin.Log.Info($"Inserting {count} messages due to user request");
-
-        // Generate
-        var stopwatch = Stopwatch.StartNew();
-        var playerName = Plugin.PlayerState.CharacterName;
-        var worldId = Plugin.PlayerState.HomeWorld.ValueNullable?.RowId ?? 0;
-        var senderSource = new SeStringBuilder()
-            .AddText("<")
-            .Add(new PlayerPayload(playerName, worldId))
-            .AddText("Random Message")
-            .Add(RawPayload.LinkTerminator)
-            .AddText(">: ")
-            .Build();
-        var senderChunks = ChunkUtil.ToChunks(senderSource, ChunkSource.Sender, ChatType.Debug).ToList();
-        var messages = new List<Message>(count);
-        for (var i = 0; i < count; i++)
-        {
-            var contentSource = new SeStringBuilder()
-                .AddText("Random message payload - ")
-                .AddItalics(Guid.NewGuid().ToString())
-                .Build();
-            var contentChunks = ChunkUtil.ToChunks(contentSource, ChunkSource.Content, ChatType.Debug).ToList();
-
-            var chatCode = new ChatCode(XivChatType.Say, 0, 0);
-            messages.Add(new Message(
-                Guid.NewGuid(),
-                Plugin.MessageManager.CurrentContentId,
-                Plugin.MessageManager.CurrentContentId,
-                DateTimeOffset.UtcNow,
-                chatCode,
-                senderChunks,
-                contentChunks,
-                senderSource,
-                contentSource,
-                Guid.Empty
-            ));
-        }
-
-        var elapsedTicks = stopwatch.ElapsedTicks;
-        stopwatch.Stop();
-        Plugin.Log.Info($"Crafted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)");
-
-        // Insert
-        stopwatch = Stopwatch.StartNew();
-        foreach (var message in messages)
-            Plugin.MessageManager.Store.UpsertMessage(message);
-
-        elapsedTicks = stopwatch.ElapsedTicks;
-        stopwatch.Stop();
-        Plugin.Log.Info($"Upserted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)");
-
-        // Clear tabs during framework frame
-        Plugin.Framework.Run(() =>
-        {
-            stopwatch = Stopwatch.StartNew();
-            Plugin.MessageManager.ClearAllTabs();
-            elapsedTicks = stopwatch.ElapsedTicks;
-            stopwatch.Stop();
-            Plugin.Log.Info($"Cleared {Plugin.Config.Tabs.Count} tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)");
-        }).Wait();
-
-        // Fetch and filter during framework frame
-        Plugin.Framework.Run(() =>
-        {
-            stopwatch = Stopwatch.StartNew();
-            // Intentionally synchronous
-            Plugin.MessageManager.FilterAllTabs();
-            elapsedTicks = stopwatch.ElapsedTicks;
-            stopwatch.Stop();
-            Plugin.Log.Info($"Fetched and filtered all tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)");
-        }).Wait();
-    }
-}
@@ -4,21 +4,20 @@ using HellionChat.Util;
 using Dalamud;
 using Dalamud.Interface;
 using Dalamud.Interface.FontIdentifier;
-using Dalamud.Interface.Style;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Bindings.ImGui;

 namespace HellionChat.Ui.SettingsTabs;

-internal sealed class Appearance : ISettingsTab
+internal sealed class FontsAndColours : ISettingsTab
 {
    private Plugin Plugin { get; }
    private Configuration Mutable { get; }

-    public string Name => HellionStrings.Settings_Tab_Appearance + "###tabs-appearance";
+    public string Name => HellionStrings.Settings_Card_FontsAndColours_Title + "###tabs-fontsandcolours";

-    internal Appearance(Plugin plugin, Configuration mutable)
+    internal FontsAndColours(Plugin plugin, Configuration mutable)
    {
        Plugin = plugin;
        Mutable = mutable;
@@ -26,112 +25,38 @@ internal sealed class Appearance : ISettingsTab

    public void Draw(bool changed)
    {
-        DrawThemeSection();
-        ImGui.Spacing();
        DrawFontsSection();
        ImGui.Spacing();
        DrawColoursSection();
-        ImGui.Spacing();
-        DrawTimestampsSection();
-    }
-
-    private void DrawThemeSection()
-    {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Appearance_Theme_Heading);
-        if (!tree.Success)
-        {
-            return;
-        }
-
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            ImGui.Checkbox(HellionStrings.Theme_Enabled_Name, ref Mutable.HellionThemeEnabled);
-            ImGuiUtil.HelpMarker(HellionStrings.Theme_Enabled_Description);
-
-            // Clamp 0.5–1.0 stays consistent with Privacy.cs which already
-            // shipped this slider; lower values would let chat windows
-            // disappear behind game UI.
-            using (ImRaii.Disabled(!Mutable.HellionThemeEnabled))
-            {
-                ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
-                var opacity = Mutable.HellionThemeWindowOpacity;
-                if (ImGui.SliderFloat($"{HellionStrings.Theme_WindowOpacity_Label}##theme-opacity", ref opacity, 0.5f, 1.0f, "%.2f"))
-                {
-                    Mutable.HellionThemeWindowOpacity = Math.Clamp(opacity, 0.5f, 1.0f);
-                }
-                ImGuiUtil.HelpMarker(HellionStrings.Theme_WindowOpacity_Help);
-            }
-
-            ImGui.Spacing();
-
-            ImGui.Checkbox(Language.Options_OverrideStyle_Name, ref Mutable.OverrideStyle);
-            ImGuiUtil.HelpMarker(Language.Options_OverrideStyle_Name_Desc);
-
-            if (Mutable.OverrideStyle)
-            {
-                DrawStyleCombo();
-            }
-
-            // The Bestand-Slider WindowAlpha targets the chat log window's
-            // background only. The Hellion theme opacity above already covers
-            // every plugin window globally, so the two sliders fight each
-            // other when the theme is active. Disable the legacy slider in
-            // that case to make Hellion theme the single source of truth.
-            using (ImRaii.Disabled(Mutable.HellionThemeEnabled))
-            {
-                ImGuiUtil.DragFloatVertical(Language.Options_WindowOpacity_Name, ref Mutable.WindowAlpha, .25f, 0f, 100f, $"{Mutable.WindowAlpha:N2}%%", ImGuiSliderFlags.AlwaysClamp);
-            }
-        }
-    }
-
-    private void DrawStyleCombo()
-    {
-        var styles = StyleModel.GetConfiguredStyles();
-        if (styles == null)
-        {
-            ImGui.TextUnformatted(Language.Options_OverrideStyle_NotAvailable);
-            return;
-        }
-
-        var currentStyle = Mutable.ChosenStyle ?? Language.Options_OverrideStyle_NotSelected;
-        using var combo = ImRaii.Combo(Language.Options_OverrideStyleDropdown_Name, currentStyle);
-        if (!combo)
-        {
-            return;
-        }
-
-        foreach (var style in styles)
-        {
-            if (ImGui.Selectable(style.Name, Mutable.ChosenStyle == style.Name))
-            {
-                Mutable.ChosenStyle = style.Name;
-            }
-        }
    }

    private void DrawFontsSection()
    {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Appearance_Fonts_Heading);
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_FontsAndColours_Fonts_Heading);
        if (!tree.Success)
-        {
            return;
-        }

        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
        {
            if (ImGui.Checkbox(HellionStrings.Theme_UseHellionFont_Name, ref Mutable.UseHellionFont))
            {
-                // Mutex with the Bestand custom-font stack. Leaving FontsEnabled
-                // checked alongside UseHellionFont made both checkboxes look
-                // active even though the lower stack was greyed out, which
-                // confused the user during the v0.5.0 walkthrough.
                if (Mutable.UseHellionFont)
                    Mutable.FontsEnabled = false;
            }
            ImGuiUtil.HelpMarker(HellionStrings.Theme_UseHellionFont_Description);
            ImGui.Spacing();

-            using var fontDisabled = ImRaii.Disabled(Mutable.UseHellionFont);
+            if (Mutable.UseHellionFont)
+            {
+                ImGuiUtil.FontSizeCombo(Language.Options_FontSize_Name, ref Mutable.FontSizeV2);
+                ImGui.Spacing();
+
+                ImGuiUtil.FontSizeCombo(Language.Options_SymbolsFontSize_Name, ref Mutable.SymbolsFontSizeV2);
+                ImGuiUtil.HelpMarker(Language.Options_SymbolsFontSize_Description);
+
+                ImGui.Spacing();
+                return;
+            }

            ImGui.Checkbox(Language.Options_FontsEnabled, ref Mutable.FontsEnabled);
            ImGui.Spacing();
@@ -161,7 +86,6 @@ internal sealed class Appearance : ISettingsTab
                ImGuiUtil.WarningText(Language.Options_Font_Warning);
                ImGui.Spacing();

-                // LocaleNames being null means it is likely a game font which all support JP symbols.
                var japaneseChooser = ImGuiUtil.FontChooser(Language.Options_JapaneseFont_Name, Mutable.JapaneseFontV2, false, ref unused, id => !id.LocaleNames?.ContainsKey("ja-jp") ?? false, "いろはにほへと   ちりぬるを");
                japaneseChooser?.ResultTask.ContinueWith(r =>
                {
@@ -222,11 +146,9 @@ internal sealed class Appearance : ISettingsTab

    private void DrawColoursSection()
    {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Appearance_Colours_Heading);
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_FontsAndColours_Colours_Heading);
        if (!tree.Success)
-        {
            return;
-        }

        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
        {
@@ -273,9 +195,6 @@ internal sealed class Appearance : ISettingsTab
        }
    }

-    // Hellion Chat — v0.6.0 preset-buttons row above the per-channel colour
-    // editors. Apply is immediate and overwrites every channel covered by
-    // the preset; channels not in the preset keep their current colour.
    private void DrawColourPresetButtons()
    {
        var first = true;
@@ -289,7 +208,6 @@ internal sealed class Appearance : ISettingsTab

            if (preset.IsBrandPreset)
            {
-                // Hellion-Brand visuell hervorheben — blau-violetter Frame-Akzent
                var border = ColourUtil.RgbaToVector3(ColourUtil.ComponentsToRgba(255, 128, 200));
                var btn = ColourUtil.RgbaToVector3(ColourUtil.ComponentsToRgba(74, 42, 106));
                ImGui.PushStyleColor(ImGuiCol.Border, new System.Numerics.Vector4(border.X, border.Y, border.Z, 1f));
@@ -310,9 +228,6 @@ internal sealed class Appearance : ISettingsTab
        }
    }

-    // Localized label for a preset; falls back to DisplayName if the i18n
-    // key is missing (defensive — the resource manager returns the key
-    // string itself when a lookup fails).
    private static string GetPresetLabel(ChatColourPreset preset)
    {
        var localized = HellionStrings.ResourceManager.GetString(preset.LocalizationKey, HellionStrings.Culture);
@@ -329,31 +244,4 @@ internal sealed class Appearance : ISettingsTab
        GlobalParametersCache.Refresh();
        Plugin.Log.Debug($"Applied chat colour preset: {preset.DisplayName}");
    }
-
-    private void DrawTimestampsSection()
-    {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Appearance_Timestamps_Heading);
-        if (!tree.Success)
-        {
-            return;
-        }
-
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            ImGui.Checkbox(Language.Options_PrettierTimestamps_Name, ref Mutable.PrettierTimestamps);
-            ImGuiUtil.HelpMarker(Language.Options_PrettierTimestamps_Description);
-
-            if (Mutable.PrettierTimestamps)
-            {
-                ImGui.Checkbox(Language.Options_MoreCompactPretty_Name, ref Mutable.MoreCompactPretty);
-                ImGuiUtil.HelpMarker(Language.Options_MoreCompactPretty_Description);
-
-                ImGui.Checkbox(Language.Options_HideSameTimestamps_Name, ref Mutable.HideSameTimestamps);
-                ImGuiUtil.HelpMarker(Language.Options_HideSameTimestamps_Description);
-            }
-
-            ImGui.Checkbox(Language.Options_Use24HourClock_Name, ref Mutable.Use24HourClock);
-            ImGuiUtil.HelpMarker(Language.Options_Use24HourClock_Description);
-        }
-    }
 }
@@ -51,6 +51,28 @@ internal sealed class General : ISettingsTab
            ImGui.TextUnformatted(Language.Options_ChatTabBackwardKeybind_Name);
            ImGui.SetNextItemWidth(-1);
            ImGuiUtil.KeybindInput("ChatTabBackwardKeybind", ref Mutable.ChatTabBackward);
+
+            ImGui.Spacing();
+
+            using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_KeybindMode_Name, Mutable.KeybindMode.Name()))
+            {
+                if (combo.Success)
+                {
+                    foreach (var mode in Enum.GetValues<KeybindMode>())
+                    {
+                        if (ImGui.Selectable(mode.Name(), Mutable.KeybindMode == mode))
+                        {
+                            Mutable.KeybindMode = mode;
+                        }
+
+                        if (ImGui.IsItemHovered())
+                        {
+                            ImGuiUtil.Tooltip(mode.Tooltip() ?? "");
+                        }
+                    }
+                }
+            }
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_KeybindMode_Description, Plugin.PluginName));
        }
    }

@@ -133,27 +155,6 @@ internal sealed class General : ISettingsTab
            ImGuiUtil.HelpMarker(string.Format(Language.Options_CommandHelpSide_Description, Plugin.PluginName));
            ImGui.Spacing();

-            using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_KeybindMode_Name, Mutable.KeybindMode.Name()))
-            {
-                if (combo.Success)
-                {
-                    foreach (var mode in Enum.GetValues<KeybindMode>())
-                    {
-                        if (ImGui.Selectable(mode.Name(), Mutable.KeybindMode == mode))
-                        {
-                            Mutable.KeybindMode = mode;
-                        }
-
-                        if (ImGui.IsItemHovered())
-                        {
-                            ImGuiUtil.Tooltip(mode.Tooltip() ?? "");
-                        }
-                    }
-                }
-            }
-            ImGuiUtil.HelpMarker(string.Format(Language.Options_KeybindMode_Description, Plugin.PluginName));
-            ImGui.Spacing();
-
            ImGui.Checkbox(Language.Options_SortAutoTranslate_Name, ref Mutable.SortAutoTranslate);
            ImGuiUtil.HelpMarker(Language.Options_SortAutoTranslate_Description);
        }
@@ -1,11 +1,7 @@
 using HellionChat.Code;
-using HellionChat.Export;
 using HellionChat.Privacy;
 using HellionChat.Resources;
 using HellionChat.Util;
-using Dalamud.Interface.Colors;
-using Dalamud.Interface.ImGuiNotification;
-using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Bindings.ImGui;

@@ -52,25 +48,6 @@ internal sealed class Privacy : ISettingsTab
        ]),
    ];

-    private Dictionary<int, long>? CleanupCounts;
-    private long CleanupKeepCount;
-    private long CleanupDeleteCount;
-    private bool CleanupRunning;
-    private bool CleanupPreviewStale;
-    private HashSet<ChatType>? CleanupPreviewSnapshot;
-
-    // The retention-running state lives on Plugin so the auto-sweep and
-    // this manual button see the same flag. UI reads stay lock-free
-    // because ImGui is single-threaded and bool reads are atomic in .NET.
-    private bool RetentionRunning => Plugin.RetentionSweepRunning;
-
-    // Export form state
-    private int ExportRangeDays = 30;
-    private string ExportSenderSubstring = string.Empty;
-    private readonly HashSet<ChatType> ExportSelectedChannels = [];
-    private ExportFormat ExportFormat = ExportFormat.Markdown;
-    private bool ExportRunning;
-
    public void Draw(bool changed)
    {
        if (ImGui.Button(HellionStrings.Wizard_Reopen_Button))
@@ -78,51 +55,6 @@ internal sealed class Privacy : ISettingsTab
        ImGui.Spacing();

        DrawPrivacyFilterSection();
-
-        ImGui.Spacing();
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        DrawRetentionSection();
-
-        ImGui.Spacing();
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        DrawCleanupSection();
-
-        ImGui.Spacing();
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        DrawExportSection();
-
-        ImGui.Spacing();
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        DrawAutoTellTabsPreloadSection();
-    }
-
-    private void DrawAutoTellTabsPreloadSection()
-    {
-        using var tree = ImRaii.TreeNode(HellionStrings.Privacy_AutoTellTabs_Section_Title);
-        if (!tree.Success)
-            return;
-
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            var preload = Mutable.AutoTellTabsHistoryPreload;
-            ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
-            if (ImGui.SliderInt(HellionStrings.Privacy_AutoTellTabs_Preload_Name, ref preload, 0, 100))
-            {
-                Mutable.AutoTellTabsHistoryPreload = preload;
-            }
-            ImGuiUtil.HelpMarker(HellionStrings.Privacy_AutoTellTabs_Preload_Description);
-
-            ImGui.Spacing();
-            ImGuiUtil.HelpText(HellionStrings.Privacy_AutoTellTabs_Preload_Hint);
-        }
    }

    private void DrawPrivacyFilterSection()
@@ -200,452 +132,4 @@ internal sealed class Privacy : ISettingsTab
            }
        }
    }
-
-    private void DrawExportSection()
-    {
-        ImGui.TextUnformatted(HellionStrings.Export_Heading);
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            ImGuiUtil.HelpText(HellionStrings.Export_Help);
-
-            ImGui.Spacing();
-
-            if (ImGui.InputInt(HellionStrings.Export_Range_Label, ref ExportRangeDays))
-                ExportRangeDays = Math.Max(0, ExportRangeDays);
-
-            ImGui.InputText(HellionStrings.Export_Sender_Label, ref ExportSenderSubstring, 256);
-
-            using (var tree = ImRaii.TreeNode(HellionStrings.Export_Channels_Heading))
-            {
-                if (tree.Success)
-                {
-                    using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-                    {
-                        ImGuiUtil.HelpText(HellionStrings.Export_Channels_AllOff);
-                        foreach (var (heading, types) in Groups)
-                        {
-                            using var subTree = ImRaii.TreeNode($"{heading()}##export-group-{heading()}");
-                            if (!subTree.Success)
-                                continue;
-
-                            using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-                            foreach (var type in types)
-                            {
-                                var enabled = ExportSelectedChannels.Contains(type);
-                                if (ImGui.Checkbox($"{type}##export-{(int)type}", ref enabled))
-                                {
-                                    if (enabled)
-                                        ExportSelectedChannels.Add(type);
-                                    else
-                                        ExportSelectedChannels.Remove(type);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            ImGui.Spacing();
-            ImGui.TextUnformatted(HellionStrings.Export_Format_Label);
-            ImGui.SameLine();
-            var fmt = (int)ExportFormat;
-            if (ImGui.RadioButton(HellionStrings.Export_Format_Markdown, ref fmt, (int)ExportFormat.Markdown))
-                ExportFormat = ExportFormat.Markdown;
-            ImGui.SameLine();
-            if (ImGui.RadioButton(HellionStrings.Export_Format_Json, ref fmt, (int)ExportFormat.Json))
-                ExportFormat = ExportFormat.Json;
-            ImGui.SameLine();
-            if (ImGui.RadioButton(HellionStrings.Export_Format_Csv, ref fmt, (int)ExportFormat.Csv))
-                ExportFormat = ExportFormat.Csv;
-
-            ImGui.Spacing();
-
-            using (ImRaii.Disabled(ExportRunning))
-            {
-                if (ImGui.Button(HellionStrings.Export_Button))
-                    PromptExport();
-            }
-
-            if (ExportRunning)
-                ImGuiUtil.HelpText(HellionStrings.Export_Running);
-        }
-    }
-
-    private void PromptExport()
-    {
-        var defaultName = $"hellion-chat-export-{DateTimeOffset.Now:yyyyMMdd-HHmm}";
-        var ext = ExportFormat.Extension();
-
-        Plugin.FileDialogManager.SaveFileDialog(
-            HellionStrings.Export_Dialog_Title,
-            ExportFormat.Filter(),
-            defaultName,
-            ext,
-            (success, path) =>
-            {
-                if (!success || string.IsNullOrWhiteSpace(path))
-                    return;
-                StartExport(path);
-            });
-    }
-
-    private void StartExport(string path)
-    {
-        if (ExportRunning)
-            return;
-        ExportRunning = true;
-
-        var types = ExportSelectedChannels.Count > 0
-            ? ExportSelectedChannels.Select(t => (int)(ushort)t).ToList()
-            : null;
-
-        DateTimeOffset? from = ExportRangeDays > 0
-            ? DateTimeOffset.UtcNow.AddDays(-ExportRangeDays)
-            : null;
-
-        var senderSubstring = string.IsNullOrWhiteSpace(ExportSenderSubstring) ? null : ExportSenderSubstring.Trim();
-        var format = ExportFormat;
-        var filterDesc = new MessageExporter.FilterDescription(types, from, null, senderSubstring);
-
-        new Thread(() =>
-        {
-            try
-            {
-                using var enumerator = Plugin.MessageManager.Store.StreamForExport(types, from, null);
-                var written = MessageExporter.ExportToFile(path, format, enumerator, filterDesc);
-
-                if (written > 0)
-                    WrapperUtil.AddNotification(string.Format(HellionStrings.Export_Success, written, path), NotificationType.Success);
-                else
-                    WrapperUtil.AddNotification(HellionStrings.Export_Empty, NotificationType.Info);
-            }
-            catch (Exception e)
-            {
-                Plugin.Log.Error(e, "Export failed");
-                WrapperUtil.AddNotification(HellionStrings.Export_Error, NotificationType.Error);
-            }
-            finally
-            {
-                ExportRunning = false;
-            }
-        }) { IsBackground = true }.Start();
-    }
-
-    private void DrawRetentionSection()
-    {
-        ImGui.TextUnformatted(HellionStrings.Retention_Heading);
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            ImGuiUtil.OptionCheckbox(
-                ref Mutable.RetentionEnabled,
-                HellionStrings.Retention_Enabled_Name,
-                HellionStrings.Retention_Enabled_Description);
-
-            using (ImRaii.Disabled(!Mutable.RetentionEnabled))
-            {
-                ImGui.Spacing();
-
-                var defaultDays = Mutable.RetentionDefaultDays;
-                if (ImGui.InputInt(HellionStrings.Retention_Default_Label, ref defaultDays))
-                    Mutable.RetentionDefaultDays = Math.Max(0, defaultDays);
-                ImGuiUtil.HelpMarker(HellionStrings.Retention_Default_Help);
-
-                ImGui.Spacing();
-
-                if (ImGui.Button(HellionStrings.Retention_Reset_Spec))
-                {
-                    Mutable.RetentionPerChannelDays =
-                        PrivacyDefaults.DefaultRetentionDays.ToDictionary(p => p.Key, p => p.Value);
-                }
-                ImGui.SameLine();
-                if (ImGui.Button(HellionStrings.Retention_Clear_Overrides))
-                    Mutable.RetentionPerChannelDays.Clear();
-
-                ImGui.Spacing();
-
-                using (var tree = ImRaii.TreeNode(HellionStrings.Retention_Tree_Heading))
-                {
-                    if (tree.Success)
-                    {
-                        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-                        foreach (var (heading, types) in Groups)
-                        {
-                            using var subTree = ImRaii.TreeNode(heading());
-                            if (!subTree.Success)
-                                continue;
-
-                            using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-                            foreach (var type in types)
-                            {
-                                var hasOverride = Mutable.RetentionPerChannelDays.TryGetValue(type, out var days);
-                                var hasSpecDefault = PrivacyDefaults.DefaultRetentionDays.TryGetValue(type, out var specDays);
-                                if (!hasOverride)
-                                    days = hasSpecDefault ? specDays : Mutable.RetentionDefaultDays;
-
-                                var tag = hasOverride
-                                    ? HellionStrings.Retention_Tag_Override
-                                    : hasSpecDefault
-                                        ? HellionStrings.Retention_Tag_Spec
-                                        : HellionStrings.Retention_Tag_Global;
-                                if (ImGui.InputInt($"{type} {tag}##retention-{(int)type}", ref days))
-                                {
-                                    days = Math.Max(0, days);
-                                    Mutable.RetentionPerChannelDays[type] = days;
-                                }
-
-                                if (hasOverride)
-                                {
-                                    ImGui.SameLine();
-                                    if (ImGui.Button($"{HellionStrings.Retention_Reset_Button}##retention-reset-{(int)type}"))
-                                        Mutable.RetentionPerChannelDays.Remove(type);
-                                }
-                            }
-                        }
-                    }
-                }
-
-                ImGui.Spacing();
-
-                ImGuiUtil.HelpText(HellionStrings.Retention_Help_SavedNote);
-                ImGui.Spacing();
-
-                using (ImRaii.Disabled(RetentionRunning))
-                {
-                    if (ImGuiUtil.CtrlShiftButton(HellionStrings.Retention_Apply_Label, HellionStrings.Retention_Apply_Tooltip))
-                        StartRetentionRun();
-                }
-
-                if (RetentionRunning)
-                    ImGuiUtil.HelpText(HellionStrings.Retention_Running);
-
-                ImGui.Spacing();
-                var lastRun = Plugin.Config.RetentionLastRunAt;
-                ImGuiUtil.HelpText(lastRun == DateTimeOffset.MinValue
-                    ? HellionStrings.Retention_LastRun_Never
-                    : string.Format(HellionStrings.Retention_LastRun_At, lastRun.ToLocalTime()));
-            }
-        }
-    }
-
-    private void StartRetentionRun()
-    {
-        // Take the shared retention lock so we cannot fight the auto-sweep
-        // for the database connection. If the auto-sweep is already in
-        // flight we just bail — the user can press the button again once
-        // it finishes.
-        lock (Plugin.RetentionSweepLock)
-        {
-            if (Plugin.RetentionSweepRunning)
-                return;
-            Plugin.RetentionSweepRunning = true;
-        }
-
-        var policy = Plugin.Config.RetentionPerChannelDays.ToDictionary(p => (int)(ushort)p.Key, p => p.Value);
-        var defaultDays = Plugin.Config.RetentionDefaultDays;
-
-        new Thread(() =>
-        {
-            try
-            {
-                var deleted = Plugin.MessageManager.Store.DeleteByRetentionPolicy(policy, defaultDays);
-                Plugin.Config.RetentionLastRunAt = DateTimeOffset.UtcNow;
-                Plugin.SaveConfig();
-
-                Plugin.Log.Information($"Manual retention run deleted {deleted} expired messages.");
-
-                if (deleted > 0)
-                {
-                    // Bound the wait so a hung framework tick can't deadlock
-                    // the background retention worker. Five seconds is well
-                    // beyond a normal frame; if we time out we log and let
-                    // the next FilterAllTabsAsync call recover the state.
-                    if (!Plugin.Framework.Run(() =>
-                        {
-                            Plugin.MessageManager.ClearAllTabs();
-                            Plugin.MessageManager.FilterAllTabsAsync();
-                        }).Wait(TimeSpan.FromSeconds(5)))
-                    {
-                        Plugin.Log.Warning("Retention sweep: framework refresh timed out after 5s.");
-                    }
-                }
-
-                WrapperUtil.AddNotification(string.Format(HellionStrings.Retention_Success, deleted), NotificationType.Success);
-            }
-            catch (Exception e)
-            {
-                Plugin.Log.Error(e, "Manual retention run failed");
-                WrapperUtil.AddNotification(HellionStrings.Retention_Error, NotificationType.Error);
-            }
-            finally
-            {
-                lock (Plugin.RetentionSweepLock)
-                    Plugin.RetentionSweepRunning = false;
-            }
-        }) { IsBackground = true }.Start();
-    }
-
-    private void DrawCleanupSection()
-    {
-        ImGui.TextUnformatted(HellionStrings.Cleanup_Heading);
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            ImGuiUtil.HelpText(HellionStrings.Cleanup_Help_Intro);
-            ImGuiUtil.HelpText(HellionStrings.Cleanup_Help_SavedNote);
-
-            ImGui.Spacing();
-
-            // Drift-detection between the snapshot taken at last refresh
-            // and the current Mutable whitelist. Cleanup itself runs on
-            // the SAVED policy (Cleanup_Help_SavedNote covers that), but
-            // the user usually expects "the preview reflects what I just
-            // ticked" — so we surface the divergence instead of silently
-            // showing stale numbers.
-            if (CleanupPreviewSnapshot is not null
-                && !CleanupPreviewSnapshot.SetEquals(Mutable.PrivacyPersistChannels))
-            {
-                CleanupPreviewStale = true;
-            }
-
-            using (var emphasis = CleanupPreviewStale
-                       ? ImRaii.PushColor(ImGuiCol.Button, ImGuiColors.HealerGreen with { W = 0.6f })
-                       : null)
-            using (ImRaii.Disabled(CleanupRunning))
-            {
-                if (ImGui.Button(HellionStrings.Cleanup_RefreshPreview))
-                    RefreshCleanupPreview();
-            }
-
-            if (CleanupCounts is null)
-            {
-                ImGuiUtil.HelpText(HellionStrings.Cleanup_NoPreview);
-                return;
-            }
-
-            if (CleanupPreviewStale)
-            {
-                ImGui.Spacing();
-                ImGuiUtil.HelpText(HellionStrings.Cleanup_Preview_Stale);
-            }
-
-            ImGui.Spacing();
-
-            using (var staleColor = CleanupPreviewStale
-                       ? ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudGrey)
-                       : null)
-            {
-                ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_TotalStored, CleanupKeepCount + CleanupDeleteCount));
-                ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_WillKeep, CleanupKeepCount));
-                ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_WillDelete, CleanupDeleteCount));
-            }
-
-            using (var tree = ImRaii.TreeNode(HellionStrings.Cleanup_Breakdown))
-            {
-                if (tree.Success)
-                {
-                    using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-                    foreach (var (chatType, count) in CleanupCounts.OrderByDescending(p => p.Value))
-                    {
-                        var name = Enum.IsDefined(typeof(ChatType), (ushort)chatType)
-                            ? ((ChatType)(ushort)chatType).ToString()
-                            : $"Unknown({chatType})";
-                        var keeps = WouldBeKept(chatType);
-                        var marker = keeps ? HellionStrings.Cleanup_Marker_Keep : HellionStrings.Cleanup_Marker_Delete;
-                        ImGuiUtil.HelpText($"{marker} {name} — {count:N0}");
-                    }
-                }
-            }
-
-            ImGui.Spacing();
-
-            using (ImRaii.Disabled(CleanupRunning || CleanupDeleteCount == 0))
-            {
-                if (ImGuiUtil.CtrlShiftButton(HellionStrings.Cleanup_Apply_Label,
-                        string.Format(HellionStrings.Cleanup_Apply_Tooltip, CleanupDeleteCount)))
-                    StartCleanup();
-            }
-
-            if (CleanupRunning)
-                ImGuiUtil.HelpText(HellionStrings.Cleanup_Running);
-        }
-    }
-
-    private bool WouldBeKept(int chatType)
-    {
-        if (!Plugin.Config.PrivacyFilterEnabled)
-            return true;
-        if (Plugin.Config.PrivacyPersistChannels.Contains((ChatType)(ushort)chatType))
-            return true;
-        return Plugin.Config.PrivacyPersistUnknownChannels;
-    }
-
-    private void RefreshCleanupPreview()
-    {
-        try
-        {
-            CleanupCounts = Plugin.MessageManager.Store.GetMessageCountsByChatType();
-            CleanupKeepCount = 0;
-            CleanupDeleteCount = 0;
-            foreach (var (chatType, count) in CleanupCounts)
-            {
-                if (WouldBeKept(chatType))
-                    CleanupKeepCount += count;
-                else
-                    CleanupDeleteCount += count;
-            }
-
-            // Snapshot the whitelist as it stood at preview-time so the
-            // render pass can flag the user about subsequent edits. Only
-            // updated on success — if the preview throws, the previous
-            // snapshot stays in place so stale-detection keeps working.
-            CleanupPreviewSnapshot = new HashSet<ChatType>(Mutable.PrivacyPersistChannels);
-            CleanupPreviewStale = false;
-        }
-        catch (Exception e)
-        {
-            Plugin.Log.Error(e, "Failed to compute cleanup preview");
-            WrapperUtil.AddNotification(HellionStrings.Cleanup_PreviewError, NotificationType.Error);
-        }
-    }
-
-    private void StartCleanup()
-    {
-        if (CleanupRunning)
-            return;
-
-        CleanupRunning = true;
-        var allowed = Plugin.Config.PrivacyPersistChannels.Select(t => (int)(ushort)t).ToList();
-
-        new Thread(() =>
-        {
-            try
-            {
-                var deleted = Plugin.MessageManager.Store.CleanupRetainOnly(allowed);
-                Plugin.Log.Information($"Privacy cleanup: deleted {deleted} messages");
-
-                // Bound the wait so a hung framework tick can't deadlock
-                // the background cleanup worker. See the matching comment in
-                // the retention path above for rationale.
-                if (!Plugin.Framework.Run(() =>
-                    {
-                        Plugin.MessageManager.ClearAllTabs();
-                        Plugin.MessageManager.FilterAllTabsAsync();
-                    }).Wait(TimeSpan.FromSeconds(5)))
-                {
-                    Plugin.Log.Warning("Privacy cleanup: framework refresh timed out after 5s.");
-                }
-
-                WrapperUtil.AddNotification(string.Format(HellionStrings.Cleanup_Success, deleted), NotificationType.Success);
-            }
-            catch (Exception e)
-            {
-                Plugin.Log.Error(e, "Privacy cleanup failed");
-                WrapperUtil.AddNotification(HellionStrings.Cleanup_Error, NotificationType.Error);
-            }
-            finally
-            {
-                CleanupRunning = false;
-                CleanupCounts = null;
-            }
-        }).Start();
-    }
 }
@@ -91,6 +91,40 @@ internal sealed class Tabs : ISettingsTab
            }

            ImGui.InputText(Language.Options_Tabs_Name, ref tab.Name, 512, ImGuiInputTextFlags.EnterReturnsTrue);
+
+            // v1.2.0 — Per-Tab Icon-Override. Default-Mapping greift falls nichts gesetzt.
+            ImGui.TextUnformatted(HellionStrings.Tabs_Icon_Label);
+            ImGui.SameLine();
+            ImGuiUtil.HelpMarker(HellionStrings.Tabs_Icon_HelpMarker);
+
+            var iconCurrent = string.IsNullOrEmpty(tab.Icon) ? "" : tab.Icon;
+            var iconPreview = iconCurrent.Length == 0
+                ? HellionStrings.Tabs_Icon_DefaultOption
+                : iconCurrent;
+            using (var combo = ImRaii.Combo($"##icon-{i}", iconPreview))
+            {
+                if (combo.Success)
+                {
+                    // Erste Option: Default (löscht Icon, lässt Mapping greifen).
+                    if (ImGui.Selectable(HellionStrings.Tabs_Icon_DefaultOption, iconCurrent.Length == 0))
+                    {
+                        tab.Icon = null;
+                    }
+
+                    ImGui.Separator();
+
+                    // Pool-Optionen aus TabIconGlyphResolver.PickerOptions (Single-Source-of-Truth).
+                    foreach (var option in TabIconGlyphResolver.PickerOptions)
+                    {
+                        var isSelected = string.Equals(iconCurrent, option, StringComparison.OrdinalIgnoreCase);
+                        if (ImGui.Selectable(option, isSelected))
+                        {
+                            tab.Icon = option;
+                        }
+                    }
+                }
+            }
+
            ImGui.Checkbox(Language.Options_Tabs_ShowTimestamps, ref tab.DisplayTimestamp);
            ImGui.Checkbox(Language.Options_Tabs_PopOut, ref tab.PopOut);
            if (tab.PopOut)
@@ -0,0 +1,286 @@
+using System.Numerics;
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface.Utility.Raii;
+using HellionChat.Resources;
+using HellionChat.Themes;
+using HellionChat.Util;
+
+namespace HellionChat.Ui.SettingsTabs;
+
+internal sealed class ThemeAndLayout : ISettingsTab
+{
+    private Plugin Plugin { get; }
+    private Configuration Mutable { get; }
+
+    private string? _applyDismissedFor;
+
+    public string Name => HellionStrings.Settings_Card_ThemeAndLayout_Title + "###tabs-themeandlayout";
+
+    internal ThemeAndLayout(Plugin plugin, Configuration mutable)
+    {
+        Plugin = plugin;
+        Mutable = mutable;
+    }
+
+    public void Draw(bool changed)
+    {
+        DrawThemeSection();
+        ImGui.Spacing();
+        DrawWindowStyleSection();
+        ImGui.Spacing();
+        DrawTimestampStyleSection();
+    }
+
+    private void DrawThemeSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_ThemeAndLayout_Theme_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            var registry = Plugin.ThemeRegistry;
+            var active = registry.Get(Mutable.Theme);
+
+            var activeLabelTemplate = HellionStrings.ResourceManager.GetString("Settings_Themes_Active") ?? "Active: {0}";
+            ImGui.TextUnformatted(string.Format(activeLabelTemplate, active.Name));
+            using (ImRaii.PushColor(ImGuiCol.Text, 0xFF8FA3B5u))
+                ImGui.TextUnformatted(active.Author);
+
+            DrawChatColorsApplyBanner(active);
+
+            ImGui.Spacing();
+            ImGui.Separator();
+            ImGui.Spacing();
+
+            var builtInsLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_BuiltIns") ?? "Built-in themes";
+            ImGui.TextUnformatted(builtInsLabel);
+            ImGui.Spacing();
+            DrawThemeGrid(registry.AllBuiltIns(), active.Slug);
+
+            var customs = registry.AllCustom().ToList();
+            if (customs.Count > 0)
+            {
+                ImGui.Spacing();
+                ImGui.Separator();
+                ImGui.Spacing();
+                var customLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_Custom") ?? "Custom themes";
+                ImGui.TextUnformatted(customLabel);
+                ImGui.Spacing();
+                DrawThemeGrid(customs, active.Slug);
+            }
+
+            ImGui.Spacing();
+            ImGui.Separator();
+            ImGui.Spacing();
+
+            var openFolderLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_OpenFolder") ?? "Open themes folder";
+            if (ImGui.Button(openFolderLabel))
+            {
+                var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
+                Directory.CreateDirectory(dir);
+                Dalamud.Utility.Util.OpenLink(dir);
+            }
+
+            ImGui.SameLine();
+            var exportLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ExportActive") ?? "Export active...";
+            if (ImGui.Button(exportLabel))
+            {
+                var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
+                Directory.CreateDirectory(dir);
+                var fileName = $"{active.Slug}.export.json";
+                var path = Path.Combine(dir, fileName);
+                var json = ThemeJsonWriter.Serialize(active);
+                File.WriteAllText(path, json);
+                Plugin.Log.Information($"Exported active theme '{active.Slug}' to {path}");
+            }
+        }
+    }
+
+    private void DrawThemeGrid(IEnumerable<Theme> themes, string activeSlug)
+    {
+        var avail = ImGui.GetContentRegionAvail();
+        var columns = avail.X >= 700f ? 3 : 2;
+        var cardWidth = (avail.X - (columns - 1) * 8f) / columns;
+        var cardHeight = 140f;
+
+        var list = themes.ToList();
+        for (var i = 0; i < list.Count; i++)
+        {
+            DrawThemeCard(list[i], activeSlug, cardWidth, cardHeight);
+
+            if ((i + 1) % columns != 0 && i != list.Count - 1)
+                ImGui.SameLine();
+        }
+    }
+
+    private void DrawThemeCard(Theme theme, string activeSlug, float w, float h)
+    {
+        ImGui.BeginGroup();
+
+        var isActive = string.Equals(theme.Slug, activeSlug, StringComparison.OrdinalIgnoreCase);
+        var cursorBefore = ImGui.GetCursorScreenPos();
+        var clicked = ImGui.InvisibleButton($"##theme-card-{theme.Slug}", new Vector2(w, h));
+        var hovered = ImGui.IsItemHovered();
+
+        var draw = ImGui.GetWindowDrawList();
+        var bg = ColourUtil.RgbaToAbgr(theme.Colors.WindowBg | 0xFFu);
+        draw.AddRectFilled(cursorBefore, cursorBefore + new Vector2(w, h), bg, 4f);
+
+        if (isActive)
+        {
+            var border = ColourUtil.RgbaToAbgr(theme.Colors.Primary);
+            draw.AddRect(cursorBefore, cursorBefore + new Vector2(w, h), border, 4f, ImDrawFlags.None, 2f);
+        }
+        else if (hovered)
+        {
+            var border = ColourUtil.RgbaToAbgr(theme.Colors.PrimaryLight & 0xFFFFFF99u);
+            draw.AddRect(cursorBefore, cursorBefore + new Vector2(w, h), border, 4f, ImDrawFlags.None, 1f);
+        }
+
+        var mockupOrigin = cursorBefore + new Vector2(12f, 12f);
+        var mockupSize = new Vector2(w - 24f, 60f);
+        ThemeMockup.Draw(mockupOrigin, mockupSize, theme);
+
+        var textColor = ColourUtil.RgbaToAbgr(theme.Colors.TextPrimary);
+        var mutedColor = ColourUtil.RgbaToAbgr(theme.Colors.TextMuted);
+        draw.AddText(cursorBefore + new Vector2(12f, 80f), textColor, theme.Name);
+        draw.AddText(cursorBefore + new Vector2(12f, 100f), mutedColor, theme.Author);
+
+        ImGui.EndGroup();
+
+        if (clicked)
+        {
+            Mutable.Theme = theme.Slug;
+            Plugin.ThemeRegistry.Switch(theme.Slug);
+            _applyDismissedFor = null;
+        }
+    }
+
+    private void DrawChatColorsApplyBanner(Theme active)
+    {
+        if (active.ChatColors is not { Channels.Count: > 0 } themeChatColors)
+            return;
+
+        if (_applyDismissedFor == active.Slug)
+            return;
+
+        var alreadyMatching = themeChatColors.Channels.All(kvp =>
+            Mutable.ChatColours.TryGetValue(kvp.Key, out var current) && current == kvp.Value);
+        if (alreadyMatching)
+            return;
+
+        ImGui.Spacing();
+
+        var border = ColourUtil.RgbaToAbgr(active.Colors.Primary);
+        var bgFill = ColourUtil.RgbaToAbgr((active.Colors.Surface & 0xFFFFFF00u) | 0xCCu);
+        var origin = ImGui.GetCursorScreenPos();
+        var width = ImGui.GetContentRegionAvail().X;
+        var height = 64f;
+        var draw = ImGui.GetWindowDrawList();
+        draw.AddRectFilled(origin, origin + new Vector2(width, height), bgFill, 4f);
+        draw.AddRect(origin, origin + new Vector2(width, height), border, 4f, ImDrawFlags.None, 1f);
+
+        var hint = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Hint")
+                   ?? "This theme suggests its own chat channel colours.";
+        var applyLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Apply")
+                         ?? "Apply";
+        var keepLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Keep")
+                        ?? "Keep current";
+
+        var textColor = ColourUtil.RgbaToAbgr(active.Colors.TextPrimary);
+        draw.AddText(origin + new Vector2(12f, 10f), textColor, hint);
+
+        using (ImRaii.PushColor(ImGuiCol.Button, active.Colors.Primary))
+        using (ImRaii.PushColor(ImGuiCol.ButtonHovered, active.Colors.PrimaryLight))
+        using (ImRaii.PushColor(ImGuiCol.ButtonActive, active.Colors.PrimaryDark))
+        {
+            ImGui.SetCursorScreenPos(origin + new Vector2(12f, 32f));
+            if (ImGui.Button(applyLabel))
+            {
+                foreach (var kvp in themeChatColors.Channels)
+                    Mutable.ChatColours[kvp.Key] = kvp.Value;
+                _applyDismissedFor = active.Slug;
+            }
+        }
+
+        ImGui.SameLine();
+        if (ImGui.Button(keepLabel))
+        {
+            _applyDismissedFor = active.Slug;
+        }
+
+        ImGui.SetCursorScreenPos(origin + new Vector2(0f, height + 8f));
+
+        ImGui.Spacing();
+    }
+
+    private void DrawWindowStyleSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_ThemeAndLayout_WindowStyle_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_ShowTitleBar_Name, ref Mutable.ShowTitleBar);
+
+            ImGui.Checkbox(Language.Options_ShowPopOutTitleBar_Name, ref Mutable.ShowPopOutTitleBar);
+
+            ImGui.Checkbox(Language.Options_ShowHideButton_Name, ref Mutable.ShowHideButton);
+            ImGuiUtil.HelpMarker(Language.Options_ShowHideButton_Description);
+
+            ImGui.Checkbox(Language.Options_SidebarTabView_Name, ref Mutable.SidebarTabView);
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName));
+
+            ImGui.Spacing();
+            ImGui.Separator();
+            ImGui.Spacing();
+
+            // Slider 50–100 % UX-Range; intern 0.5–1.0 als WindowOpacity-Float.
+            // Untere Schwelle 50 % verhindert versehentliches Komplett-Wegblenden
+            // des Chat-Hintergrunds (war v1.2.0 Bug bei WindowAlpha=0).
+            var opacityPercent = Mutable.WindowOpacity * 100f;
+            if (ImGuiUtil.DragFloatVertical(
+                    HellionStrings.Settings_ThemeAndLayout_WindowOpacity_Name,
+                    ref opacityPercent,
+                    .25f,
+                    50f,
+                    100f,
+                    $"{opacityPercent:N0}%%",
+                    ImGuiSliderFlags.AlwaysClamp))
+            {
+                Mutable.WindowOpacity = opacityPercent / 100f;
+            }
+            ImGuiUtil.HelpMarker(HellionStrings.Settings_ThemeAndLayout_WindowOpacity_Description);
+        }
+    }
+
+    private void DrawTimestampStyleSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_ThemeAndLayout_TimestampStyle_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_PrettierTimestamps_Name, ref Mutable.PrettierTimestamps);
+            ImGuiUtil.HelpMarker(Language.Options_PrettierTimestamps_Description);
+
+            if (Mutable.PrettierTimestamps)
+            {
+                ImGui.Checkbox(Language.Options_MoreCompactPretty_Name, ref Mutable.MoreCompactPretty);
+                ImGuiUtil.HelpMarker(Language.Options_MoreCompactPretty_Description);
+
+                ImGui.Checkbox(HellionStrings.Appearance_UseCompactDensity_Name, ref Mutable.UseCompactDensity);
+                ImGuiUtil.HelpMarker(HellionStrings.Appearance_UseCompactDensity_Description);
+
+                ImGui.Checkbox(Language.Options_HideSameTimestamps_Name, ref Mutable.HideSameTimestamps);
+                ImGuiUtil.HelpMarker(Language.Options_HideSameTimestamps_Description);
+            }
+
+            ImGui.Checkbox(Language.Options_Use24HourClock_Name, ref Mutable.Use24HourClock);
+            ImGuiUtil.HelpMarker(Language.Options_Use24HourClock_Description);
+        }
+    }
+}
@@ -0,0 +1,70 @@
+using System.Numerics;
+using Dalamud.Bindings.ImGui;
+using HellionChat.Themes;
+using HellionChat.Util;
+
+namespace HellionChat.Ui.SettingsTabs;
+
+internal static class ThemeMockup
+{
+    // Zeichnet ein Mini-Chat-Window-Mockup mit den Theme-Werten direkt
+    // ins WindowDrawList. Keine Texture, keine Allocation pro Frame —
+    // alles via DrawList.AddRectFilled / AddText.
+    public static void Draw(Vector2 origin, Vector2 size, Theme theme)
+    {
+        var draw = ImGui.GetWindowDrawList();
+        var c = theme.Colors;
+
+        // Window-Bg
+        draw.AddRectFilled(origin, origin + size, ColourUtil.RgbaToAbgr(c.WindowBg | 0xFFu), theme.Layout.WindowRounding);
+
+        // Title-Bar
+        var titleHeight = 14f;
+        draw.AddRectFilled(
+            origin,
+            new Vector2(origin.X + size.X, origin.Y + titleHeight),
+            ColourUtil.RgbaToAbgr(c.Identity), theme.Layout.WindowRounding);
+
+        // Tab-Bar — 3 Mini-Tabs
+        var tabY = origin.Y + titleHeight + 4f;
+        var tabHeight = 12f;
+        for (var i = 0; i < 3; i++)
+        {
+            var tabX = origin.X + 6f + i * 28f;
+            var color = i == 0 ? c.FrameBg : c.ChildBg;
+            draw.AddRectFilled(
+                new Vector2(tabX, tabY),
+                new Vector2(tabX + 26f, tabY + tabHeight),
+                ColourUtil.RgbaToAbgr(color), theme.Layout.TabRounding);
+
+            if (i == 0)  // Active-Pill
+            {
+                draw.AddRectFilled(
+                    new Vector2(tabX, tabY + tabHeight - 2f),
+                    new Vector2(tabX + 26f, tabY + tabHeight),
+                    ColourUtil.RgbaToAbgr(c.Primary));
+            }
+        }
+
+        // Card-Row mit Mock-Sender + Text
+        var rowY = tabY + tabHeight + 6f;
+        var rowHeight = 18f;
+        draw.AddRectFilled(
+            new Vector2(origin.X + 6f, rowY),
+            new Vector2(origin.X + size.X - 6f, rowY + rowHeight),
+            ColourUtil.RgbaToAbgr(c.Surface), 2f);
+
+        // Akzent-Button rechts unten
+        var btnW = 28f;
+        var btnH = 10f;
+        var btnX = origin.X + size.X - btnW - 6f;
+        var btnY = origin.Y + size.Y - btnH - 6f;
+        draw.AddRectFilled(
+            new Vector2(btnX, btnY),
+            new Vector2(btnX + btnW, btnY + btnH),
+            ColourUtil.RgbaToAbgr(c.Accent), theme.Layout.FrameRounding);
+
+        // Border um das gesamte Mockup
+        draw.AddRect(origin, origin + size, ColourUtil.RgbaToAbgr(c.Border), theme.Layout.WindowRounding);
+    }
+}
@@ -120,7 +120,7 @@ internal sealed class Window : ISettingsTab

    private void DrawFrameSection()
    {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Window_Frame_Heading);
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Window_Frame_Behaviour_Heading);
        if (!tree.Success)
        {
            return;
@@ -129,23 +129,12 @@ internal sealed class Window : ISettingsTab
        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
        {
            ImGui.Checkbox(Language.Options_CanMove_Name, ref Mutable.CanMove);
-
            ImGui.Checkbox(Language.Options_CanResize_Name, ref Mutable.CanResize);

-            ImGui.Checkbox(Language.Options_ShowTitleBar_Name, ref Mutable.ShowTitleBar);
-
-            ImGui.Checkbox(Language.Options_ShowPopOutTitleBar_Name, ref Mutable.ShowPopOutTitleBar);
-
            // v0.6.0 — global master switch for the pop-out input bar.
            ImGui.Checkbox(HellionStrings.Settings_Window_PopOutInputEnabled_Name, ref Mutable.PopOutInputEnabled);
            ImGuiUtil.HelpMarker(HellionStrings.Settings_Window_PopOutInputEnabled_Description);

-            ImGui.Checkbox(Language.Options_ShowHideButton_Name, ref Mutable.ShowHideButton);
-            ImGuiUtil.HelpMarker(Language.Options_ShowHideButton_Description);
-
-            ImGui.Checkbox(Language.Options_SidebarTabView_Name, ref Mutable.SidebarTabView);
-            ImGuiUtil.HelpMarker(string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName));
-
            ImGui.Spacing();

            // Manual escape hatch for off-screen windows. The plugin already
@@ -0,0 +1,169 @@
+using System.Globalization;
+using System.Numerics;
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface;
+using Dalamud.Interface.Utility.Raii;
+using HellionChat.Code;
+using HellionChat.Resources;
+using HellionChat.Util;
+
+namespace HellionChat.Ui;
+
+/// <summary>
+/// Bottom-Status-Bar (v1.2.0). Fix 22 px hoch, BorderTop als Trenner.
+/// Slots links → rechts: Channel-Indicator (Color-Dot + Channel-Name),
+/// Privacy-Badge (Lock-Icon + Privacy-Label), Counts (Tabs + Msgs),
+/// Tells (Auto-Tell-Counter, hidden bei 0), Version (rechtsbündig, muted).
+///
+/// Update-Frequenz: 1×/Sekunde. Format-Strings werden zwischen Updates
+/// gecached, damit kein Per-Frame-Format-Allocation entsteht.
+/// </summary>
+internal sealed class StatusBar
+{
+    public const float Height = 22f;
+    private const long UpdateIntervalMs = 1000;
+
+    // Cache-State — initial outdated, damit der erste Frame frisch berechnet.
+    private long _lastUpdateMs = -UpdateIntervalMs;
+    private string _cachedCountsText = string.Empty;
+    private string _cachedTellsText = string.Empty;
+
+    /// <summary>
+    /// Reine String-Logik — testbar ohne ImGui-Init.
+    /// </summary>
+    public static string FormatCounts(int tabs, int messages)
+    {
+        // InvariantCulture: User-System-Locale darf das Format nicht
+        // verändern (de_DE würde sonst "1,2k" statt "1.2k" liefern).
+        var msgPart = messages >= 1000
+            ? string.Format(CultureInfo.InvariantCulture, "{0:0.0}k msg", messages / 1000.0)
+            : $"{messages} msg";
+        var tabsPart = $"{tabs} {(tabs == 1 ? "tab" : "tabs")}";
+        return $"{tabsPart} · {msgPart}";
+    }
+
+    /// <summary>
+    /// Reine String-Logik — testbar ohne ImGui-Init.
+    /// 0 Tells → Leerstring (Slot wird ausgeblendet).
+    /// </summary>
+    public static string FormatTells(int count)
+    {
+        if (count <= 0) return string.Empty;
+        return $"{count} {(count == 1 ? "tell" : "tells")}";
+    }
+
+    /// <summary>
+    /// Test-Hook: Cache-Logic ohne reale Time-Source verifizieren.
+    /// Nicht für Production-Render.
+    /// </summary>
+    internal (string counts, string tells) SnapshotForTest(long now, int tabs, int messages, int tells)
+    {
+        UpdateCacheIfDue(now, tabs, messages, tells);
+        return (_cachedCountsText, _cachedTellsText);
+    }
+
+    private void UpdateCacheIfDue(long now, int tabs, int messages, int tells)
+    {
+        if (now - _lastUpdateMs < UpdateIntervalMs)
+            return;
+        _cachedCountsText = FormatCounts(tabs, messages);
+        _cachedTellsText = FormatTells(tells);
+        _lastUpdateMs = now;
+    }
+
+    /// <summary>
+    /// Render-Pfad. Aufrufer pusht bereits den HellionStyle/Theme;
+    /// wir lesen nur die aktiven Theme-Farben und zeichnen.
+    /// </summary>
+    public void Draw(Plugin plugin)
+    {
+        var theme = plugin.ThemeRegistry.Active;
+        var now = Environment.TickCount64;
+
+        // Counts pro Frame berechnen ist günstig (List<>.Count, kleine
+        // Sums); Format-String wird gecached.
+        var tabs = Plugin.Config.Tabs.Count;
+        var messages = Plugin.Config.Tabs.Sum(t => t.Messages.Count);
+        var tells = Plugin.Config.Tabs.Count(t => t.IsTempTab);
+        UpdateCacheIfDue(now, tabs, messages, tells);
+
+        // BorderTop als Trenner — DrawList-Line, ImGui-Separator hat zu viel Padding.
+        var cursorY = ImGui.GetCursorScreenPos().Y;
+        var winLeft = ImGui.GetWindowPos().X;
+        var winRight = winLeft + ImGui.GetWindowSize().X;
+        ImGui.GetWindowDrawList().AddLine(
+            new Vector2(winLeft, cursorY),
+            new Vector2(winRight, cursorY),
+            ColourUtil.RgbaToAbgr(theme.Colors.Border),
+            1f);
+
+        ImGui.Dummy(new Vector2(0, 2)); // BorderTop-Spacing
+
+        // Slot 1: Active-Channel-Indicator
+        var inputCh = plugin.CurrentTab?.CurrentChannel?.Channel ?? InputChannel.Invalid;
+        var hasChannel = inputCh != InputChannel.Invalid;
+        var chatType = inputCh.ToChatType();
+        var channelName = hasChannel ? chatType.Name() : "—";
+        var channelColor = hasChannel
+            ? (plugin.Functions.Chat.GetChannelColor(chatType) ?? theme.Colors.TextMuted)
+            : theme.Colors.TextMuted;
+        DrawDot(channelColor);
+        ImGui.SameLine();
+        ImGui.TextUnformatted(channelName);
+
+        // Slot 2: Privacy-Badge — abgeleitet aus PrivacyFilterEnabled.
+        ImGui.SameLine();
+        DrawSeparator();
+        ImGui.SameLine();
+        using (plugin.FontManager.FontAwesome.Push())
+        {
+            ImGui.TextUnformatted(FontAwesomeIcon.Lock.ToIconString());
+        }
+        ImGui.SameLine();
+        var privacyLabel = Plugin.Config.PrivacyFilterEnabled
+            ? HellionStrings.StatusBar_Privacy_Enabled
+            : HellionStrings.StatusBar_Privacy_Open;
+        ImGui.TextUnformatted(privacyLabel);
+
+        // Slot 3: Counts
+        ImGui.SameLine();
+        DrawSeparator();
+        ImGui.SameLine();
+        ImGui.TextUnformatted(_cachedCountsText);
+
+        // Slot 4: Tells (nur wenn > 0)
+        if (!string.IsNullOrEmpty(_cachedTellsText))
+        {
+            ImGui.SameLine();
+            DrawSeparator();
+            ImGui.SameLine();
+            ImGui.TextUnformatted(_cachedTellsText);
+        }
+
+        // Slot 5: Version (rechtsbündig, muted)
+        var versionText = $"v{Plugin.Interface.Manifest.AssemblyVersion} · Hellion";
+        var versionWidth = ImGui.CalcTextSize(versionText).X;
+        var contentRegionMax = ImGui.GetContentRegionMax().X;
+        ImGui.SameLine(contentRegionMax - versionWidth);
+        using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(theme.Colors.TextMuted)))
+        {
+            ImGui.TextUnformatted(versionText);
+        }
+    }
+
+    private static void DrawDot(uint rgba)
+    {
+        var pos = ImGui.GetCursorScreenPos();
+        const float radius = 4f;
+        ImGui.GetWindowDrawList().AddCircleFilled(
+            new Vector2(pos.X + radius, pos.Y + ImGui.GetTextLineHeight() / 2f),
+            radius,
+            ColourUtil.RgbaToAbgr(rgba));
+        ImGui.Dummy(new Vector2(radius * 2 + 4, ImGui.GetTextLineHeight()));
+    }
+
+    private static void DrawSeparator()
+    {
+        ImGui.TextDisabled("·");
+    }
+}
@@ -0,0 +1,79 @@
+namespace HellionChat.Ui;
+
+/// <summary>
+/// Reine String-Resolver-Logik ohne Dalamud-Dependency. Bewusst in
+/// eigener Datei (Dependency-Boundary auf File-Level sichtbar), damit
+/// Tests (HellionChat.Tests, Microsoft.NET.Sdk ohne Dalamud-Reference)
+/// sie aufrufen können, ohne dass die JIT beim Methodenaufruf die
+/// Dalamud-Assembly laden muss.
+///
+/// Wird im Settings-UI (T7) für die Glyph-Picker-Combobox und im
+/// Render-Code indirekt über <see cref="TabIconMapping.Resolve(Tab)"/>
+/// verwendet.
+/// </summary>
+internal static class TabIconGlyphResolver
+{
+    /// <summary>
+    /// Picker-Options-Pool — Single Source of Truth für das Glyph-Set.
+    /// Reihenfolge ist die UI-Reihenfolge im Settings-Tab Icon-Combobox.
+    /// </summary>
+    public static readonly IReadOnlyList<string> PickerOptions =
+        ["comment", "comments", "cog", "users", "user-friends", "link",
+         "envelope", "clock", "hashtag", "star", "heart", "bell",
+         "bookmark", "flag", "fire"];
+
+    /// <summary>
+    /// Glyph-Set, das überhaupt als Override akzeptiert wird. Aus
+    /// <see cref="PickerOptions"/> abgeleitet — KnownGlyphs nie
+    /// manuell pflegen.
+    /// </summary>
+    private static readonly HashSet<string> KnownGlyphs =
+        new(PickerOptions, StringComparer.OrdinalIgnoreCase);
+
+    /// <summary>
+    /// Tab-Name → Default-Glyph-Name. Tab.Name wird per Lokalisierung
+    /// gesetzt; wir matchen daher gegen einen Pool aus DE/EN-Synonymen.
+    /// </summary>
+    private static readonly Dictionary<string, string> NameDefaults = new(StringComparer.OrdinalIgnoreCase)
+    {
+        ["allgemein"] = "comment",
+        ["general"] = "comment",
+        ["system"] = "cog",
+        ["free company"] = "users",
+        ["fc"] = "users",
+        ["gruppe"] = "user-friends",
+        ["group"] = "user-friends",
+        ["party"] = "user-friends",
+        ["linkshell"] = "link",
+        ["ls"] = "link",
+        ["cwls"] = "link",
+        ["tells"] = "envelope",
+        ["tell"] = "envelope",
+    };
+
+    /// <summary>
+    /// Test-Surface: Glyph-Name-Resolver ohne Dalamud-Dependency.
+    /// Reihenfolge:
+    /// 1. Tab.Icon-Override (falls gesetzt und nicht nur Whitespace):
+    ///    a) bekannter Glyph → diesen Glyph
+    ///    b) unbekannter Glyph → harter Fallback "hashtag" (User hat
+    ///       bewusst etwas gesetzt, also überstimmt das die Defaults)
+    /// 2. Auto-Tell-Tab → <paramref name="autoTellGlyph"/> falls
+    ///    übergeben, sonst "clock".
+    /// 3. Tab-Name-Default (<see cref="NameDefaults"/>-Lookup)
+    /// 4. Fallback "hashtag"
+    /// </summary>
+    public static string ResolveGlyphName(Tab tab, string? autoTellGlyph = null)
+    {
+        if (!string.IsNullOrWhiteSpace(tab.Icon))
+            return KnownGlyphs.Contains(tab.Icon) ? tab.Icon : "hashtag";
+
+        if (tab.IsTempTab)
+            return autoTellGlyph ?? "clock";
+
+        if (tab.Name is { } name && NameDefaults.TryGetValue(name, out var byName))
+            return byName;
+
+        return "hashtag";
+    }
+}
@@ -0,0 +1,72 @@
+using Dalamud.Interface;
+
+namespace HellionChat.Ui;
+
+/// <summary>
+/// Default-Icon-Mapping für Tabs. v1.2.0 Layout-Refresh nutzt das
+/// in Top-Tabs (Icon-Prefix) und Sidebar (Icon-only mit Tooltip).
+/// User können in Settings → Tabs per Tab.Icon-Override eigene
+/// FontAwesome-Glyphen setzen.
+///
+/// Diese Klasse ist Dalamud-abhängig (FontAwesomeIcon-Enum). Die
+/// reine String-Resolver-Logik liegt bewusst in
+/// <see cref="TabIconGlyphResolver"/> (eigene Datei, ohne
+/// Dalamud-Imports), damit Tests sie ohne Dalamud-Reference aufrufen
+/// können.
+/// </summary>
+internal static class TabIconMapping
+{
+    /// <summary>
+    /// FontAwesome-Glyph-Name → Icon-Enum-Lookup. Wird für die
+    /// Production-Resolve-API benötigt.
+    ///
+    /// INVARIANTE: Jeder Key in <see cref="GlyphLookup"/> muss auch in
+    /// <see cref="TabIconGlyphResolver.PickerOptions"/> stehen. Wird
+    /// ein Glyph zu PickerOptions hinzugefügt, aber nicht hier, fällt
+    /// die Override-Auflösung still auf <see cref="FontAwesomeIcon.Hashtag"/>
+    /// zurück (degraded, kein Crash). Build-Time-Enforcement ist nicht
+    /// möglich, weil PickerOptions ohne Dalamud-Reference auskommt.
+    /// </summary>
+    private static readonly Dictionary<string, FontAwesomeIcon> GlyphLookup = new(StringComparer.OrdinalIgnoreCase)
+    {
+        ["comment"] = FontAwesomeIcon.Comment,
+        ["comments"] = FontAwesomeIcon.Comments,
+        ["cog"] = FontAwesomeIcon.Cog,
+        ["users"] = FontAwesomeIcon.Users,
+        ["user-friends"] = FontAwesomeIcon.UserFriends,
+        ["link"] = FontAwesomeIcon.Link,
+        ["envelope"] = FontAwesomeIcon.Envelope,
+        ["clock"] = FontAwesomeIcon.Clock,
+        ["hashtag"] = FontAwesomeIcon.Hashtag,
+        ["star"] = FontAwesomeIcon.Star,
+        ["heart"] = FontAwesomeIcon.Heart,
+        ["bell"] = FontAwesomeIcon.Bell,
+        ["bookmark"] = FontAwesomeIcon.Bookmark,
+        ["flag"] = FontAwesomeIcon.Flag,
+        ["fire"] = FontAwesomeIcon.Fire,
+    };
+
+    /// <summary>
+    /// Production-Surface: liefert das Icon für einen Tab. Wrapper um
+    /// <see cref="TabIconGlyphResolver.ResolveGlyphName(Tab)"/> plus
+    /// Enum-Lookup. Wird von Render-Code (T3, T5) verwendet.
+    /// </summary>
+    public static FontAwesomeIcon Resolve(Tab tab)
+    {
+        // v1.2.0 — Auto-Tell-Tabs bekommen ein per-Partner gehashtes
+        // Icon aus dem Tell-Pool. Damit unterscheiden sich parallele
+        // Tells nicht nur über die Color (For), sondern auch über die
+        // Glyph-Form. Berechnung bleibt hier (Dalamud-bound), weil
+        // TellTarget Dalamud-Imports hat.
+        string? autoTellGlyph = null;
+        if (tab.IsTempTab && tab.TellTarget != null && tab.TellTarget.IsSet())
+        {
+            autoTellGlyph = AutoTellTabTint.IconFor(tab.TellTarget.Name, tab.TellTarget.World);
+        }
+
+        var glyph = TabIconGlyphResolver.ResolveGlyphName(tab, autoTellGlyph);
+        return GlyphLookup.TryGetValue(glyph, out var icon)
+            ? icon
+            : FontAwesomeIcon.Hashtag;
+    }
+}
@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Globalization;
-using System.Runtime.InteropServices;
 using System.Text;
 using Dalamud.Game;
 using Dalamud.Utility;
@@ -233,9 +232,6 @@ internal static class AutoTranslate
            .ToList();
    }

-    [DllImport("msvcrt.dll", CallingConvention = CallingConvention.Cdecl)]
-    private static extern int memcmp(byte[] b1, byte[] b2, nuint count);
-
    internal static void ReplaceWithPayload(ref byte[] bytes)
    {
        var search = "<at:"u8.ToArray();
@@ -279,7 +275,10 @@ internal static class AutoTranslate
                start = -1;
            }

-            if (i + search.Length < bytes.Length && memcmp(bytes[i..], search, (nuint) search.Length) == 0)
+            // Pure managed comparison via Span avoids the msvcrt.dll P/Invoke,
+            // which is fragile under Wine and triggered an extra managed-to-
+            // unmanaged copy per check.
+            if (i + search.Length < bytes.Length && bytes.AsSpan(i, search.Length).SequenceEqual(search))
                start = i;
        }
    }
@@ -62,4 +62,20 @@ internal static class ColourUtil {

        return ((uint) a << 24) | ((uint) nb << 16) | ((uint) ng << 8) | nr;
    }
+
+    public static uint HexToRgba(string hex)
+    {
+        ArgumentNullException.ThrowIfNull(hex);
+        var s = hex.StartsWith('#') ? hex[1..] : hex;
+        if (s.Length != 6 && s.Length != 8)
+            throw new FormatException($"Hex colour must be 6 or 8 hex digits, got {s.Length}: '{hex}'");
+
+        if (!uint.TryParse(s, System.Globalization.NumberStyles.HexNumber, System.Globalization.CultureInfo.InvariantCulture, out var value))
+            throw new FormatException($"Hex colour '{hex}' is not a valid hexadecimal value");
+
+        if (s.Length == 6)
+            value = (value << 8) | 0xFFu;  // RRGGBB → RRGGBBFF
+
+        return value;
+    }
 }
@@ -25,6 +25,8 @@ public class ColorPayload
                return payload;
            case 0xE9:
                var param = stream.ReadByte();
+                if (param == -1)
+                    throw new ArgumentException("Encountered premature end of input (unexpected EOF).", nameof(stream));
                var globalValue = (uint) GlobalParametersCache.GetValue(param - 2);
                payload.Enabled = true;
                payload.UnshiftedColor = globalValue;
@@ -49,9 +49,21 @@ public readonly unsafe ref struct GfdFileView
        var entries = Entries;
        if (DirectLookup)
        {
-            if (iconId <= entries.Length)
+            // Resolve redirects on the direct-lookup path too — the binary-search
+            // path follows them, and skipping them here was inconsistent for
+            // contiguous ID sets.
+            var visited = 0;
+            while (iconId <= entries.Length)
            {
                entry = entries[(int)(iconId - 1)];
+                if (followRedirect && entry.Redirect != 0 && entry.Redirect != iconId)
+                {
+                    if (++visited > entries.Length)
+                        break; // cycle guard
+                    iconId = entry.Redirect;
+                    continue;
+                }
+
                return !entry.IsEmpty;
            }

@@ -146,12 +158,17 @@ public readonly unsafe ref struct GfdFileView
 internal static class IconUtil
 {
    private static byte[]? GfdFile;
-    public static unsafe GfdFileView GfdFileView
+    public static GfdFileView GfdFileView
    {
        get
        {
-            GfdFile ??= Plugin.DataManager.GetFile("common/font/gfdata.gfd")!.Data;
-            return new GfdFileView(new ReadOnlySpan<byte>(Unsafe.AsPointer(ref GfdFile[0]), GfdFile.Length));
+            if (GfdFile is null)
+            {
+                var file = Plugin.DataManager.GetFile("common/font/gfdata.gfd")
+                    ?? throw new FileNotFoundException("Failed to load common/font/gfdata.gfd from the game data.");
+                GfdFile = file.Data;
+            }
+            return new GfdFileView(GfdFile);
        }
    }

@@ -8,7 +8,7 @@ internal class Lender<T>

    internal Lender(Func<T> ctor)
    {
-        Ctor = ctor;
+        Ctor = ctor ?? throw new ArgumentNullException(nameof(ctor));
    }

    internal void ResetCounter()
@@ -4,8 +4,21 @@ namespace HellionChat.Util;

 public static class MemoryUtil
 {
+    // Diagnostic helper. Pointer dereferences here would crash on a null/garbage
+    // address and a huge length would log megabytes of raw bytes; both are easy
+    // to trigger from a debugger and pollute the log with potentially sensitive
+    // game-state. Validate the inputs before reading.
+    private const int MaxDumpLength = 4096;
+
    public static unsafe void PrintMemoryArea(nint address, int length)
    {
+        if (address == nint.Zero)
+            throw new ArgumentException("Memory address cannot be zero.", nameof(address));
+        if (length <= 0)
+            throw new ArgumentOutOfRangeException(nameof(length), length, "Length must be positive.");
+        if (length > MaxDumpLength)
+            throw new ArgumentOutOfRangeException(nameof(length), length, $"Length exceeds the {MaxDumpLength}-byte safety cap.");
+
        var ptr = (byte*)address;
        var str = new StringBuilder("\n");
        for(var i = 0; i < length; i++)
@@ -66,6 +66,8 @@ internal class UriPayload(Uri uri) : Payload
    public static UriPayload ResolveUri(string rawUri)
    {
        ArgumentNullException.ThrowIfNull(rawUri);
+        if (string.IsNullOrWhiteSpace(rawUri))
+            throw new UriFormatException("URI cannot be empty or whitespace.");

        // Check for an expected scheme '://', if not add 'https://'
        if (ExpectedSchemes.Any(scheme => rawUri.StartsWith($"{scheme}://")))
@@ -1,3 +1,4 @@
+using System.Globalization;
 using System.Text;

 namespace HellionChat.Util;
@@ -23,6 +24,9 @@ internal static class StringUtil
        var bytes = Math.Abs(byteCount);
        var place = Convert.ToInt32(Math.Floor(Math.Log(bytes, 1024)));
        var num = Math.Round(bytes / Math.Pow(1024, place), 1);
-        return (Math.Sign(byteCount) * num).ToString("N0") + suf[place];
+        // "0.#" keeps the rounded fractional digit (1.5 GB stays "1.5GB"); "N0"
+        // would truncate it back to integer. InvariantCulture pins the decimal
+        // separator to '.' so a German locale doesn't render "1,5GB".
+        return (Math.Sign(byteCount) * num).ToString("0.#", CultureInfo.InvariantCulture) + suf[place];
    }
 }
@@ -16,7 +16,7 @@
      },
      "MessagePack": {
        "type": "Direct",
-        "requested": "[3.1.4, )",
+        "requested": "[3.1.4, 4.0.0)",
        "resolved": "3.1.4",
        "contentHash": "BH0wlHWmVoZpbAPyyt2Awbq30C+ZsS3eHSkYdnyUAbqVJ22fAJDzn2xTieBeoT5QlcBzp61vHcv878YJGfi3mg==",
        "dependencies": {
@@ -44,13 +44,13 @@
      },
      "Pidgin": {
        "type": "Direct",
-        "requested": "[3.5.1, )",
+        "requested": "[3.5.1, 4.0.0)",
        "resolved": "3.5.1",
        "contentHash": "zU7tkXlF3D6d2GLTjJDomAL3nnl4AwfZvSgSz8D4b+Ry21/clqedYlxBnEAkAU/bkGfEv6uRR7QCdWZUpKrB/g=="
      },
      "SixLabors.ImageSharp": {
        "type": "Direct",
-        "requested": "[3.1.12, )",
+        "requested": "[3.1.12, 4.0.0)",
        "resolved": "3.1.12",
        "contentHash": "iAg6zifihXEFS/t7fiHhZBGAdCp3FavsF4i2ZIDp0JfeYeDVzvmlbY1CNhhIKimaIzrzSi5M/NBFcWvZT2rB/A=="
      },
@@ -87,3 +87,7 @@ this file, the README). The Hellion brand is mine.
 This file is the canonical place for "is this attribution correct, is the
 maintainer reachable, is the relationship to Chat 2 documented". If
 anything in here is wrong, please open an issue or contact me directly.
+
+---
+
+Maintained under **Hellion Forge**, the modding and plugin line of **Hellion Online Media** | Bad Harzburg | [hellion-media.de](https://hellion-media.de)
@@ -1,206 +1,118 @@
 # Privacy notice

-HellionChat is a Dalamud plugin for FINAL FANTASY XIV that focuses on
-giving the user explicit control over what their chat client stores
-locally. This document describes what the plugin does with your data,
-what it does not do, and how you exercise the rights the GDPR gives
-you over data you generate yourself.
+HellionChat is a Dalamud plugin for FINAL FANTASY XIV, focused on giving the user explicit control over what their chat client stores locally. This document describes what the plugin does with your data, what it does not do, and how you exercise the rights the GDPR gives you over data you generate yourself.

-This document is informational. The maintainer of HellionChat is
-**not** a controller or processor of your data in the GDPR sense,
-because no data ever leaves your machine on the maintainer's
-infrastructure. Independently of that, the plugin is built so that
-you can act on your own data the way the GDPR expects.
+This document is informational. The maintainer of HellionChat is **not** a controller or processor of your data in the GDPR sense, because no data ever leaves your machine on the maintainer's infrastructure. Independently of that, the plugin is built so that you can act on your own data the way the GDPR expects.

-Last reviewed: 2026-05-03 (HellionChat v0.5.4).
+Last reviewed: 2026-05-05 (HellionChat v1.1.0).

 ---

 ## TL;DR

- All chat data the plugin stores stays on your machine, in your
-  Dalamud `pluginConfigs/HellionChat/` directory.
- The plugin does not phone home. There is no telemetry, no analytics,
-  no crash reporter, no usage counter, no remote update check beyond
-  what Dalamud itself does.
- Two outbound network calls exist by design: the BetterTTV emote
-  service (for chat emotes) and the Square Enix Lodestone font CDN
-  (for the in-game symbol font). Both are documented in detail below
-  and both can be reasoned about per request.
- You can export every message the plugin has stored, in Markdown,
-  JSON or CSV, and you can wipe stored history per channel, per date
-  range, or globally.
+- All chat data the plugin stores stays on your machine, in your Dalamud `pluginConfigs/HellionChat/` directory.
+- The plugin does not phone home. No telemetry, no analytics, no crash reporter, no usage counter, no remote update check beyond what Dalamud itself does.
+- One outbound network call exists by design: the BetterTTV emote service (for chat emotes). It is documented in detail below and can be reasoned about per request.
+- You can export every message the plugin has stored, in Markdown, JSON or CSV, and you can wipe stored history per channel, per date range, or globally.

 ---

 ## What the plugin stores locally

-HellionChat keeps three kinds of state on your machine, all under
-`%appdata%\XIVLauncher\pluginConfigs\HellionChat\` on Windows
-(`~/.xlcore/pluginConfigs/HellionChat/` on Linux/macOS via XIVLauncher
-Core):
+HellionChat keeps three kinds of state on your machine, all under `%appdata%\XIVLauncher\pluginConfigs\HellionChat\` on Windows (`~/.xlcore/pluginConfigs/HellionChat/` on Linux/macOS via XIVLauncher Core):

-1. **Configuration** (`HellionChat.json`)
-   Plugin settings, channel whitelist, retention values, layout state,
-   theme colours. Contains no chat content.
+1. **Configuration** (`HellionChat.json`).
+   Plugin settings, channel whitelist, retention values, layout state, theme colours. Contains no chat content.

-2. **Message database** (SQLite file in the same directory)
-   Chat messages from the channels on your whitelist, stored as
-   MessagePack-encoded blobs. Default whitelist out of the box covers
-   only your own conversations: tells, party, free company, linkshells,
-   cross-world linkshells, alliance, ExtraChat. Public chat, NPC
-   dialogue, system messages and battle logs are dropped on the
-   storage layer and never written to disk.
+2. **Message database** (SQLite file in the same directory).
+   Chat messages from the channels on your whitelist, stored as MessagePack-encoded blobs. The default whitelist out of the box covers only your own conversations: tells, party, free company, linkshells, cross-world linkshells, alliance, ExtraChat. Public chat, NPC dialogue, system messages and battle logs are dropped on the storage layer and never written to disk.

-3. **Cached emote images** (`EmoteCacheV1/` directory)
-   Image files downloaded from BetterTTV when an emote appears in a
-   message you receive. See "Outbound network calls" below.
+3. **Cached emote images** (`EmoteCacheV1/` directory).
+   Image files downloaded from BetterTTV when an emote appears in a message you receive. See "Outbound network calls" below.

-There is no shared state with the upstream Chat 2 plugin.
-`pluginConfigs/HellionChat/` is independent from `pluginConfigs/ChatTwo/`.
+There is no shared state with the upstream Chat 2 plugin. `pluginConfigs/HellionChat/` is independent from `pluginConfigs/ChatTwo/`.

 ### Retention defaults

 - Tells: 365 days
- Your-conversation channels (party, FC, linkshells, cross-world LS,
-  alliance, ExtraChat): 90 days
+- Your-conversation channels (party, FC, linkshells, cross-world LS, alliance, ExtraChat): 90 days
 - Global default for anything else: 30 days

-**Retention is off by default.** The plugin does not delete anything
-on its own until you explicitly turn the retention sweep on in the
-settings. Until then, stored messages stay until you clear them.
+**Retention is off by default.** The plugin does not delete anything on its own until you explicitly turn the retention sweep on in the settings. Until then, stored messages stay until you clear them.

 ---

 ## What the plugin does not store

- Public chat (`/say`, `/yell`, `/shout`), NPC dialogue, system
-  messages and battle logs. These are filtered before they reach the
-  storage layer.
- Anything from channels you remove from the whitelist. The privacy
-  filter runs on the way in, not on the way out.
- Login credentials, character IDs, account IDs. The plugin uses
-  whatever Dalamud already exposes about the local character to
-  attribute messages; nothing of that is sent anywhere or persisted
-  beyond the message itself.
+- Public chat (`/say`, `/yell`, `/shout`), NPC dialogue, system messages and battle logs. These are filtered before they reach the storage layer.
+- Anything from channels you remove from the whitelist. The privacy filter runs on the way in, not on the way out.
+- Login credentials, character IDs, account IDs. The plugin uses whatever Dalamud already exposes about the local character to attribute messages. Nothing of that is sent anywhere or persisted beyond the message itself.

 ---

 ## Outbound network calls

-HellionChat makes two kinds of automatic outbound network requests.
-Both are inherited from upstream Chat 2 and both are documented here
-because "DSGVO-by-design" means you should know what your client does
-on your behalf.
+HellionChat makes two kinds of automatic outbound network requests. Both are inherited from upstream Chat 2 and both are documented here because "GDPR-by-design" means you should know what your client does on your behalf.

 ### 1. BetterTTV emote service (`api.betterttv.net`, `cdn.betterttv.net`)

- **What it does:** When a chat message arrives that references a
-  BetterTTV emote, the plugin asks the BetterTTV API for the emote
-  metadata and downloads the image from the BetterTTV CDN to display
-  it inline.
- **What is sent:** A standard HTTPS GET request. Your IP address
-  reaches BetterTTV (unavoidable for any HTTPS request); the request
-  itself contains no identifying user data, no character name, no
-  message text. Only the emote ID being looked up is in the URL path.
- **When it triggers:** Only when an incoming message contains an
-  emote token that is on the BetterTTV emote list.
- **Cached:** Yes, in `emoteCache/`. A given emote is downloaded once
-  per machine and reused.
- **How to opt out:** Turn off the **Show emotes** option in
-  Settings → Chat. With it disabled, the emote cache does not load
-  and no requests to BetterTTV are made for the rest of the session.
+- **What it does:** When a chat message arrives that references a BetterTTV emote, the plugin asks the BetterTTV API for the emote metadata and downloads the image from the BetterTTV CDN to display it inline.
+- **What is sent:** A standard HTTPS GET request. Your IP address reaches BetterTTV (unavoidable for any HTTPS request); the request itself contains no identifying user data, no character name, no message text. Only the emote ID being looked up is in the URL path.
+- **When it triggers:**
+  - The emote *list* (global emotes plus the top-1500 community emotes over fifteen API pages) is fetched from `api.betterttv.net` once per session at plugin startup, provided the **Show emotes** option is on. This first list-fetch happens before any chat message has arrived. BetterTTV's edge therefore sees your IP as soon as the plugin loads, not only after an emote is mentioned.
+  - The individual emote *images* on `cdn.betterttv.net` are fetched on demand, only when an incoming chat message contains a token matching one of the cached IDs. These are cached locally (`emoteCache/`) and reused across sessions.
+- **Cached:** Yes, in `emoteCache/`. A given emote is downloaded once per machine and reused.
+- **How to opt out:** Turn off the **Show emotes** option in Settings → Chat. With it disabled, the emote cache does not load and no requests to BetterTTV are made for the rest of the session.
 - **BetterTTV's privacy policy:** <https://betterttv.com/privacy>

 Source: `HellionChat/EmoteCache.cs`.

-### 2. Square Enix Lodestone font (`img.finalfantasyxiv.com`)
+### 2. Square Enix Lodestone font (removed in v1.0.4)

- **What it does:** Downloads the `FFXIV_Lodestone_SSF.ttf` font file
-  from the official Square Enix Lodestone CDN once during font setup,
-  so the plugin can render in-game special symbols (job icons, item
-  glyphs, etc.) inside ImGui.
- **What is sent:** A single HTTPS GET request to the public Square
-  Enix font URL. Your IP address reaches Square Enix (unavoidable);
-  no character data, no plugin identifier, no message content.
- **When it triggers:** Once per font initialisation, not per session
-  if the file is already cached locally.
- **Cached:** Yes, by Dalamud's font subsystem.
- **How to opt out:** This call is part of the font pipeline inherited
-  from upstream Chat 2 and not toggleable from the settings UI today.
-  If a user-facing opt-out for this would be useful for you, please
-  open a feature-request issue.
+Earlier versions of HellionChat (and upstream Chat 2) downloaded `FFXIV_Lodestone_SSF.ttf` from `img.finalfantasyxiv.com` once during font setup. That code path was a leftover from upstream's removed webinterface feature and was no longer consumed anywhere. The in-game symbol glyphs (job icons, item glyphs, status effects) come from Dalamud's bundled symbol-font helper, not from the downloaded TTF.

-Source: `HellionChat/FontManager.cs`.
+The download was removed in v1.0.4. As of that version HellionChat makes no automatic network call to Square Enix or to any `finalfantasyxiv.com` host.
+
+Cached `FFXIV_Lodestone_SSF.ttf` files left over from earlier versions remain in `pluginConfigs/HellionChat/` until manually deleted. They are no longer read.

 ### Links you click yourself (no automatic traffic)

-The settings panel contains a few buttons that open external pages in
-your browser when you click them: the upstream Chat 2 GitHub repo,
-the upstream maintainers' Ko-fi pages, the HellionChat issue tracker
-and `hellion-media.de`. Nothing happens until you click. They are
-documented here for completeness, not because they generate background
-traffic.
+The settings panel contains a few buttons that open external pages in your browser when you click them: the upstream Chat 2 GitHub repo, the upstream maintainers' Ko-fi pages, the HellionChat issue tracker and `hellion-media.de`. Nothing happens until you click. They are documented here for completeness, not because they generate background traffic.

 ---

 ## What the plugin does not do

- **No telemetry.** Source verified: no calls to AppInsights, Sentry,
-  PostHog, Plausible, Google Analytics, Microsoft Clarity or any
-  comparable service exist in the codebase, nor in the direct
-  dependencies the plugin pulls in. See `docs/THIRD_PARTY_NOTICES.md`.
- **No crash reporting.** Crashes go to Dalamud's local `xllog`,
-  not to a remote endpoint controlled by HellionChat.
- **No usage counters.** The plugin does not count installs, sessions,
-  feature usage, channel activity or anything else for the maintainer.
- **No phone-home update check.** Updates are delivered through
-  Dalamud's plugin installer, which polls the custom-repo
-  `repo.json` on GitHub. That is GitHub's traffic and falls under
-  GitHub's privacy policy; the plugin code does no separate update
-  check.
- **No background sync.** Messages stay on your machine. There is no
-  cloud backup, no sharing feature, no remote viewer.
+- **No telemetry.** Source verified: no calls to AppInsights, Sentry, PostHog, Plausible, Google Analytics, Microsoft Clarity or any comparable service exist in the codebase, nor in the direct dependencies the plugin pulls in. See `docs/THIRD_PARTY_NOTICES.md`.
+- **No crash reporting.** Crashes go to Dalamud's local `xllog`, not to a remote endpoint controlled by HellionChat.
+- **No usage counters.** The plugin does not count installs, sessions, feature usage, channel activity or anything else for the maintainer.
+- **No phone-home update check.** Updates are delivered through Dalamud's plugin installer, which polls the custom-repo `repo.json` on GitHub. That is GitHub's traffic and falls under GitHub's privacy policy. The plugin code does no separate update check.
+- **No background sync.** Messages stay on your machine. No cloud backup, no sharing feature, no remote viewer.

 ---

 ## Your data, your rights

-The GDPR gives you specific rights over data about you. Because
-HellionChat stores everything locally, those rights translate
-directly into plugin features:
+The GDPR gives you specific rights over data about you. Because HellionChat stores everything locally, those rights translate directly into plugin features:

 ### Right to access (Art. 15)

-Use the export feature in the plugin settings. You can export to
-**Markdown**, **JSON** or **CSV**, filtered by channel, date range
-or sender substring. The export goes through a Dalamud file dialog
-and writes wherever you point it, on your machine.
+Use the export feature in the plugin settings. You can export to **Markdown**, **JSON** or **CSV**, filtered by channel, date range or sender substring. The export goes through a Dalamud file dialog and writes wherever you point it, on your machine.

 ### Right to erasure (Art. 17)

 Two options:

-1. **Targeted deletion** — the "retroactive cleanup" feature lets you
-   apply your current whitelist to the existing database. It shows a
-   preview of what will be removed before you confirm with
-   Ctrl+Shift, runs in the background, and calls `VACUUM` afterwards
-   to actually shrink the file.
-2. **Full deletion** — close the game and delete the
-   `pluginConfigs/HellionChat/` directory. Next plugin start will
-   produce a fresh, empty configuration.
+1. **Targeted deletion.** The "retroactive cleanup" feature lets you apply your current whitelist to the existing database. It shows a preview of what will be removed before you confirm with Ctrl+Shift, runs in the background, and calls `VACUUM` afterwards to actually shrink the file.
+2. **Full deletion.** Close the game and delete the `pluginConfigs/HellionChat/` directory. The next plugin start will produce a fresh, empty configuration.

 ### Right to portability (Art. 20)

-The JSON and CSV exports are open formats. The Markdown export is
-human-readable and machine-parseable. Nothing is locked into a
-proprietary container.
+The JSON and CSV exports are open formats. The Markdown export is human-readable and machine-parseable. Nothing is locked into a proprietary container.

 ### Right to object / restrict processing (Art. 21, 18)

-Adjust the channel whitelist or set retention to a low value. Both
-take effect immediately on new messages; existing data needs the
-retroactive cleanup to apply retroactively, by design.
+Adjust the channel whitelist or set retention to a low value. Both take effect immediately on new messages. Existing data needs the retroactive cleanup to apply retroactively, by design.

 ---

@@ -209,41 +121,30 @@ retroactive cleanup to apply retroactively, by design.
 | Party | Why they appear | What reaches them | Their privacy policy |
 | --- | --- | --- | --- |
 | BetterTTV (NightDev LLC) | Optional emote rendering | HTTPS request for an emote ID; your IP | <https://betterttv.com/privacy> |
-| Square Enix | Lodestone font download (once) | HTTPS request for the font file; your IP | <https://www.square-enix.com/privacy> |
 | GitHub (Microsoft) | Plugin distribution via custom repo, issue tracker | Whatever GitHub sees from any HTTPS request to a public repo | <https://docs.github.com/site-policy/privacy-policies/github-general-privacy-statement> |
 | Dalamud / XIVLauncher (goatcorp) | Plugin loader, font subsystem, repo polling | Whatever Dalamud reports for itself; out of HellionChat's scope | <https://github.com/goatcorp/Dalamud> |

-Square Enix and GitHub are unavoidable for anyone playing FFXIV
-through Dalamud at all. BetterTTV is the only third party HellionChat
-introduces on top of the baseline that is not also part of using FFXIV
-or Dalamud, and BetterTTV is opt-out via settings.
+GitHub and the Dalamud/XIVLauncher loader are unavoidable for anyone playing FFXIV through Dalamud at all. BetterTTV is the only third party HellionChat introduces on top of that baseline, and it is opt-out via settings.

 ---

 ## Dependencies that touch the network

-For a full dependency inventory see `docs/THIRD_PARTY_NOTICES.md`. Of the
-direct dependencies the plugin pulls in:
+For a full dependency inventory see `docs/THIRD_PARTY_NOTICES.md`. Of the direct dependencies the plugin pulls in:

- `MessagePack` — local serialisation, no network.
- `Microsoft.Data.Sqlite` — local SQLite access, no network.
- `morelinq` — LINQ helpers, no network.
- `Pidgin` — parser combinators, no network.
- `SixLabors.ImageSharp` — image decoding (used for the BetterTTV
-  emote pipeline), no network on its own.
+- `MessagePack`: local serialisation, no network.
+- `Microsoft.Data.Sqlite`: local SQLite access, no network.
+- `morelinq`: LINQ helpers, no network.
+- `Pidgin`: parser combinators, no network.
+- `SixLabors.ImageSharp`: image decoding (used for the BetterTTV emote pipeline), no network on its own.

-The two network calls listed under "Outbound network calls" are
-written directly in HellionChat's own source, not delegated to a
-dependency.
+The single network call listed under "Outbound network calls" is written directly in HellionChat's own source, not delegated to a dependency.

 ---

 ## Changes to this notice

-If a future release changes what HellionChat stores, sends or caches,
-this document will be updated and the change called out in the
-changelog block of that release. The "Last reviewed" date at the top
-tracks the version this document is accurate for.
+If a future release changes what HellionChat stores, sends or caches, this document will be updated and the change called out in the changelog block of that release. The "Last reviewed" date at the top tracks the version this document is accurate for.

 ---

@@ -254,6 +155,8 @@ For privacy-related questions specific to HellionChat:
 - Email: `kontakt@hellion-media.de`
 - Discord DM: `@j.j_kazama`

-Security-relevant findings (e.g. the plugin storing or sending
-something this document says it does not) go through the private
-advisory in `SECURITY.md`, not a public issue.
+Security-relevant findings (for example, the plugin storing or sending something this document says it does not) go through the private advisory in `SECURITY.md`, not a public issue.
+
+---
+
+Maintained under **Hellion Forge**, the modding and plugin line of **Hellion Online Media** | Bad Harzburg | [hellion-media.de](https://hellion-media.de)
@@ -8,15 +8,23 @@
 [![.NET](https://img.shields.io/badge/.NET-10.0-512BD4)](https://dotnet.microsoft.com/)
 [![FFXIV](https://img.shields.io/badge/FFXIV-Dawntrail-c3a37f)](https://www.finalfantasyxiv.com/)

-**Version 1.0.3** — DSGVO-bewusster Chat-Ersatz für FINAL FANTASY XIV / Dalamud, basierend auf [Chat 2](https://github.com/Infiziert90/ChatTwo) (EUPL-1.2).
+<p align="center">
+  <img src="docs/images/hellion-forge.png" alt="Hellion Forge" width="180" />
+</p>

-Hellion Chat ergänzt das ursprüngliche Chat-2-Fundament um Datenschutz- und Daten-Handling-Kontrollen, die mit den Datenschutz-Regeln in der EU, den USA und Japan im Einklang sind. Alle aus Chat 2 übernommenen Funktionen, Befehle und Tastenkürzel funktionieren unverändert. Eigenständiger Plugin-Slot, eigene Konfiguration, eigene Datenbank.
+**Version 1.1.0** — Privacy-First-Chat-Plugin für FINAL FANTASY XIV / Dalamud, basierend auf [Chat 2](https://github.com/Infiziert90/ChatTwo) (EUPL-1.2).
+
+Hellion Chat ist ein Privacy-First-Plugin auf dem Chat-2-Fundament. Der größte Teil der Engine kommt aus Chat 2 (Message-Store, Channel-Logik, Hook-System), die meisten Tastenkürzel funktionieren weiterhin wie gewohnt. Was sich ändert: schärfere Privacy-Defaults von Haus aus, eigene Slash-Commands unter `/hellionchat`, kein Webinterface mehr, und mit v1.1.0 eine Theme-Engine als Schritt in Richtung eigenes UI-Look-and-Feel.
+
+Der Daten-Handling-Fokus liegt auf den DSGVO/EU-, US- und JP-Regelungen, soweit für ein Chat-Plugin praktisch umsetzbar: Speicherzeit pro Kanal, granulare Filter, Selbstauskunft per Export. Eine ausführliche Auflistung steht in [`PRIVACY.md`](PRIVACY.md).

 Eigenständiges Repository, EUPL-1.2-lizenziert. Mit v1.0.0 ist der Standalone-Cut abgeschlossen: eigener Namespace `HellionChat.*`, eigene IPC-Kanäle, eigene Source-Tree-Struktur. Distribution über Custom-Repo. Selektive Cherry-Picks von Upstream-Chat-2 nach Bedarf, dokumentiert in [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md).

 ## Acknowledgements

-Hellion Chat baut auf [Chat 2](https://github.com/Infiziert90/ChatTwo) von **Infiziert90 (Infi)** und **Anna Clemens** auf, die das Plugin über Jahre gepflegt haben bevor ich den Source-Code überhaupt gesehen habe. Die ganze Kern-Architektur, der Message-Store, die Channel-Logik, das Hook-System und vieles mehr stammt von ihnen. Wenn dir Hellion Chat hilft, dann läuft die Anerkennung dafür zu großen Teilen an Infi und Anna. Eine ausführliche Danksagung liegt in [NOTICE.md](NOTICE.md).
+Hellion Chat baut auf [Chat 2](https://github.com/Infiziert90/ChatTwo) von **Infiziert90 (Infi)** und **Anna Clemens** auf, die das Plugin über Jahre gepflegt haben bevor ich den Source-Code überhaupt gesehen habe. Die ganze Kern-Architektur, der Message-Store, die Channel-Logik, das Hook-System und vieles mehr stammt von ihnen. Wenn dir Hellion Chat hilft, läuft die Anerkennung dafür zu großen Teilen an Infi und Anna. Eine ausführliche Danksagung liegt in [NOTICE.md](NOTICE.md).
+
+Hellion Chat wird unter **Hellion Forge** entwickelt, der spezialisierten Modding- und Plugin-Linie von [Hellion Online Media](https://hellion-media.de).

 ---

@@ -32,7 +40,7 @@ Hellion Chat baut auf [Chat 2](https://github.com/Infiziert90/ChatTwo) von **Inf
 | Lokalisierung   | ResX (HellionStrings.resx, .de.resx; PR-basiert)     |
 | Schriftart      | Exo 2 (SIL Open Font License 1.1, gebündelt)         |
 | Toolchain       | dotnet 10 SDK, VS Code mit C# Dev Kit                |
-| Deployment      | GitHub Releases + Custom-Repo (`repo.json`)          |
+| Deployment      | GitHub Releases plus Custom-Repo (`repo.json`)       |

 ---

@@ -55,18 +63,22 @@ Hellion Chat baut auf [Chat 2](https://github.com/Infiziert90/ChatTwo) von **Inf

 ### Look & Feel

- **Bilinguale UI** (Englisch + Deutsch) mit Live-Sprachwechsel. Hellion-spezifische Strings in `HellionStrings.<lang>.resx`.
+- **Bilinguale UI** (Englisch und Deutsch) mit Live-Sprachwechsel. Hellion-spezifische Strings in `HellionStrings.<lang>.resx`.
 - **Hellion-HUD-Theme** mit Cyan-Teal-Akzenten, Slate-Violet-Tabs, Bernstein-Highlights für aktive Zustände.
 - **Chat-Farben-Presets** (v0.6.0) mit sieben Built-in-Bundles in Settings → Aussehen → Chat-Farben: Klassik (Chat 2 Default), High-Contrast, Pastell, Dark-Mode-Tuned, Hellion (Brand), plus Bonus-Stimmungen Night Blue und Indigo Violet. One-Click-Apply, Battle-Channels bleiben unangetastet.
 - **Fenster-Deckkraft-Slider** für Kampf-freundliche Transparenz.
 - **Mitgelieferte Hellion-Schrift** (Exo 2, OFL-1.1) als optionaler Default statt System-Font.
 - **Hellion-Logo** im Plugin-Bundle und in der Dalamud-Plugin-Liste.

+#### Custom Themes (v1.1.0)
+
+HellionChat 1.1.0 bringt eine Theme-Engine mit fünf eingebauten Themes (Hellion Arctic, Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove) und ein JSON-basiertes Authoring-Format für eigene Themes. Schema und Schritt-für-Schritt-Anleitung in [`docs/THEME-AUTHORING.md`](docs/THEME-AUTHORING.md).
+
 ### Pop-Out Convenience (v0.6.0)

- **Eingabe-Bar in Pop-Out-Fenstern** als globaler Opt-In in Settings → Fenster → Fenster-Rahmen. Wenn aktiv hat jedes Pop-Out-Window unten einen kompakten Input mit kanal-farbigem Icon-Button und Text-Eingabe — kein Wechsel mehr ins Hauptfenster für eine schnelle Antwort.
+- **Eingabe-Bar in Pop-Out-Fenstern** als globaler Opt-In in Settings → Fenster → Fenster-Rahmen. Wenn aktiv, hat jedes Pop-Out-Window unten einen kompakten Input mit kanal-farbigem Icon-Button und Text-Eingabe. Kein Wechsel mehr ins Hauptfenster für eine schnelle Antwort.
 - **Pro-Pop-Out unabhängiger Text-Buffer und History-Cursor.** Channel-Wechsel im Pop-Out wirkt global wie im Hauptfenster (FFXIV-Channel-API), aber halb-getippte Eingaben kollidieren nicht zwischen Hauptfenster und Pop-Outs.
- **Geteilte Eingabe-Historie** zwischen allen Fenstern via Singleton-Service — Up/Down-Pfeile navigieren überall durch dieselbe Liste der letzten 30 Eingaben.
+- **Geteilte Eingabe-Historie** zwischen allen Fenstern via Singleton-Service. Up/Down-Pfeile navigieren überall durch dieselbe Liste der letzten 30 Eingaben.

 ### Stability

@@ -76,7 +88,9 @@ Hellion Chat baut auf [Chat 2](https://github.com/Infiziert90/ChatTwo) von **Inf

 ### Was gegenüber Chat 2 fehlt

- **Webinterface** wurde in Hellion Chat 0.2.0 entfernt. Es bedient einen anderen Anwendungsfall als der Fokus dieses Forks, nämlich Remote-Zugriff auf den Chat von einem zweiten Gerät. An die kleineren Defaults dieses Forks anzupassen hätte einen erheblichen Umbau bedeutet, also ist es ersatzlos entfernt worden. Wer den vollen Funktionsumfang von Chat 2 möchte, ist mit dem Upstream-Plugin besser bedient. Hellion Chat fokussiert sich auf einen schmaleren Datenbestand und verzichtet bewusst auf Remote-Zugriffs-Features.
+Das Webinterface wurde in Hellion Chat 0.2.0 entfernt. Es bedient einen anderen Anwendungsfall als der Fokus dieses Forks, nämlich Remote-Zugriff auf den Chat von einem zweiten Gerät. Genau das kollidiert mit der Privacy-First-These dieses Forks: Ein Chat-Plugin, das einen lokalen HTTP-Server startet, ist für mein Threat-Model eine zu große Angriffsfläche. Also raus damit.
+
+Wer den vollen Funktionsumfang von Chat 2 möchte, ist mit dem Upstream-Plugin besser bedient. Hellion Chat ist bewusst der schmalere Fork.

 ---

@@ -98,7 +112,7 @@ HellionChat/
 │   └── Language*.resx           # Upstream-Lokalisierung (Crowdin)
 ├── Ui/
 │   ├── FirstRunWizard.cs        # Drei-Profile-Onboarding
-│   ├── HellionStyle.cs          # ImGui-Theme-Push (lokal + global)
+│   ├── HellionStyle.cs          # ImGui-Theme-Push (lokal und global)
 │   └── SettingsTabs/
 │       └── Privacy.cs           # Datenschutz-Tab (Filter, Retention, Cleanup, Export)
 ├── Ipc/                         # IPC-Kanäle, in v1.0.0 auf HellionChat.* migriert
@@ -111,11 +125,11 @@ HellionChat/

 ### Regeln

- **Code-Namespace ist `HellionChat.*`** — seit v1.0.0 vollständig konsolidiert auf den Plugin-Namen, kein verbleibender `ChatTwo.*`-Bestand im Source-Tree.
- **AssemblyName ist `HellionChat`** — eigener Slot in `pluginConfigs/`, eigenes Datei-Manifest, kein Shared State mit Chat 2. Parallel-Load mit Upstream Chat 2 wird beim Start aktiv geblockt (bilinguale Konflikt-Meldung).
- **IPC-Kanäle sind `HellionChat.*`** — sechs Kanäle für Drittplugin-Anbindung (`Register`, `Available`, `Unregister`, `Invoke`, `GetChatInputState`, `ChatInputStateChanged`). Details in [`docs/IPC.md`](docs/IPC.md).
- **Hellion-eigene Strings in `HellionStrings.*.resx`**, übernommene Strings aus dem Chat-2-Bestand in `Language.*.resx` — die Original-`Language.*.resx` bleibt strukturell erhalten, weil die existierenden Übersetzungen aus dem Crowdin-Bestand der Upstream-Community weiter wertvoll sind.
- **Kein Direkt-Eingriff in `Plugin.Interface.UiBuilder.FontAtlas`** außerhalb von `FontManager` — Font-Fallback und Hellion-Font laufen zentral.
+- **Code-Namespace ist `HellionChat.*`.** Seit v1.0.0 vollständig konsolidiert auf den Plugin-Namen, kein verbleibender `ChatTwo.*`-Bestand im Source-Tree.
+- **AssemblyName ist `HellionChat`.** Eigener Slot in `pluginConfigs/`, eigenes Datei-Manifest, kein Shared State mit Chat 2. Parallel-Load mit Upstream Chat 2 wird beim Start aktiv geblockt (bilinguale Konflikt-Meldung).
+- **IPC-Kanäle sind `HellionChat.*`.** Sechs Kanäle für Drittplugin-Anbindung (`Register`, `Available`, `Unregister`, `Invoke`, `GetChatInputState`, `ChatInputStateChanged`). Details in [`docs/IPC.md`](docs/IPC.md).
+- **Hellion-eigene Strings in `HellionStrings.*.resx`,** übernommene Strings aus dem Chat-2-Bestand in `Language.*.resx`. Die Original-`Language.*.resx` bleibt strukturell erhalten, weil die existierenden Übersetzungen aus dem Crowdin-Bestand der Upstream-Community weiter wertvoll sind.
+- **Kein Direkt-Eingriff in `Plugin.Interface.UiBuilder.FontAtlas`** außerhalb von `FontManager`. Font-Fallback und Hellion-Font laufen zentral.

 ---

@@ -143,9 +157,9 @@ Pfad: `pluginConfigs/HellionChat/chat-sqlite.db`. WAL-Modus, Synchronous=NORMAL.

 ---

-## Installation (Tester)
+## Installation

-Hellion Chat wird während der Bootstrap-Phase über ein Dalamud-**Custom-Repository** verteilt.
+Hellion Chat wird über ein Dalamud-**Custom-Repository** verteilt.

 ### Frische Installation (kein Chat 2 vorher)

@@ -155,14 +169,14 @@ Hellion Chat wird während der Bootstrap-Phase über ein Dalamud-**Custom-Reposi
   https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/repo.json
   ```
 3. **Save**, dann in `/xlplugins` → **All Plugins** → Refresh.
-4. **Hellion Chat** taucht in der Liste auf — installieren.
+4. Hellion Chat taucht in der Liste auf, dann installieren wie jedes andere Plugin.

 ### Migration aus Chat 2 (mit bestehendem Verlauf)

 Chat 2 und Hellion Chat teilen sich die Datenbank-Datei, bis Hellion Chat sie beim ersten Start in den eigenen Pfad verschiebt. Die Reihenfolge ist wichtig:

 1. **Chat 2 deaktivieren** in `/xlplugins` (nicht deinstallieren, nur deaktivieren).
-2. **FFXIV komplett schließen**, damit SQLite die Datei-Sperre freigibt. Plugin-Reload allein reicht nicht.
+2. **FFXIV komplett schließen,** damit SQLite die Datei-Sperre freigibt. Plugin-Reload allein reicht nicht.
 3. Spiel neu starten.
 4. Custom-Repo wie oben hinzufügen.
 5. Hellion Chat installieren. Beim ersten Start wandert die Konfigurations-Datei und das gesamte Datenbank-Verzeichnis in das HellionChat-Layout.
@@ -193,61 +207,51 @@ Spiel starten, Hellion Chat aktivieren, Verlauf ist zurück.

 ### Updates

-Updates erscheinen automatisch in der Plugin-Liste, sobald ein neuer `v0.X.Y`-Tag mit GitHub-Release publiziert ist. Keine Neu-Installation nötig.
+Updates erscheinen automatisch in der Plugin-Liste, sobald ein neuer `vX.Y.Z`-Tag mit GitHub-Release publiziert ist. Keine Neu-Installation nötig.

 ---

 ## Distribution

-Hellion Chat wird über ein eigenes Dalamud-Custom-Repository verteilt
-(`repo.json` im Repo-Root). Tag-Pushes auf `vX.Y.Z` lösen den
-[`release.yml`](.github/workflows/release.yml)-Workflow aus, der den
-Build-Output (`HellionChat/bin/Release/HellionChat/latest.zip`) plus den
-passenden Changelog-Block aus `HellionChat.yaml` an das GitHub-Release
-hängt. Manueller Recovery-Pfad bei verpasstem Auto-Trigger:
-`gh workflow run release.yml -f tag=vX.Y.Z`.
+Hellion Chat wird über ein eigenes Dalamud-Custom-Repository verteilt (`repo.json` im Repo-Root). Tag-Pushes auf `vX.Y.Z` lösen den [`release.yml`](.github/workflows/release.yml)-Workflow aus, der den Build-Output (`HellionChat/bin/Release/HellionChat/latest.zip`) plus den passenden Changelog-Block aus `HellionChat.yaml` an das GitHub-Release hängt. Manueller Recovery-Pfad bei verpasstem Auto-Trigger: `gh workflow run release.yml -f tag=vX.Y.Z`.

-Eine optionale Submission ans Dalamud-Main-Plugin-Repo (zusätzlich zum
-eigenen Custom-Repo) steht in der [Roadmap](docs/ROADMAP.md).
+Eine optionale Submission ans Dalamud-Main-Plugin-Repo (zusätzlich zum eigenen Custom-Repo) steht in der [Roadmap](docs/ROADMAP.md).

 ---

 ## Projektstatus

-**Version 1.0.0** — Standalone-Cut live (Stand: 2026-05-04).
+**Version 1.1.0** — Theme-Engine live, Standalone-Cut abgeschlossen (Stand: 2026-05-04).

-Mit v1.0.0 ist Hellion Chat ein eigenständiges Plugin, kein Fork mehr im
-Repository-Sinne. Vollständig abgeschlossen:
+Hellion Chat ist ein eigenständiges Plugin, kein Fork mehr im Repository-Sinne. Vollständig abgeschlossen:

 - Privacy-Filter (Whitelist, Retention, retroaktive Cleanup, Export)
 - First-Run-Wizard mit drei Profilen
 - Plugin-Identity: eigener `HellionChat`-Slot, Layout-Migration aus Chat 2, Migrate3-Recovery
- Bilinguale UI (EN + DE) mit Live-Sprachwechsel
+- Bilinguale UI (EN und DE) mit Live-Sprachwechsel
 - Hellion-Theme, Hellion-Logo, gebündelter Exo-2-Font
 - Custom-Repo-Pipeline mit automatisierter GitHub-Release-Distribution
- Slash-Commands auf die `/hellion`-Familie konsolidiert
+- Slash-Commands auf die `/hellionchat`-Familie konsolidiert
 - Webinterface entfernt (v0.2.0)
 - Audit-Hardening (Path-Traversal, Retention-Race, DbViewer-Konsistenz)
- About-Tab im Hellion-Branding, EN + DE lokalisiert, mit License und Disclaimer
+- About-Tab im Hellion-Branding, EN und DE lokalisiert, mit License und Disclaimer
 - AI-Disclosure dokumentiert (siehe [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md))
 - Standalone-Cut: Namespace `HellionChat.*`, IPC-Kanäle `HellionChat.*`, Source-Tree-Restructure, Conflict-Detection gegen Upstream Chat 2, SQLite-CVE-Härtung (3.50.3)
+- Theme-Engine mit fünf eingebauten Themes plus JSON-Authoring-Format (v1.1.0)

-Was als Nächstes geplant ist und welche Themen langfristig auf der Liste
-stehen, steht in [`docs/ROADMAP.md`](docs/ROADMAP.md). Konkrete
-eingeplante Items werden zusätzlich im
-[GitHub-Issue-Tracker](https://github.com/JonKazama-Hellion/HellionChat/issues)
-mit dem `roadmap`-Label geführt.
+In Arbeit: schrittweise Modernisierung des UI-Look-and-Feel über die Theme-Engine hinaus. Was als Nächstes geplant ist und welche Themen langfristig auf der Liste stehen, steht in [`docs/ROADMAP.md`](docs/ROADMAP.md). Konkrete eingeplante Items werden zusätzlich im [GitHub-Issue-Tracker](https://github.com/JonKazama-Hellion/HellionChat/issues) mit dem `roadmap`-Label geführt.

 ### Zur Release-Kadenz

-Wer den Repo zum ersten Mal sieht, bemerkt schnell viele Releases und sehr viele Commits in kurzer Zeit. Beides ist eine bewusste Entscheidung, keine KI-Slop-Symptomatik: Vorarbeit vor dem Fork (Issues und Commits gelesen, Chat 2 ingame genutzt), eine sauber strukturierte Upstream-Codebase als Fundament, atomare Commits im Stil des Upstream und AI-gestütztes Review-Sparring, das ich nicht blind übernehme. Die volle Begründung steht in [`docs/LEARNING-JOURNEY.md`](docs/LEARNING-JOURNEY.md), Sektion "Wie ich so schnell release".
+Wer den Repo zum ersten Mal sieht, bemerkt schnell viele Releases und sehr viele Commits in kurzer Zeit. Beides ist eine bewusste Entscheidung. Die volle Begründung mit den vier Faktoren dahinter steht in [`docs/LEARNING-JOURNEY.md`](docs/LEARNING-JOURNEY.md), Sektion "Wie ich so schnell release".

 ---

-## Community & Support
+## Community und Support

 - **Hellion Forge Discord** (Modding- und Plugin-Community von Hellion Online Media): https://discord.gg/X9V7Kcv5gR
 - Bug-Reports und Feature-Requests: [GitHub Issues](https://github.com/JonKazama-Hellion/HellionChat/issues)
+- Discord DM: `@j.j_kazama`
 - Weitere Kontaktwege (Security, Privacy, Quick-Questions): siehe [SUPPORT.md](SUPPORT.md)

 ---
@@ -261,9 +265,9 @@ EUPL-1.2 (gleiche Lizenz wie Upstream Chat 2). Volltext in [LICENSE](LICENSE), C

 ### Acknowledgments

- **Infi & Anna (ascclemens)** — die Chat-2-Engine, ohne die dieser Fork nicht existieren würde.
- **Dalamud-Team** — das Plugin-Framework.
- **Chat-2-Crowdin-Community** — Übersetzungen der Upstream-Strings (siehe Settings → Info → "Chat 2 community translators").
+- **Infi und Anna (ascclemens)** für die Chat-2-Engine, ohne die dieser Fork nicht existieren würde.
+- **Dalamud-Team** für das Plugin-Framework.
+- **Chat-2-Crowdin-Community** für die Übersetzungen der Upstream-Strings (siehe Settings → Info → "Chat 2 community translators").

 ### FFXIV-Disclaimer

@@ -277,8 +281,7 @@ Siehe [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md) für die Pair-Level-Discl

 ## Projekt-Dokumente

-Im Repo-Root liegen die Standard-Repository-Dokumente, vertiefende
-Dokumentation lebt unter [`docs/`](docs/).
+Im Repo-Root liegen die Standard-Repository-Dokumente, vertiefende Dokumentation lebt unter [`docs/`](docs/).

 ### Repo-Root

@@ -302,10 +305,11 @@ Dokumentation lebt unter [`docs/`](docs/).
 | [`docs/CONTRIBUTORS.md`](docs/CONTRIBUTORS.md) | Tester, Übersetzer und Code-Beiträger der Hellion-Seite. |
 | [`docs/LEARNING-JOURNEY.md`](docs/LEARNING-JOURNEY.md) | Entwicklungsgeschichte, vom Web-Stack zu C# / Dalamud, was ich aus dem Fork gelernt habe. |
 | [`docs/IPC.md`](docs/IPC.md) | IPC-Kanal-Reference, Tuple-Payload-Felder, Migrations-Diff für Drittplugins. |
+| [`docs/THEME-AUTHORING.md`](docs/THEME-AUTHORING.md) | Theme-Engine-Authoring-Guide (EN): JSON-Schema, Color- und Layout-Slots, Channel-Identity-Regeln, Validierung. |
 | [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md) | Cherry-Pick-Policy gegenüber Chat 2. |
 | [`docs/THIRD_PARTY_NOTICES.md`](docs/THIRD_PARTY_NOTICES.md) | NuGet-Dependencies mit Lizenzen, Bundled Assets, Network-Status pro Komponente. |
 | [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md) | Offenlegung der KI-Unterstützung im Entwicklungsprozess. |

 ---

-**Hellion Online Media** | Bad Harzburg | [hellion-media.de](https://hellion-media.de)
+Entwickelt unter **Hellion Forge**, der Modding- und Plugin-Linie von **Hellion Online Media** | Bad Harzburg | [hellion-media.de](https://hellion-media.de)
@@ -1,49 +1,55 @@
-# Security policy
+# Security Policy

-## Reporting a vulnerability
+## Reporting a Vulnerability

-If you find a security issue in HellionChat, please do not open a public
-GitHub issue. Use one of the private channels below instead so we can
-investigate and ship a fix before the details go out.
+If you find a security issue in HellionChat, please do not open a
+public GitHub issue. Use one of the private channels below so I can
+investigate and ship a fix before the details go public.

 **Preferred:**
 [Privately report a vulnerability](https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new)
-through GitHub's Security Advisories. This routes the report directly to
-me and keeps the conversation off the public timeline.
+via GitHub Security Advisories. This routes the report directly to me
+and keeps the conversation off the public timeline.

 **Alternative:**
- Email: `kontakt@hellion-media.de`
- Discord: `@j.j_kazama`
+
+| Channel    | Address                    |
+| ---------- | -------------------------- |
+| Email      | `kontakt@hellion-media.de` |
+| Discord DM | `@j.j_kazama`              |

 I respond on weekdays during European business hours. For urgent
 disclosures (active exploitation, user-data exposure) email is the
 fastest path.

-## What I treat as in scope
+## Scope

- Code paths in HellionChat that touch user-controlled input (chat
-  messages, plugin config, file paths the user can influence)
- The privacy filter in MessageStore.cs and the export pipeline
- The Configuration migration logic
- The EmoteCache HTTP client and path handling
+### In scope
+
+- Code paths that touch user-controlled input (chat messages, plugin
+  config, file paths the user can influence)
+- The privacy filter in `MessageStore.cs` and the export pipeline
+- The configuration migration logic
+- The `EmoteCache` HTTP client and path handling
 - The Auto-Tell-Tabs spawn logic and history preload

-## What is not in scope
+### Out of scope

- Issues in upstream Chat 2 that we have not modified — please report
+- Issues in upstream Chat 2 that HellionChat has not modified — report
  those at <https://github.com/Infiziert90/ChatTwo/issues>
- Issues in Dalamud itself — those go to <https://github.com/goatcorp/Dalamud>
+- Issues in Dalamud itself — those go to
+  <https://github.com/goatcorp/Dalamud>
 - Issues in the FFXIV game client
- Anything that needs the user to install a malicious plugin first
+- Anything that requires the user to install a malicious plugin first

-## Acknowledgement
-
-I list everyone who reports a real issue in the changelog of the release
-that fixes it, unless they prefer to stay anonymous. No bug bounty,
-nothing financial; this is a hobby plugin.
-
-## Disclosure window
+## Disclosure Window

 I aim to ship a fix within 14 days for high-severity issues and within
 30 days for everything else. If a fix needs more time I will say so in
 the private thread.
+
+## Credits
+
+Everyone who reports a real issue gets listed in the changelog of the
+release that fixes it, unless they prefer to stay anonymous. No bug
+bounty, nothing financial — this is a hobby plugin.
@@ -1,8 +1,6 @@
 # Support

-HellionChat is a small hobby project maintained by one person. There
-are a few different paths depending on what you need; please pick the
-one that matches.
+HellionChat is a small hobby project maintained by one person. There are a few different paths depending on what you need. Pick the one that matches.

 ## Bugs and feature requests

@@ -11,43 +9,36 @@ GitHub issues, using the templates:
 - [Bug report](https://github.com/JonKazama-Hellion/HellionChat/issues/new?template=bug_report.yml)
 - [Feature request](https://github.com/JonKazama-Hellion/HellionChat/issues/new?template=feature_request.yml)

-Please search [existing issues](https://github.com/JonKazama-Hellion/HellionChat/issues?q=is%3Aissue)
-first. Duplicates get closed and pointed at the original.
+Please search [existing issues](https://github.com/JonKazama-Hellion/HellionChat/issues?q=is%3Aissue) first. Duplicates get closed and pointed at the original.

 ## Security

-Do **not** open a public issue for security-relevant findings. Use
-the private advisory route described in [SECURITY.md](SECURITY.md):
+Do **not** open a public issue for security-relevant findings. Use the private advisory route described in [SECURITY.md](SECURITY.md):

 - [Private vulnerability advisory](https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new)
 - Email `kontakt@hellion-media.de`

 ## Privacy questions

-Specific questions about what HellionChat does or does not store and
-send are covered in [PRIVACY.md](PRIVACY.md). For follow-ups beyond
-that document:
+Specific questions about what HellionChat does or does not store and send are covered in [PRIVACY.md](PRIVACY.md). For follow-ups beyond that document:

 - Email `kontakt@hellion-media.de`

 ## Quick questions and casual feedback

- **Hellion Forge Discord** — community for HellionChat and other
-  Hellion Online Media plugins/tools: https://discord.gg/X9V7Kcv5gR
- Discord DM `@j.j_kazama`
+- **Hellion Forge Discord** (community for HellionChat and other Hellion Online Media plugins and tools): https://discord.gg/X9V7Kcv5gR
+- Discord DM: `@j.j_kazama`

-Bug reports still go through the issue tracker so they can be tracked,
-but a quick "is this a bug or am I holding it wrong" message is fine.
+Bug reports still go through the issue tracker so they can be tracked, but a quick "is this a bug or am I holding it wrong" message is fine.

 ## Upstream Chat 2 issues

-If the issue exists in upstream Chat 2 too, please report it at
-[Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo/issues).
-That keeps the original maintainers in the loop and helps everyone
-who uses Chat 2 directly.
+If the issue exists in upstream Chat 2 too, please report it at [Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo/issues). That keeps the original maintainers in the loop and helps everyone who uses Chat 2 directly.

 ## Response times

-Weekdays during European business hours. Weekends and FFXIV patch
-days, replies will be slower. A few days of silence on a non-urgent
-issue is normal; pinging once after a week is fine.
+Weekdays during European business hours. On weekends and FFXIV patch days, replies will be slower. A few days of silence on a non-urgent issue is normal. Pinging once after a week is fine.
+
+---
+
+Maintained under **Hellion Forge**, the modding and plugin line of **Hellion Online Media** | Bad Harzburg | [hellion-media.de](https://hellion-media.de)
@@ -1,19 +1,18 @@
-# AI assistance disclosure
+# AI Assistance Disclosure

-This fork uses AI assistance per the [Dalamud Plugin AI Usage Policy](https://github.com/goatcorp/DalamudPluginsD17/)
+HellionChat uses AI assistance per the
+[Dalamud Plugin AI Usage Policy](https://github.com/goatcorp/DalamudPluginsD17/)
 at the **Pair** level.

-A note up front: Hellion Chat is currently in a rebuild and adjustment
-phase, and there are no plans to submit it to the Dalamud team for review
-while it stays standalone. If the plugin stays out of the official repo I
-technically wouldn't need to disclose any of this, but I'd rather be
-upfront about how it's built.
+A note up front: HellionChat is currently not submitted to the official
+Dalamud plugin repository and technically has no obligation to disclose
+this. I would rather be upfront about how it is built.

-Hellion Chat is my entry point into game modding and plugin development. I
-have never written a plugin for a game before. I work alone, so I get help
-where I need it. That's not something I want to hide.
+HellionChat is my entry point into game modding and plugin development.
+I have never written a plugin for a game before. I work alone, so I get
+help where I need it. That is not something I want to hide.

-## How I actually work
+## How I Actually Work

 I plan the architecture, decide what gets built, and own every design
 decision. For each change I:
@@ -23,55 +22,64 @@ decision. For each change I:
 - Read the Dalamud log output to verify behaviour
 - Run security and privacy audits on anything that touches user data

-One of the main reasons I use AI is consistency. I want the Hellion code to
-match the style of the upstream Chat 2 codebase and stay readable for
-anyone who opens the repo, not just for me. Claude helps me catch when I'm
-drifting from upstream conventions or writing something that only makes
-sense in my own head.
+One of the main reasons I use AI is consistency. I want the HellionChat
+code to match the style of the upstream Chat 2 codebase and stay
+readable for anyone who opens the repo, not just for me. Claude helps
+me catch when I am drifting from upstream conventions or writing
+something that only makes sense in my own head.

 The balance is shifting toward more hand-written work as I get more
 comfortable with Dalamud and plugin development in general.

-## What AI is used for
+## What AI Is Used For

- API explanations (Dalamud, ImGui, .NET specifics I haven't worked with before)
+- API explanations (Dalamud, ImGui, .NET specifics I have not worked
+  with before)
 - Code drafts that I read, edit, and integrate
 - Pattern suggestions and code review
- Keeping the style aligned with the upstream Chat 2 codebase
+- Keeping style aligned with the upstream Chat 2 codebase

-## What AI isn't used for
+## What AI Is Not Used For

- **Visual assets.** Logos, icons, banners, and screenshots are human-drawn
-  or taken from the running game.
+- **Visual assets.** Logos, icons, banners, and screenshots are
+  human-drawn or taken from the running game.
 - **German translations.** Written by me as a native speaker.

-## What's where
+## What Is Where

-Upstream Chat 2 (by Infi & Anna, EUPL-1.2) is the foundation and was not
-produced with AI assistance. Hellion-specific code lives in
-`HellionChat/Privacy/`, `HellionChat/Export/`, `HellionChat/Resources/HellionStrings*`,
-`Ui/SettingsTabs/Privacy.cs`, `Ui/FirstRunWizard.cs`, `Ui/HellionStyle.cs`,
-plus the Migrate3 recovery and plugin layout migration in `MessageStore.cs`
-and `Plugin.cs`. These were developed with Pair-level assistance as
+Upstream Chat 2 (by Infi & Anna, EUPL-1.2) is the foundation and was
+not produced with AI assistance. HellionChat-specific code lives in
+`HellionChat/Privacy/`, `HellionChat/Export/`,
+`HellionChat/Resources/HellionStrings*`, `Ui/SettingsTabs/Privacy.cs`,
+`Ui/FirstRunWizard.cs`, `Ui/HellionStyle.cs`, plus the Migrate3
+recovery and plugin layout migration in `MessageStore.cs` and
+`Plugin.cs`. These were developed with Pair-level assistance as
 described above.

-## If AI-assisted development is a dealbreaker for you
+## If AI-Assisted Development Is a Dealbreaker for You

-Fair enough. There are solid alternatives that don't rely on AI in their
-development:
+Fair enough. There are solid alternatives:

- [Chat 2](https://github.com/Infiziert90/ChatTwo), the original upstream
-  this fork is based on
+- [Chat 2](https://github.com/Infiziert90/ChatTwo), the upstream
+  project HellionChat is built on
 - [XIV Instant Messenger](https://github.com/NightmareXIV/XIVInstantMessenger),
-  a different approach to chat in FFXIV
+  a different approach to FFXIV chat

 Both are good projects. Use what fits you best.

 ## Tooling

- Claude (Anthropic) via Claude Code CLI
- Context7 / Microsoft Learn for current Dalamud and .NET documentation
+| Tool | Purpose |
+| ---- | ------- |
+| [Claude](https://claude.ai) (Anthropic) | Pair-level AI assistance via Claude Code CLI |
+| [VS Code](https://code.visualstudio.com) + C# Dev Kit | Primary IDE |
+| Dedicated Windows 11 VM | Build and in-game test environment (Dalamud requires Windows) |
+| [dalamud.dev](https://dalamud.dev) | Dalamud API reference |
+| [Microsoft Learn](https://learn.microsoft.com) | .NET and C# documentation |
+| [Context7](https://context7.com) | Up-to-date library docs for Claude context |
+| [Stack Overflow](https://stackoverflow.com) | General C# and .NET problem-solving |

 ## Contact

-Questions about this disclosure: <https://github.com/JonKazama-Hellion/HellionChat/issues>.
+Questions about this disclosure:
+<https://github.com/JonKazama-Hellion/HellionChat/issues>
@@ -12,6 +12,125 @@ und verlinkt für Details auf die Release-Pages.

 ---

+## v1.2.2 — Theme Expansion (2026-05-07)
+
+### Added
+- Four new built-in themes:
+  - **Night Blue** — Royal Blue on deep marine, cool tech-dashboard mood
+  - **Indigo Violet** — Royal Violet on deep indigo with a turquoise-mint counter (aurora glitter feel)
+  - **Forge Merchantman** — Patina bronze on workshop slate with warm amber counter (Hellion Forge identity)
+  - **Hellion Spectrum** — Deuteran/Protan-safe channel colours using Wong/Okabe-Ito palette tones; channel identity (Tell pink, Yell yellow, Shout orange, Party blue, FC green) preserved while keeping every channel separable under red-green colour vision deficiency
+- Built-in theme catalogue grown from five to nine
+
+### Notes
+- No engine changes, no settings touched, no migration
+- Default theme unchanged (Hellion Arctic). Existing custom themes keep working.
+- Hellion Spectrum covers the ~99 % of CVD cases that are red-green; a Tritan-safe variant could follow in a later cycle if there is demand.
+
+---
+
+## v1.2.1 — Settings Cleanup (2026-05-06)
+
+### Changed
+- Settings cards re-sorted thematically: 9 cards remain, each card has one clear job and a one-line subtitle.
+- **Theme & Layout** (new) collects the theme picker, window frame style (title bar, sidebar, hide button, pop-out title bar) and the timestamp style options.
+- **Fonts & Colours** (new) houses font choice, font size and per-channel chat colours.
+- **Data Management** (new) collects retention windows, cleanup, export, the database viewer and the shift-click advanced tools.
+- **Privacy** is now focused on the privacy filter alone.
+- **Chat** absorbs the Auto-Tell-Tabs history-preload slider that used to live under Privacy.
+- **General** groups the keybind mode under Input.
+
+### Removed
+- Legacy "Style override" option and the unused style-name field — both obsolete since the v1.1.0 themes engine.
+- Legacy `WindowAlpha` slider — if you had it set, the value is auto-migrated to Theme & Layout → Window Style → Window Transparency.
+- Unused `ShowThemeQuickPicker` schema field.
+
+### Migration
+- v15 → v16 with backup at `pluginConfigs/HellionChat.json.pre-v16-backup`.
+- All other settings preserved unchanged.
+- One-time toast on first start if Style override was previously active.
+
+---
+
+## v1.2.0 — Layout Refresh (2026-05-05)
+
+### Added
+- Sidebar tab modernization: icon-only at fixed 44 px, tooltip on hover, vertical accent pill for active tab
+- Top tabs: accent underline pill replaces background fill on active tab
+- Per-tab custom icons in Settings → Tabs (15-glyph FontAwesome picker)
+- Bottom status bar (22 px): channel indicator, privacy badge, counters, tells, version — updates 1×/sec
+- Card rows as default message render: sender header in channel color, subtle border between cards
+- Compact-Density toggle in Appearance: switches back to single-line `[HH:mm] Sender: Text` layout
+- Auto-Tell tabs: per-partner hashed icon (7-glyph pool: envelope/star/heart/bell/bookmark/flag/fire) plus hashed color (12-color palette) — 84 distinct icon+color combinations
+- Unread indicator: pulsing red dot in the top-right corner of any sidebar tab icon with unread messages, 2-second sine-wave pulse, respects `Configuration.ReduceMotion`
+
+### Changed
+- Migration v14 → v15: deprecated Configuration fields `HellionThemeEnabled` and `HellionThemeWindowOpacity` removed
+- Appearance settings cleaned: legacy theme-engine bindings replaced by Themes tab (introduced in v1.1.0)
+
+### Fixed
+- Settings save no longer wipes chat history by default — the heavy `ClearAllTabs + FilterAllTabsAsync` cycle now only runs when a filter-relevant setting actually changed (Privacy filter, persisted channels, per-tab channel selection). Cosmetic changes keep the in-session chat intact
+- Identifier-based `MessageList` restore in `Configuration.UpdateFrom` plus TempTab skip in `ClearAllTabs`/`FilterAllTabs` ensure persistent tabs and Auto-Tell tabs both survive the save
+- Sidebar buttons now align vertically with the first message row (top padding mirrors the chat header toolbar height)
+- Sidebar child window no longer paints the top padding area with its frame background
+- Status bar version slot (`vX.Y.Z · Hellion`) no longer clips its rightmost character
+
+### Notes
+- Polish phase (animations, theme crossfade, header quick-picker) follows in v1.3.0
+- Top-Tab icon prefixes were considered but dropped: Dalamud's default font atlas does not include FontAwesome codepoints, so mixed-font in a single TabItem label renders as tofu. Underline pill alone is the v1.2.0 visual treatment for top tabs. Resolution would require Font-Atlas merge at FontManager level — out of scope.
+
+## [1.1.0] — 2026-05-05 — Theme Foundation
+
+Erster großer UI-Cycle nach v1.0.0. Theme-Engine, fünf Built-In-Themes,
+Custom-Themes via JSON, Settings-Card-Grid.
+
+### Hinzugefügt
+
+- **Theme-Engine** mit fünf Built-In-Themes: Hellion Arctic (Default),
+  Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove.
+- **Settings → Themes** mit Mini-Mockup-Preview pro Theme. Klick auf
+  eine Card switcht sofort das ganze Plugin (Chat, Settings, Pop-Out).
+- **Custom-Themes via JSON** in `pluginConfigs/HellionChat/themes/`.
+  Beim ersten Start wird `example-theme.json` als Vorlage abgelegt.
+- **Optional Theme-Chat-Channel-Colors**: Themes können eigene
+  Channel-Farben mitliefern. Beim Switch erscheint ein Banner mit
+  *Übernehmen / Behalten* — nie automatisch.
+- **Settings-Card-Grid**: neue Übersicht beim Öffnen, Card-Klick führt
+  in die Detail-Ansicht der Section. Breadcrumb + ESC führen zurück.
+- **`docs/THEME-AUTHORING.md`** als Anleitung zum Schreiben eigener
+  Themes, mit Hellion-Forge-Branding.
+
+### Geändert
+
+- **Plugin-Icon** auf Hellion Forge Hammer (vorher ChatTwo-Derivat).
+- **Settings-Detail-View** verwendet die volle Breite — die zweite
+  Tab-Liste links ist weg, weil die Card-Übersicht den Wechsel
+  übernimmt.
+- **`HellionStyle.PushGlobal`** ist jetzt theme-driven (`PushGlobal(theme,
+  opacity)`) statt const-palette-driven.
+- **Configuration v13 → v14**: alle User landen auf `hellion-arctic`.
+  Wer den Upstream-Look will, wählt `chat2-classic` in Settings →
+  Themes.
+
+### Veraltet
+
+- `Configuration.HellionThemeEnabled` und `HellionThemeWindowOpacity`
+  bleiben für ein Release lesbar als Safety-Net, werden aber nicht
+  mehr ausgewertet. Entfernung geplant in v1.2.0.
+
+### Sicherheit
+
+- Custom-Theme-JSON-Loader prüft `schemaVersion`, Pflichtfelder und
+  Hex-Format. Ungültige Themes werden mit Warning übersprungen, das
+  Plugin lädt mit Built-Ins weiter.
+
+### Intern
+
+- 51 lokale Unit-Tests (Theme-Records, Registry, JSON-Round-Trip,
+  Sanity pro Built-In-Theme). Tests sind gitignored.
+
+---
+
 ## [1.0.3] — 2026-05-04 — Polish patch

 Vier kleine Polish-Items aus dem Backlog gebündelt:
@@ -12,22 +12,48 @@ Privacy-First-Schnittmenge des Plugins erweisen.

 ---

-## Nächster Cycle (v1.1.0)
+## Nächster Cycle (v1.3.0)
+
+**Polish & Motion** — Theme-Crossfade, Header-Quick-Picker,
+Lerp-Animationen, ggf. Theme-Family-Picker (Carls Grün-Familie
+mit Forest/Moss/Mint-Helligkeitsstufen).
+
+Spec wird im Brainstorming-Cycle vor Beginn der Phase ausgearbeitet.
+
+## v1.2.2 — Theme Expansion (geplant 2026-05-07)
+
+Vier neue Built-In-Themes: Night Blue, Indigo Violet, Forge
+Merchantman, Hellion Spectrum (Deuteran/Protan-safe).
+Keine Engine-Änderungen. Siehe `docs/CHANGELOG.md`.
+
+## v1.2.1 — Settings Cleanup (released 2026-05-06)
+
+Re-sortierte Settings (9 Cards thematisch), 4 tote Settings entfernt,
+Auto-Migration v15 → v16 ohne Daten-Verlust.
+
+## v1.2.0 — Layout Refresh (released 2026-05-05)
+
+Top-Tabs-Refresh, Sidebar-Tab-Icons, Bottom-Status-Bar, Card-Rows als
+Default-Message-Render, Auto-Tell-Tab-Hashing.
+
+## v1.1.0 — Theme Foundation (released 2026-05-05)
+
+Theme-Engine mit fünf Built-In-Themes, Settings-Card-Grid, Custom-
+Themes via JSON, Theme-Authoring-Doku. Plugin-Icon auf Hellion Forge.
+Siehe `docs/CHANGELOG.md` für Details.
+
+Aus dem ursprünglichen v1.1.0-Plan (Ad-Block / Spam-Filter, Receive-
+Suppressed-Tells-Toggle) wurden zugunsten der Theme-Engine zurück
+gestellt — beide Items leben weiter im Mittelfrist-Block.
+
+## Mittelfristig (v1.2.x – v1.3.0)

 - **Ad-Block / Spam-Filter** — Hybrid-Konzept aus eigenem Light-Filter und
  optionaler `NoSoliciting`-IPC-Integration. Adressiert Werbe-Spam in
-  öffentlichen Channels und Tells. Größter Block des Cycles.
+  öffentlichen Channels und Tells. Aus dem v1.1.0-Plan zurückgestellt.
 - **Receive-Suppressed-Tells-Toggle** — Auto-Tell-Tabs greift auch wenn ein
  Drittplugin (z.B. XIVMessenger) die /tell-Anzeige global suppressed.
  Gleicher Hook-Layer wie Ad-Block, deshalb gebündelt.
-
-## Mittelfristig (v1.1.x – v1.2.0)
-
- **Plugin-weite Theme-Varianten** — über die ChatColours-Presets aus v0.6.0
-  hinaus. Mehrere komplette Window-Themes (Frame, Surface, Border, Text)
-  inkl. Farbfamilien mit Helligkeits-Abstufungen. Anknüpfung an
-  Hellion-Online-Media-Brand-Themes (Event Horizon, Night Blue, Indigo Violet
-  und weitere).
 - **Database-Viewer Inline-Search** — Volltext-Suche im DB-Viewer via
  SQLite FTS5. Aktuell gibt es nur Datums- und Channel-Filter.
 - **TempTell Persistence** — Pin-Toggle auf TempTell-Tabs damit ausgewählte
@@ -0,0 +1,185 @@
+<p align="center">
+  <img src="images/hellion-forge.png" alt="Hellion Forge" width="180" />
+</p>
+
+# Theme Authoring Guide
+
+> Built by **Hellion Forge** — the plugin workshop arm of [Hellion Online Media](https://hellion-media.de). HellionChat ships with nine built-in themes; this guide walks you through writing your own.
+
+## TL;DR
+
+1. Open Settings → Themes → **Open themes folder**
+2. Copy `example-theme.json` to `<your-name>.json` in the same folder
+3. Edit the file with any text editor
+4. Reload the plugin (toggle off/on in `/xlplugins`)
+5. Your theme appears in the Custom-Themes section in Settings → Themes
+
+That's the whole loop. The rest of this document is reference.
+
+## File location
+
+```
+%APPDATA%\XIVLauncher\pluginConfigs\HellionChat\themes\
+```
+
+(or the equivalent path on Linux/macOS — Settings → Themes → "Open themes folder" opens it directly).
+
+Each `*.json` file in this folder is loaded as one theme. The `example-theme.json` that HellionChat seeds on first launch is your starting template.
+
+## File format
+
+Theme JSON has four blocks:
+
+```json
+{
+  "schemaVersion": 1,
+  "slug": "your-slug",
+  "name": "Your Theme Name",
+  "author": "You",
+  "description": "One-line description shown under the theme name.",
+  "colors":   { ... 21 color slots ... },
+  "layout":   { ...  9 layout values ... },
+  "chatChannels": { ... optional, channel-name → hex ... }
+}
+```
+
+### Top-level fields
+
+| Field | Type | Required | Notes |
+|---|---|---|---|
+| `schemaVersion` | int | yes | Always `1` for HellionChat 1.1.0. The plugin warns and skips themes with a different number. |
+| `slug` | string | yes | Lowercase, hyphenated. Must be unique across all themes (built-in slugs are reserved). |
+| `name` | string | yes | Display name in the picker. |
+| `author` | string | yes | Shown small under the theme name. |
+| `description` | string | yes | One short sentence. |
+| `colors` | object | yes | All 21 slots required (see below). |
+| `layout` | object | yes | All 9 slots required (see below). |
+| `chatChannels` | object | no | Optional channel-name → hex map (see below). |
+
+### Color slots
+
+All values are 6-digit `#RRGGBB` or 8-digit `#RRGGBBAA` hex strings. Six-digit values get an implicit `FF` alpha.
+
+| Slot | Role |
+|---|---|
+| `primary` | Brand color — used on buttons, sliders, check marks, highlighted separators. |
+| `primaryDark` | Pressed-button stage. |
+| `primaryLight` | Hovered-button / link-text stage. |
+| `primaryGlow` | Glow / subtle accent (typically primary with ~60% alpha). |
+| `accent` | Counter-accent — scrollbar grab on hover/active, resize grip, optional CTA. |
+| `accentDark` / `accentLight` | Dark/light siblings of accent. |
+| `identity` | Title-bar active color and active-tab color. Often equals `primaryDark`. |
+| `windowBg` | Outermost window background. |
+| `childBg` | Inner panel / popup background. |
+| `frameBg` | Input fields, sliders, combos. |
+| `surface` | Card surfaces, headers, selectables. |
+| `surfaceHover` | Hovered card / header step. |
+| `border` | Panel borders. Typically primary with ~40% alpha for a brand-tinted edge. |
+| `textPrimary` | Body text. Soft off-white reads better than pure `#FFFFFF` on dark backgrounds. |
+| `textMuted` | Captions, secondary lines. |
+| `textDim` | Disabled / hint text, separators. |
+| `statusSuccess` | Green-ish for success notifications. |
+| `statusDanger` | Red for errors. |
+| `statusWarning` | Amber for warnings. |
+| `statusInfo` | Cyan-ish info. Often equals primary. |
+
+### Layout slots
+
+All values are floats in pixels. `BorderSize` is 0 or 1 (no thicker borders look right with ImGui's edge anti-aliasing).
+
+| Slot | Typical range | Notes |
+|---|---|---|
+| `windowRounding` | 0–8 | 0 = sharp upstream look; 4–6 = softer "app" feel. |
+| `childRounding` | 0–6 | Usually 1 less than `windowRounding`. |
+| `popupRounding` | 0–6 | Same as `childRounding`. |
+| `frameRounding` | 0–4 | For inputs, sliders. |
+| `grabRounding` | 0–4 | Slider grab dot. |
+| `tabRounding` | 0–4 | Tab corners. |
+| `scrollbarRounding` | 0–4 | Scrollbar grab. |
+| `windowBorderSize` | 0 or 1 | 1 reads better in dark themes. |
+| `frameBorderSize` | 0 or 1 | Usually matches windowBorderSize. |
+
+### Optional `chatChannels`
+
+If present, your theme proposes its own chat-channel colors. Property names are `ChatType` enum values (case-insensitive). Unknown names are skipped silently — safe for forward-compat.
+
+```json
+"chatChannels": {
+  "Say":             "#FFFFFF",
+  "Yell":            "#FFE066",
+  "Shout":           "#FFA040",
+  "TellIncoming":    "#FF99CC",
+  "TellOutgoing":    "#FF99CC",
+  "Party":           "#80C0E8",
+  "FreeCompany":     "#4DD9E8",
+  "NoviceNetwork":   "#A8E060",
+  "Linkshell1":      "#A8E060"
+}
+```
+
+The user is asked **once per theme switch** whether to apply these colors — never auto-overwriting existing picks. The banner shows up only if your suggested colors differ from the user's current `Configuration.ChatColours`.
+
+#### Channel-identity rule
+
+**Don't break FFXIV channel identity.** Players have used these conventions for over a decade:
+
+| Channel | Convention | Why |
+|---|---|---|
+| Say | white / off-white | Default-readable speech. |
+| Yell | yellow | Urgent broadcast. |
+| Shout | orange | Local urgent. |
+| Tell | pink-magenta | Whisper, must stand out. |
+| Party | light blue | Group ops. |
+| FreeCompany | cyan-teal | Guild ops. |
+| NoviceNetwork | lime-green | Mentor channel. |
+
+A theme can tint these toward its brand family (e.g., a purple theme can shift Tell from `#FF99CC` to `#E090FF`), but **don't** flip them (Tell suddenly green, Yell suddenly cyan). RP groups and combat-spec setups depend on the visual hierarchy.
+
+The eight colored built-in themes (Hellion Arctic, Hellion Spectrum, Event Horizon, Moonlit Bloom, Mint Grove, Night Blue, Indigo Violet, Forge Merchantman) all follow this rule — read their source for reference. Chat 2 Klassik intentionally ships without `chatChannels` so the user keeps their existing picks.
+
+## Theme families
+
+Naming convention `<color>-<modifier>` is recommended for theme families. The first member of a family is the lightest/brightest:
+
+- `mint-grove` (current built-in, light mint)
+- `forest-grove` (planned, dark emerald)
+- `moss-grove` (planned, mid muted)
+
+Code-wise families have no special handling — only the slug naming hints at the relationship. The picker may group families later, but that's not required.
+
+## Validation and errors
+
+When HellionChat loads your theme:
+
+- **Schema mismatch** (`schemaVersion != 1`): theme is skipped, warning written to `/xllog`.
+- **Missing required field** (e.g., no `slug`): theme is skipped, warning written.
+- **Invalid hex** (e.g., `#GGHHII`): theme is skipped, warning written.
+- **Unknown channel name** in `chatChannels`: that one channel is skipped silently, the rest of the theme loads normally.
+
+Check `/xllog` after a plugin reload to see what loaded and what didn't.
+
+## Testing your theme
+
+1. Edit the JSON, save the file.
+2. Reload the plugin: `/xlplugins` → toggle HellionChat off, then on.
+3. Settings → Themes → click your theme card.
+4. Watch every plugin window (chat, settings, pop-out) and pick something to fix.
+5. Tweak. Reload. Repeat.
+
+Tip: the **Settings → Themes** picker shows a mini-mockup per theme — your colors are visible before you switch.
+
+## Sharing themes
+
+Themes are JSON, so sharing is just a file. Drop it into someone's `pluginConfigs/HellionChat/themes/` folder and their plugin picks it up on next reload.
+
+A community theme repository is on the Hellion Forge roadmap. Until then: share via Discord or any pastebin.
+
+## Reference
+
+- `docs/example-theme.json` (seeded automatically on first launch into `pluginConfigs/HellionChat/themes/`) — minimal valid theme.
+- The five built-in themes live in source under `HellionChat/Themes/Builtin/`. They are a good reference for Color choices that work.
+- [Hellion Online Media branding](https://hellion-media.de) — the Arctic Cyan + Ember Glow palette that drives the default Hellion Arctic theme.
+
+---
+
+<p align="center"><sub>HellionChat is a privacy-focused fork of <a href="https://github.com/Infiziert90/ChatTwo">Chat 2</a>, distributed under the EUPL-1.2.<br/>Theme engine and authoring guide are part of <strong>Hellion Forge</strong>.</sub></p>
@@ -4,21 +4,22 @@ HellionChat ships and depends on a number of third-party components.
 This document lists them, their licences and which of them touch the
 network. It is the inventory referenced by `PRIVACY.md`.

-Last reviewed: 2026-05-03 (HellionChat v0.5.4).
+Last reviewed: 2026-05-05 (HellionChat v1.1.0).

 ---

 ## Direct NuGet dependencies

-Pinned in `HellionChat/HellionChat.csproj`. Versions reflect the v1.0.0 build.
+Pinned in `HellionChat/HellionChat.csproj`. Versions reflect the v1.1.0 build.

 | Package | Version | Licence | Network | Purpose |
 | --- | --- | --- | --- | --- |
 | [MessagePack](https://github.com/MessagePack-CSharp/MessagePack-CSharp) | 3.1.4 | MIT | no | Binary serialisation for the SQLite message store. |
 | [Microsoft.Data.Sqlite](https://learn.microsoft.com/dotnet/standard/data/sqlite/) | 10.0.7 | MIT | no | Local SQLite access for the message database. |
 | [morelinq](https://github.com/morelinq/MoreLINQ) | 4.4.0 | Apache-2.0 | no | LINQ helper extensions. |
-| [Pidgin](https://github.com/benjamin-hodgson/Pidgin) | 3.3.0 | MIT | no | Parser combinator library used for chat-input parsing. |
+| [Pidgin](https://github.com/benjamin-hodgson/Pidgin) | 3.5.1 | MIT | no | Parser combinator library used for chat-input parsing. CIString Unicode fix relevant for non-ASCII channel/tab names. |
 | [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) | 3.1.12 | [Six Labors Split License 1.0](https://github.com/SixLabors/ImageSharp/blob/main/LICENSE) (OSI-approved; free for open-source / non-commercial use, commercial licence required for closed-source commercial use) | no | Image decoding for cached emotes. |
+| [SQLitePCLRaw.lib.e_sqlite3](https://github.com/ericsink/SQLitePCL.raw) | 3.50.3 | MIT | no | Native SQLite binary, explicitly pinned to override the transitive default for CVE-2025-6965 (memory corruption from aggregate-term overflow) and CVE-2025-7709. |

 Six Labors note: HellionChat is an EUPL-1.2-licensed open-source
 project distributed at no cost. Use of ImageSharp 3.x under the
@@ -63,8 +64,10 @@ traffic is initiated explicitly by HellionChat's own source files
 and is documented in `PRIVACY.md` under "Outbound network calls":

 - `HellionChat/EmoteCache.cs` → BetterTTV API + CDN (opt-out via setting)
- `HellionChat/FontManager.cs` → Square Enix Lodestone font CDN (one-time
-  download)
+
+The earlier Square Enix Lodestone font download (`FontManager.cs`)
+was removed in v1.0.4 — it was a leftover from upstream's removed
+webinterface feature and was no longer consumed.

 ---

@@ -1,11 +1,34 @@
-# Upstream sync workflow
+# Upstream Sync

-HellionChat is a standalone EUPL-1.2 fork of [Chat 2](https://github.com/Infiziert90/ChatTwo).
-We pull selected patches from upstream manually instead of running an
-automated mirror. This file documents how that works so anyone (including
-future-me) can do it cleanly.
+HellionChat is a standalone EUPL-1.2 plugin that originated from
+[Chat 2](https://github.com/Infiziert90/ChatTwo). Since v1.0.0 it
+lives under its own namespace, IPC channels and source tree. I no
+longer track upstream as a Git fork, but I do monitor Chat 2 commits
+regularly and cherry-pick selectively where it makes sense.

-## One-time setup
+This document covers how that works so anyone (including future-me)
+can do it cleanly.
+
+## A Word on Intent
+
+HellionChat is not trying to replace Chat 2. I build it for myself,
+and maybe for people who want the same things I do: a privacy-first
+chat plugin with tighter defaults and no remote-access surface. If
+that is not you, Chat 2 is the better choice and a well-maintained
+project.
+
+I am available to Infi if he ever has questions about HellionChat or
+how I have diverged from the upstream code. What I will not do is
+interfere with Chat 2's direction or push unsolicited opinions into
+his project.
+
+Long-term compatibility between Chat 2 and HellionChat is not
+guaranteed and, frankly, not technically possible. I am building a
+new UI from scratch and making deliberate architectural decisions that
+pull in a different direction. Some upstream patches will simply stop
+applying cleanly and that is expected.
+
+## One-Time Setup

 Add the upstream repo as a remote on a fresh clone:

@@ -24,36 +47,42 @@ git remote -v
 # upstream  https://github.com/Infiziert90/ChatTwo.git (push)
 ```

-You never push to `upstream`. It is read-only for us.
+`upstream` is read-only. Never push to it.

-## Reviewing what is new upstream
+## Reviewing What Is New Upstream

-Before any feature cycle starts I run a quick check:
+Before any feature cycle I run a quick check:

 ```bash
 git fetch upstream
 git log --oneline main..upstream/main | head -30
 ```

-That shows every commit Infi or contributors landed since the last sync.
-Read the messages, decide which ones apply.
+That shows every commit Infi or contributors landed since the last
+sync. I read the messages and decide which ones apply to HellionChat.

-## What we cherry-pick
+## What I Cherry-Pick

-**Always:** security fixes, API-version compatibility patches (Dalamud
-API 15 → 16 → ...), BetterTTV / emote-cache fixes, regression fixes for
-the upstream behaviour we still rely on.
+**Always:** security fixes, Dalamud API compatibility patches,
+BetterTTV and emote-cache fixes, regression fixes for upstream
+behaviour HellionChat still relies on.

-**Sometimes:** small bug fixes in `MessageManager.cs`, `MessageStore.cs`,
-`ChatLogWindow.cs`, the Tabs system. Pull them when they touch code we
-have not heavily modified.
+**Sometimes:** small bug fixes in `MessageManager.cs`,
+`MessageStore.cs`, `ChatLogWindow.cs`, the Tabs system. These come in
+when they touch code I have not heavily modified.

-**Never:** webinterface changes (the entire webinterface tree is gone in
-HellionChat), changes that conflict with the privacy filter, changes that
-re-add upstream defaults we deliberately reversed (full-history logging,
-Tell Exclusive defaults, etc.).
+**Never:** webinterface changes (the entire webinterface tree is gone
+in HellionChat), changes that conflict with the privacy filter, changes
+that re-add upstream defaults I deliberately reversed (full-history
+logging, Tell Exclusive defaults, etc.).

-## How we cherry-pick
+As HellionChat's UI moves further from the Chat 2 baseline, upstream
+patches will increasingly require adaptation rather than a clean
+apply. If a patch cannot be ported without breaking HellionChat
+behaviour or the privacy model, I skip it rather than force a
+compromised version in.
+
+## How I Cherry-Pick

 Always with `-x` so authorship and the original commit hash stay
 visible:
@@ -63,48 +92,63 @@ git checkout -b sync/upstream-<topic> main
 git cherry-pick -x <upstream-commit-sha>
 ```

-`-x` adds a `(cherry picked from commit <sha>)` line to the commit
-message. That preserves the upstream-author credit and lets anyone
-reading `git log` trace the change back to ChatTwo. Co-Author trail
-intact, no AI lines, no "Hellion" prefix on commits that were not
-authored by us.
+`-x` appends a `(cherry picked from commit <sha>)` line to the commit
+message. That preserves upstream-author credit and lets anyone reading
+`git log` trace the change back to Chat 2. Commit messages stay
+identical to the upstream original; I do not rewrite them to match the
+HellionChat format.

-## Conflict handling
+## Conflict Handling

 When a cherry-pick conflicts:

-1. Resolve the conflict by hand. Do not "fix" upstream code to match
-   Hellion conventions; that is what the merge marker showed us.
+1. Resolve by hand. Do not rewrite upstream code to match HellionChat
+   conventions; that is what the merge marker showed.
 2. If the conflict is fundamental (touches code that no longer exists
-   in our fork), abort the cherry-pick and document why in
-   `Hellion Chat Backlog.md` instead. Some upstream patches are not
-   portable; that is fine.
-3. After a successful resolve, the commit message stays identical to
-   the upstream message, with the `-x` cherry-pick footer Git appends
-   automatically. Do not rewrite the message to match our format.
+   in HellionChat), abort the cherry-pick and note why in the
+   relevant GitHub issue or backlog item. Some upstream patches are
+   simply not portable and that is fine.
+3. After a clean resolve the commit message stays as-is, with the
+   `-x` footer Git appends automatically.

-## Pushing the sync
+## Pushing the Sync

-Cherry-picked commits go through the same review as our own work: the
-sync branch lands in `main` via a no-fast-forward merge, then a release
-tag if the user-visible behaviour changes (otherwise just merged).
+Cherry-picked commits go through the same review as any other change.
+The sync branch lands in `main` via a no-fast-forward merge, then gets
+a release tag if user-visible behaviour changed:

 ```bash
 git checkout main
 git merge --no-ff sync/upstream-<topic> -m "merge: upstream sync — <topic>"
 ```

-## When upstream goes silent
+## Contributing Back

-If Chat 2 stops receiving updates entirely we keep this workflow alive
-anyway. The remote stays configured, the documentation stays here. The
-moment maintenance picks back up we are ready to pull again.
+HellionChat benefits from Chat 2's work, so I try to give something
+back where I can. If I fix a bug or improve something that would be
+useful to Chat 2 and is not HellionChat-specific, I submit a
+good-will PR to [Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo).

-## When upstream takes a direction we cannot follow
+A few things to note about that process:

-If a future ChatTwo release breaks compatibility with our privacy
-philosophy in a way we cannot resolve (e.g. mandatory cloud sync,
-removal of the local message store, a license change that makes EUPL
-incompatible), HellionChat continues on its own from the last
-compatible cherry-pick. The history we already inherited stays under
-EUPL-1.2 and stays attributed.
+- Good-will PRs are validated in a separate fork first to make sure
+  the fix stands on its own without HellionChat context.
+- They are written by hand. No AI-generated code goes to Infi's
+  project. He did not ask for Pair-level AI involvement and I will
+  not push that decision onto his codebase.
+- This is not guaranteed for every change, only where it makes sense
+  and where I am confident the fix is clean and self-contained.
+
+## When Upstream Goes Silent
+
+If Chat 2 stops receiving updates the remote stays configured and this
+workflow stays documented. The moment maintenance picks back up I am
+ready to pull again.
+
+## When Upstream Takes a Direction I Cannot Follow
+
+If a future Chat 2 release breaks compatibility with the HellionChat
+privacy philosophy in a way that cannot be resolved (mandatory cloud
+sync, removal of the local message store, an incompatible license
+change), HellionChat continues from the last compatible cherry-pick.
+The inherited history stays under EUPL-1.2 and stays attributed.