chore(config): migrate Renovate config (#10)

Auto-merge: Renovate config migration (matchPackagePrefixes -> matchPackageNames).

.gitea/workflows/security.yml

@@ -0,0 +1,21 @@
+name: Security
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+  schedule:
+    - cron: '0 6 * * 1'
+  workflow_dispatch:
+
+jobs:
+  scan:
+    uses: JonKazama-Hellion/security-workflows/.gitea/workflows/security-scan.yml@main
+    with:
+      # MessageStore.cs uses string-interpolation in CommandText for table
+      # names and clause-joins that come from internal code constants, not
+      # user input. Values are bound via SqlParameter, the SQL surface is
+      # local-only inside a Dalamud plugin. Semgrep matches the pattern
+      # without dataflow, so it flags those eight call sites; CodeQL
+      # would not. Suppressed for this repo only.
+      semgrep-exclude-rules: 'csharp.lang.security.sqli.csharp-sqli.csharp-sqli'
+

.githooks/pre-push

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# .githooks/pre-push — invokes preflight.sh (A/B/C/D=build).
+exec scripts/preflight.sh

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -8,7 +8,7 @@ body:
       value: |
         Thanks for reporting. Please fill in the fields below so I can
         reproduce the issue. If this is a security issue, stop here and
-        use the [private vulnerability advisory](https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new)
+        report it privately to [kontakt@hellion-media.de](mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D)
         instead.
 
   - type: input

.github/ISSUE_TEMPLATE/config.yml

@@ -2,8 +2,8 @@ blank_issues_enabled: false
 
 contact_links:
   - name: Security vulnerability
-    url: https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new
+    url: mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
-    about: Do not open a public issue for security problems. Use the private advisory instead.
+    about: Do not open a public issue for security problems. Report by e-mail instead.
 
   - name: Upstream Chat 2 issue
     url: https://github.com/Infiziert90/ChatTwo/issues

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,9 +3,9 @@ Thanks for contributing to HellionChat. Please fill in the sections
 below so the review goes quickly. Delete sections that genuinely do
 not apply, but do not delete the whole template.
 
-If this is a security fix, stop here and use a private security
+If this is a security fix, stop here and report it privately by
-advisory instead:
+e-mail instead of opening a public PR:
-https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new
+mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
 -->
 
 ## Summary
@@ -23,7 +23,6 @@ https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new
 - [ ] Documentation only
 - [ ] Translation update
 - [ ] Build, CI or tooling change
-- [ ] Upstream cherry-pick from Chat 2
 
 ## Linked issue
 
@@ -53,7 +52,6 @@ new commands, new translations, removed behaviour. If none, write
   bump and is it covered by the existing migration tests?
 - Does this change the schema in MessageStore?
 - Does this change the repo.json or HellionChat.yaml manifest fields?
-- Does this affect the upstream cherry-pick path? See docs/UPSTREAM_SYNC.md.
 -->
 
 ## Checklist

.github/forge-posts/v1.1.0.md

@@ -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`

.github/forge-posts/v1.2.0.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.

.github/forge-posts/v1.2.1.md

@@ -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.

.github/forge-posts/v1.2.3.md

@@ -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.

.github/forge-posts/v1.3.0.md

@@ -0,0 +1,10 @@
+---
+subtitle: "Plugin Integrations: Honorific"
+versionsnatur: "Plugin-Integration-Cycle 1"
+---
+- Erste Plugin-Integration eingebaut, Cycle 1 von 6 auf der Roadmap
+- **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint jetzt links über dem Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht installiert ist oder kein Custom-Titel aktiv ist
+- **Krone-Icon plus Tooltip** vor dem Titel-Text, damit klar ist woher der Slot kommt ohne dass der User raten muss
+- **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert, inkompatibel) und Toggle. Plus Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt: Kontextmenü-Aktionen, Smart Notifications (NotificationMaster), RP-Status-Block (Moodles und LightlessClient), ExtraChat-Channels, Quick-DM-Button (XIVInstantMessenger)
+- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum Caraxi-Profil. Plus Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen Integrationen
+- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel automatisch sobald HellionChat aktualisiert

.github/forge-posts/v1.4.0.md

@@ -0,0 +1,32 @@
+---
+subtitle: Critical Lifecycle Fixes
+versionsnatur: Stability-Hotfix
+---
+
+**Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
+
+Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben
+bekannte Lifecycle- und Race-Bugs aus den Audit-Pässen
+abgearbeitet, bevor Performance- und Architektur-Refactors
+draufkommen.
+
+- **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur
+  Datei-Freigabe an, Pooling=false auf der Connection macht
+  den manuellen GC.Collect überflüssig
+- **Worker-Threads** (PendingMessage, RetentionSweep) sind
+  jetzt explizit IsBackground=true, das Plugin-Domain kann
+  sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten
+- **EmoteCache-Loader** von async-void auf async-Task mit
+  shared Task-Tracker, drain-on-Dispose. Kein Schreib-Risiko
+  mehr auf disposed EmoteImages-Einträge nach Plugin-Reload
+- **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent
+  zu failen
+- **Plugin-Dispose** flushed pending DeferredSave bevor Services
+  abgebaut werden, Settings-Änderungen aus den letzten Frames
+  vor Disable überleben jetzt zuverlässig
+- **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt
+  HellionThemeWindowOpacity in das neue WindowOpacity-Feld statt
+  auf 0.85 zurückzufallen
+
+Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen
+außer dass Reload und Shutdown spürbar sauberer laufen.

.github/forge-posts/v1.4.1.md

@@ -0,0 +1,39 @@
+---
+subtitle: Theme Engine Performance
+versionsnatur: Performance-Patch
+---
+
+**Hellion Chat 1.4.1 — Theme Engine Performance**
+
+Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. Heap-Pressure
+aus dem Theme-Engine-Render-Pfad eliminiert, Custom-Theme-
+Hot-Reload überlebt transiente File-Locks beim Editor-Save.
+Plus zehnter Built-In und überarbeitete Author-Credits.
+
+- **ABGR-Cache auf den Theme-Records.** Beim Theme-Register
+  (Built-In oder Custom) werden alle Color-Slots einmalig in
+  ABGR-Pack-Form vor-konvertiert. HellionStyle.PushGlobal
+  liest aus dem Cache statt pro Slot pro Frame durch
+  ColourUtil.RgbaToAbgr zu jagen. Real gemessene
+  Frame-Time-Recovery: **~13 %** in typischer Render-Szene
+  (Plan-Erwartung war 2-6 % konservativ, real ~10-15 %)
+- **Custom-Theme File-Lock-Härtung.** Wenn der User ein
+  Theme-JSON gerade speichert während HellionChat reloaden
+  will, fängt der Loader jetzt explizit Sharing-Violation
+  und Lock-Violation ab. Last-Known-Good-Snapshot bleibt im
+  Picker, beim nächsten Tick wird automatisch retry'd —
+  vorher fiel das Theme aus der Liste bis zum Plugin-Reload
+- **Defensive Cache-Refresh beim Theme-Switch.** Falls ein
+  Theme auf einem alten Pfad ohne Cache-Fill in den Speicher
+  gekommen ist, holt Switch() das beim Anwenden nach
+- **Synthwave Sunset als zehnter Built-In.** Hot Magenta +
+  Cyan auf Mitternachts-Violett, 80s-Neon-Grid-Vibes für
+  Late-Night-Raids
+- **Author-Credits konsolidiert.** Brand-Themes laufen jetzt
+  unter „Hellion Forge". Mint Grove und Forge Merchantman
+  werden Carla Beleandis als Community-Geste zugeschrieben.
+
+Keine Schema-Bumps, keine User-sichtbaren Funktions-
+Änderungen außer dass die Frames in Theme-getrieben
+rendernden Szenen merklich glatter laufen und ein neues
+Theme im Picker steht.

.github/forge-posts/v1.4.2.md

@@ -0,0 +1,43 @@
+---
+subtitle: ChatLog Frame-Hot-Path
+versionsnatur: Performance-Patch
+---
+
+**Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
+
+Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Drei
+Per-Frame-Allokations-Quellen aus dem ChatLogWindow-Render-
+Pfad und der Settings-StatusBar eliminiert.
+
+- **Card-Mode-Border-Loop entlastet.** DrawMessages hebt
+  Theme, DrawList, Window-Left, Window-Right und die ABGR-
+  Border-Color einmalig vor den Per-Message-Loop. Bei 100
+  sichtbaren Messages sind das gut 500 redundante P/Invokes
+  und Property-Reads, die der Hoist eliminiert. Pop-Out-
+  Heavy-Setups (mehrere parallele Chat-Windows) profitieren
+  proportional, weil der Hoist pro DrawMessages-Call greift,
+  also pro Window
+- **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color-
+  Berechnung für Auto-Tell-Tabs lief pro Tab pro Frame, mit
+  zwei String-Allokationen pro Tab (eine für Tint-Hash, eine
+  für Icon-Hash). Der neue TabTintCache liest pre-computed
+  Werte aus dem Tab und rechnet nur neu wenn das Tell-Target
+  drifted. Beide Caches haben separate Validation-Keys, also
+  keine Cross-Invalidation zwischen Tint- und Icon-Pfad.
+  AutoTellTabTint selbst bleibt pure Hash-Helper, weiterhin
+  ohne Tab-Awareness
+- **StatusBar-Aggregation hinter Cache-Gate.** Die Status-
+  Leiste am unteren Window-Rand summiert die Tab-Message-
+  Counts und zählt die Auto-Tell-Tabs pro Frame. Der Cache-
+  Gate (1 Sekunde) lag bisher hinter den LINQ-Pfaden, also
+  liefen Sum und Count trotzdem pro Frame. Jetzt vor dem
+  Gate, plus die LINQ-Pfade durch eine Single-Pass-Foreach
+  ersetzt. Die Aggregation läuft auf etwa 1 % der Frames
+
+Realistische Frame-Time-Recovery: 2-5 % in typischen Szenen,
+Pop-Out-Heavy-Setups potenziell mehr durch die Card-Border-
+Multiplikation pro Window.
+
+Keine Schema-Bumps, keine User-sichtbaren Funktions-
+Änderungen außer dass die Frames im Chat-Log und in der
+Settings-Statusleiste merklich glatter laufen.

.github/forge-posts/v1.4.3.md

@@ -0,0 +1,45 @@
+---
+subtitle: Async-Lifecycle + Gitea-Cutover
+versionsnatur: Architecture-Refactor
+---
+
+**Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover**
+
+Vierter Sub-Patch der v1.4.x Polish-Sweep-Serie. Plugin-
+Lifecycle auf Dalamud's `IAsyncDalamudPlugin`-API migriert
+und das Custom-Repo zieht von GitHub auf Gitea um.
+
+- **Async-Plugin-Architektur.** Konstruktor übernimmt nur
+  noch die Bootstrap-Essentials (Config-Load, Language-Init,
+  Conflict-Detection). Migrationen, Service-Allokationen,
+  Window-Konstruktion und Hook-Subscription wandern in
+  LoadAsync, sodass Dalamud die UI während der schweren
+  Arbeit responsive halten kann. Per-Line-CaptureFailure in
+  DisposeAsync mirrort LightlessSync's Pattern, plus
+  Idempotency-Guard gegen Reload-Races
+- **Custom-Repo-URL umgezogen auf Gitea.** Bestehende Tester
+  müssen einmalig in XIVLauncher die Custom-Repo-URL auf
+  `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
+  umstellen, dann XIVLauncher neu starten. Das alte
+  GitHub-Repo bleibt als eingefrorener v1.4.2-Snapshot
+  stehen und wird nicht mehr aktualisiert
+- **Schema-Gate statt Migrations-Kette.** Die v9 → v16
+  Migrationen sind raus, ersetzt durch einen harten
+  Schema-Check in Phase 1. Configs auf Schema v16+ laden
+  direkt; ältere Configs (vor v1.2.1) bekommen jetzt eine
+  klare „install v1.4.2 first"-Fehlermeldung statt eines
+  impliziten Migrations-Pfads
+- **AutoTranslate-Cache läuft im Hintergrund.** Der Cache
+  füllt sich jetzt fire-and-forget statt blockierend im
+  Plugin-Load. Trade-off: die erste Auto-Translate-Nutzung
+  einer Session kann einen kurzen Hitch haben, dafür kein
+  300-ms-Block beim Plugin-Start
+- **Plugin-Load-Zeit ehrlich.** Median 3,7 s über fünf
+  Reloads, vergleichbar mit v1.4.2. Der Async-Refactor ist
+  Foundation für künftige Lazy-Init-Optimierungen (v1.4.4)
+  und Code-Architektur-Hygiene, kein direkter
+  User-spürbarer Speed-Win in dieser Release
+
+Keine User-sichtbaren Funktions-Änderungen außer dem
+Repo-URL-Update. Settings, Themes und Tabs bleiben
+unangetastet.

.github/release-footer.md

@@ -8,19 +8,19 @@ Dalamud main plugin repo. To install:
 
 1. In XIVLauncher: **Settings → Experimental → Custom Plugin Repositories**
 2. Add the URL:
-   `https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/repo.json`
+   `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
 3. Enable, save, then `/xlplugins` → search **Hellion Chat** → install
 
 ## Project documents
 
-- [README](https://github.com/JonKazama-Hellion/HellionChat/blob/main/README.md) — features, architecture, build
+- [README](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/README.md) — features, architecture, build
-- [Privacy notice](https://github.com/JonKazama-Hellion/HellionChat/blob/main/PRIVACY.md) — what the plugin stores and sends
+- [Privacy notice](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/PRIVACY.md) — what the plugin stores and sends
-- [Third-party notices](https://github.com/JonKazama-Hellion/HellionChat/blob/main/docs/THIRD_PARTY_NOTICES.md) — dependencies and licences
+- [Third-party notices](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/docs/THIRD_PARTY_NOTICES.md) — dependencies and licences
-- [Security policy](https://github.com/JonKazama-Hellion/HellionChat/blob/main/SECURITY.md) — vulnerability reporting
+- [Security policy](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SECURITY.md) — vulnerability reporting
-- [Support](https://github.com/JonKazama-Hellion/HellionChat/blob/main/SUPPORT.md) — bug reports, questions, contact paths
+- [Support](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SUPPORT.md) — bug reports, questions, contact paths
 
 ## Licence
 
-[EUPL-1.2](https://github.com/JonKazama-Hellion/HellionChat/blob/main/LICENSE).
+[EUPL-1.2](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/LICENSE).
 Based on [Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna,
 also EUPL-1.2.

.github/workflows/build.yml

@@ -3,6 +3,12 @@ name: Build
 # Verifies that every push to main and every PR still builds against the
 # current Dalamud staging branch. Does not produce release artefacts; the
 # release workflow handles that on tag.
+#
+# Linux runner: gitea.com Cloud Actions provides ubuntu-latest. The plugin
+# csproj targets net10.0-windows, but `dotnet build` cross-compiles on
+# Linux as long as the Dalamud staging assemblies are present at the
+# expected lookup path ($(HOME)/.xlcore/dalamud/Hooks/dev/, which the
+# Dalamud SDK 15 uses on Linux).
 
 on:
   push:
@@ -21,7 +27,7 @@ permissions:
 jobs:
   build:
     name: Build (Release)
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
 
     steps:
@@ -34,23 +40,14 @@ jobs:
           dotnet-version: 10.0.x
 
       - name: Download Dalamud staging
-        shell: pwsh
         run: |
-          $hooks = Join-Path $env:APPDATA "XIVLauncher\addon\Hooks\dev"
+          hooks="$HOME/.xlcore/dalamud/Hooks/dev"
-          New-Item -ItemType Directory -Force -Path $hooks | Out-Null
+          mkdir -p "$hooks"
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile dalamud.zip
+          curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
-          Expand-Archive -Force -Path dalamud.zip -DestinationPath $hooks
+          unzip -oq dalamud.zip -d "$hooks"
 
       - name: Restore
         run: dotnet restore HellionChat/HellionChat.csproj
 
       - name: Build (Release)
         run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
-
-      - name: Upload build output
-        uses: actions/upload-artifact@v7
-        with:
-          name: HellionChat-build-${{ github.run_number }}
-          path: HellionChat/bin/Release/**/HellionChat/**
-          if-no-files-found: warn
-          retention-days: 14

.github/workflows/codeql.yml

@@ -1,93 +0,0 @@
-name: CodeQL
-
-# Replaces the GitHub default-setup CodeQL scan. The default setup runs
-# without resolving the Dalamud assemblies (they live in a user-AppData
-# path) and reports "Low C# analysis quality" because call-target
-# resolution sits at ~64%. This workflow downloads the Dalamud staging
-# distribution before the build, runs a manual dotnet build, and then
-# lets CodeQL analyse the fully-resolved compilation. Quality climbs
-# back above the 85% thresholds.
-#
-# This workflow only consumes trusted inputs: the tag/branch ref via
-# the standard checkout action, and the Dalamud distribution URL which
-# is pinned to a goatcorp-controlled GitHub Pages target. No user-
-# controlled event payload (issue title, PR body, commit message) flows
-# into a run-step.
-#
-# Disable the default setup in the repo before this workflow lands:
-# Settings -> Code security -> Code scanning -> "CodeQL analysis" tile
-# -> Switch to advanced.
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-  schedule:
-    - cron: '17 6 * * 1'
-
-permissions:
-  actions: read
-  contents: read
-  security-events: write
-
-jobs:
-  analyze-csharp:
-    name: Analyze (csharp)
-    runs-on: windows-latest
-    timeout-minutes: 30
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Setup .NET 10
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: 10.0.x
-
-      - name: Download Dalamud staging
-        shell: pwsh
-        run: |
-          $hooks = Join-Path $env:APPDATA "XIVLauncher\addon\Hooks\dev"
-          New-Item -ItemType Directory -Force -Path $hooks | Out-Null
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile dalamud.zip
-          Expand-Archive -Force -Path dalamud.zip -DestinationPath $hooks
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
-        with:
-          languages: csharp
-          build-mode: manual
-          queries: security-extended
-
-      - name: Restore
-        run: dotnet restore HellionChat/HellionChat.csproj
-
-      - name: Build (Release)
-        run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
-
-      - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@v4
-        with:
-          category: /language:csharp
-
-  analyze-actions:
-    name: Analyze (actions)
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
-        with:
-          languages: actions
-          build-mode: none
-
-      - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@v4
-        with:
-          category: /language:actions

.github/workflows/forge-announce.yml

@@ -0,0 +1,225 @@
+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 is set as a repo-level Actions Secret
+    # on Gitea (Settings → Actions → Secrets). Repo-level secrets are in
+    # scope for every job by default, no environment: declaration needed.
+    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://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png"
+              content = "<@&1500489631555260446>"
+              allowed_mentions = [ordered]@{
+                  parse = @()
+                  roles = @("1500489631555260446")
+              }
+              embeds = @(
+                  [ordered]@{
+                      title = $title
+                      url = "https://gitea.hellion-forge.cloud/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"
+              }
+          }

.github/workflows/release.yml

@@ -2,15 +2,19 @@ name: Release
 
 # Triggered when a vX.Y.Z tag is pushed. Builds the plugin against the
 # current Dalamud staging branch, locates the latest.zip produced by
-# DalamudPackager and attaches it to the matching GitHub Release.
+# DalamudPackager and attaches it to the matching Gitea Release.
 #
 # User-controlled inputs touched by this workflow:
 #   - the tag name (filtered by on.tags = v*, validated again at runtime
 #     against ^v\d+\.\d+\.\d+$ before being used in any string)
 # All other values are either repo-controlled (paths under
-# HellionChat/bin/Release derived from Get-ChildItem) or pinned URLs to
+# HellionChat/bin/Release derived from find / Get-ChildItem) or pinned
-# goatcorp / GitHub. Nothing from a webhook event payload (issue/PR
+# URLs to goatcorp / gitea. Nothing from a webhook event payload (issue/PR
 # titles, commit messages, etc.) flows into a run-step.
+#
+# Linux runner: gitea.com Cloud Actions only ships ubuntu-latest. The
+# plugin csproj targets net10.0-windows, `dotnet build` cross-compiles on
+# Linux when the Dalamud staging assemblies sit under $(HOME)/.xlcore/...
 
 on:
   push:
@@ -33,7 +37,7 @@ permissions:
 jobs:
   release:
     name: Build and attach release ZIP
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 20
 
     steps:
@@ -52,27 +56,25 @@ jobs:
           dotnet-version: 10.0.x
 
       - name: Download Dalamud staging
-        shell: pwsh
         run: |
-          $hooks = Join-Path $env:APPDATA "XIVLauncher\addon\Hooks\dev"
+          hooks="$HOME/.xlcore/dalamud/Hooks/dev"
-          New-Item -ItemType Directory -Force -Path $hooks | Out-Null
+          mkdir -p "$hooks"
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile dalamud.zip
+          curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
-          Expand-Archive -Force -Path dalamud.zip -DestinationPath $hooks
+          unzip -oq dalamud.zip -d "$hooks"
 
       - name: Build (Release)
         run: dotnet build HellionChat/HellionChat.csproj --configuration Release
 
       - name: Locate latest.zip
         id: locate
-        shell: pwsh
         run: |
-          $zip = Get-ChildItem -Path HellionChat\bin\Release -Recurse -Filter latest.zip | Select-Object -First 1
+          zip="$(find HellionChat/bin/Release -name latest.zip -print -quit)"
-          if (-not $zip)
+          if [ -z "$zip" ]; then
-          {
+              echo "latest.zip not found under HellionChat/bin/Release" >&2
-              throw "latest.zip not found under HellionChat\bin\Release"
+              exit 1
-          }
+          fi
-          Write-Host "Found: $($zip.FullName)"
+          echo "Found: $zip"
-          "path=$($zip.FullName)" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+          echo "path=$zip" >> "$GITHUB_OUTPUT"
 
       # Build a release body from the matching changelog block in
       # HellionChat.yaml plus a static install / docs footer. Fails the
@@ -150,8 +152,13 @@ jobs:
           Write-Host $body
           Write-Host "----------------------------------------"
 
-      - name: Attach to GitHub release
+      # Gitea-native release action. Creates the release if the tag has no
-        uses: softprops/action-gh-release@v3
+      # release yet, or updates the existing one. body_path provides the
+      # generated release body, files attaches latest.zip. The auto-injected
+      # GITHUB_TOKEN on Gitea Actions has Gitea-API scope and is sufficient
+      # for release write.
+      - name: Attach to Gitea release
+        uses: https://gitea.com/actions/release-action@main
         with:
           # Explicit tag_name so the action targets the correct release in
           # both push:tags (auto) and workflow_dispatch (manual recovery)
@@ -160,5 +167,4 @@ jobs:
           tag_name: ${{ github.event.inputs.tag || github.ref_name }}
           files: ${{ steps.locate.outputs.path }}
           body_path: release-body.md
-          fail_on_unmatched_files: true
+          api_key: ${{ secrets.GITHUB_TOKEN }}
-          generate_release_notes: false

.gitignore

@@ -9,7 +9,11 @@
 .envrc
 !.env.example
 .vscode/
-scripts/
+scripts/setup-dev-env.sh
+
+# Local test project (stays out of the published plugin repo;
+# pure-function safety net for refactor cycles)
+HellionChat.Tests/
 
 # Packaging
 pack/

CODE_OF_CONDUCT.md

@@ -1,48 +1,98 @@
-# Code of conduct
+# Code of Conduct
 
-HellionChat is a small hobby project. The contributor base is tiny and
+## A Note on This Project
-the moderation overhead I can afford is equally small, so this document
-is short and direct.
 
-## 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
+When in doubt, assume good intent. Contributors come from different
-  project space (Discord, email).
+backgrounds, time zones and skill levels. A clarifying question is
-- Keep feedback focused on the code, the design or the documentation.
+almost always a better first move than an accusation.
-  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.
 
-## 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
+We pledge to make our community welcoming, safe, and equitable for all.
-behalf: the GitHub repository, GitHub Discussions, project-related
-Discord conversations and the maintainer email address listed in
-`SECURITY.md`.
 
-It also applies when someone is identifiably representing the project
+We are committed to fostering an environment that respects and promotes
-in another space, for example posting as a HellionChat maintainer in
+the dignity, rights, and contributions of all individuals, regardless
-the Dalamud Discord.
+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`
+| Channel    | Address                  |
-- Discord DM: `@j.j_kazama`
+| ---------- | ------------------------ |
+| 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
+I will pick the lightest measure that actually resolves the situation:
-the lightest measure that resolves the issue:
 
 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.
+4. Private written warning with a cooldown period.
-5. Permanent block.
+5. Temporary block from the repository or related spaces.
+6. Permanent block.
 
-Severe cases skip the lower steps. I will not negotiate over
+Severe cases skip the lower steps. I will not negotiate over harassment
-harassment or threats.
+or threats.
 
-## Acknowledgement
+## Scope
 
-This document is intentionally short and project-specific rather than
+This Code of Conduct applies to all spaces the project owns or that I
-a copy of a longer template. If you need a more formal reference, the
+run on its behalf: the GitHub repository, GitHub Discussions,
-[Contributor Covenant](https://www.contributor-covenant.org/) is a
+project-related Discord conversations, and the maintainer contact
-widely adopted starting point and the spirit of this document is
+listed in [`SECURITY.md`](SECURITY.md). It also applies when someone
-compatible with it.
+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/).

CONTRIBUTING.md

@@ -1,47 +1,59 @@
 # Contributing to HellionChat
 
-Thanks for taking a look. HellionChat is a small, opinionated fork of
+Thanks for taking a look. HellionChat is a one-person side project
-[Chat 2](https://github.com/Infiziert90/ChatTwo) maintained by one
+developed under Hellion Forge. It started as a fork of
-person in spare time. This document explains what I am looking for,
+[Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become
-what I am not, and how to make a contribution land smoothly.
+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.
+  removes the upstream webinterface and ships privacy-first defaults.
-- Read [UPSTREAM_SYNC.md](docs/UPSTREAM_SYNC.md). Cherry-picks from upstream
+- Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Active
-  Chat 2 are selective and conscious; not everything that lands there
+  cherry-picking from upstream Chat 2 has ended in the v1.4.x cycle;
-  belongs here.
+  HellionChat continues as an independent codebase. Existing
-- Read [SECURITY.md](SECURITY.md). Anything security-sensitive goes
+  upstream-derived code keeps its attribution. New contributions
+  stand on their own and do not need to be cherry-pick-compatible.
+- 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`.
+  pull requests against
-  Translations for the upstream Chat 2 strings (`Language.*.resx`) are
+  `HellionChat/Resources/HellionStrings.*.resx`. Translations for
-  not handled here; they go through the upstream Chat 2 project.
+  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.
+- Sweeping refactors that touch large parts of the codebase. The
-  They make selective upstream cherry-picks much harder and the
   maintenance cost outweighs the benefit for a one-person project.
+  (This used to be doubly important because of the upstream
+  cherry-pick path; that path is closed now, but the rule still
+  holds on its own merits.)
 - AI-generated code dropped in without disclosure or human review. See
-  [AI_DISCLOSURE.md](docs/AI_DISCLOSURE.md) for how I handle AI assistance
+  [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md) for how I handle
-  on my side; I expect comparable transparency from contributors.
+  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 +62,75 @@ 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
+   easier to review than one large one. Squash-on-merge happens at
-   PR level if needed.
+   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
+   `repo.json`. I bump the version number myself at release time.
-   at release time, so you do not need to.
 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`
+| Workflow      | What it checks                        |
-- `codeql.yml` — CodeQL security analysis
+| ------------- | ------------------------------------- |
+| `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 kept as-is from the last
+upstream sync and remain the work of the Chat 2 Crowdin community.
+Active cherry-picking from upstream ended in the v1.4.x cycle (see
+[`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md)), so future
+translation improvements to those upstream strings will not flow
+into HellionChat automatically anymore. If you have improvements
+for the original Chat 2 strings, please contribute them to
+[Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo)
+directly.
+
 ## Licensing
 
 By submitting a pull request you confirm that:
@@ -109,23 +140,34 @@ 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`
+| Channel       | Address                    |
-(English source) and `HellionStrings.<lang>.resx` (per-language).
+| ------------- | -------------------------- |
-Translations are accepted as direct pull requests against those files.
+| 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
+I respond on weekdays during European business hours and take weekends
-**not** translated in this repository. They are owned by the upstream
+and FFXIV patch days off. A pull request that sits for a few days has
-Chat 2 project and synced in via cherry-pick. Please contribute
+not been ignored. Pinging once after a week is fine; please do not
-upstream-string translations to
+ping daily.
-[Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) instead.
 
-## A note on response times
+## First-time setup
 
-I respond on weekdays during European business hours and I take
+After cloning, run once:
-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
+```bash
-once after a week is fine; please do not ping daily.
+./scripts/setup-hooks.sh
+```
+
+This wires `core.hooksPath` to `.githooks/`. The pre-push hook runs preflight
+(versions/manifest/changelog/build).
+
+### Test suite
+
+The plugin's test suite lives in a separate local repository and is not part of
+this codebase. If you need access for development, contact the maintainer.

COPYRIGHT

@@ -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
+    German localisation and the EUPL-1.2 fork maintenance.
-    EUPL-1.2 fork maintenance.
 
-Licensed under the European Union Public Licence (EUPL), Version 1.2
+Source code is licensed under the European Union Public Licence
-only. The full Licence text lives in the LICENSE file at the root of
+(EUPL), Version 1.2 only. The full Licence text lives in the LICENSE
-this repository. The official Licence website is at:
+file at the root of this repository. The official Licence website is
-
+at: https://eupl.eu/1.2/en/
-    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.

HellionChat.sln

@@ -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

HellionChat/Branding/BrandingLinks.cs

@@ -0,0 +1,11 @@
+// HellionChat/Branding/BrandingLinks.cs
+namespace HellionChat.Branding;
+
+// Centralised so a future invite rotation only touches one file. The same
+// link is currently hard-coded in repo.json, README.md, SUPPORT.md,
+// CONTRIBUTORS.md and HellionChat.yaml — those will be migrated to consume
+// this constant in a separate housekeeping sweep
+internal static class BrandingLinks
+{
+    public const string HellionForgeDiscordInvite = "https://discord.gg/X9V7Kcv5gR";
+}

HellionChat/Configuration.cs

@@ -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,23 +86,19 @@ 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
     // to fall back to the user's chosen system or Dalamud font.
     public bool UseHellionFont = true;
 
+    // Cycle 1 of the plugin-integration roadmap. When Honorific is installed
+    // and reports a custom title, render it in the chat header above the
+    // message log. Auto-hides regardless when Honorific is missing or the
+    // active title is original/empty, so leaving this on is safe even for
+    // users who don't run Honorific.
+    public bool ShowHonorificTitleInHeader = true;
+
     // Hellion Chat — Auto-Tell-Tabs. When enabled, an incoming or outgoing
     // /tell spawns a session-only tab dedicated to that conversation
     // partner. See spec: Hellion Chat Auto-Tell-Tabs Spec (Obsidian).
@@ -145,7 +160,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 +179,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 +209,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 +246,25 @@ public class Configuration : IPluginConfiguration
     };
 
     public float TooltipOffset;
-    public float WindowAlpha = 100f;
+    // v1.2.1 — Default-Chat-Farben sind das Hellion-Brand-Preset. Der
-    public Dictionary<ChatType, uint> ChatColours = new();
+    // 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 +316,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 +329,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 +336,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`
+        // user's open tell conversations.
-        // still get the regular clone-replace treatment.
+        //
+        // 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,9 +378,14 @@ public class Configuration : IPluginConfiguration
         RetentionLastRunAt = other.RetentionLastRunAt;
 
         FirstRunCompleted = other.FirstRunCompleted;
-        HellionThemeEnabled = other.HellionThemeEnabled;
-        HellionThemeWindowOpacity = other.HellionThemeWindowOpacity;
         UseHellionFont = other.UseHellionFont;
+        ShowHonorificTitleInHeader = other.ShowHonorificTitleInHeader;
+
+        // v1.1.0 theme engine fields
+        Theme = other.Theme;
+        WindowOpacity = other.WindowOpacity;
+        ReduceMotion = other.ReduceMotion;
+        UseCompactDensity = other.UseCompactDensity;
 
         EnableAutoTellTabs = other.EnableAutoTellTabs;
         AutoTellTabsLimit = other.AutoTellTabsLimit;
@@ -367,6 +432,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();
 
@@ -412,6 +482,16 @@ public class Tab
     // session. NonSerialized because the temp tab itself is session-only.
     [NonSerialized] public bool IsGreeted;
 
+    // v1.4.2 — TabTintCache uses separate validation keys per cache so a
+    // TellTarget change picked up by GetTint can't strand GetIcon (or vice
+    // versa) with a stale entry that looks fresh on the shared key.
+    [NonSerialized] internal string? _cachedTintTellName;
+    [NonSerialized] internal uint _cachedTintTellWorld;
+    [NonSerialized] internal uint _cachedTellTint;
+    [NonSerialized] internal string? _cachedIconTellName;
+    [NonSerialized] internal uint _cachedIconTellWorld;
+    [NonSerialized] internal string? _cachedTellIcon;
+
     public bool Matches(Message message)
     {
         if (!message.Matches(SelectedChannels, ExtraChatAll, ExtraChatChannels))
@@ -571,6 +651,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>

HellionChat/EmoteCache.cs

@@ -1,4 +1,5 @@
-using System.Numerics;
+using System.Collections.Concurrent;
+using System.Numerics;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Dalamud.Interface.Textures;
@@ -66,16 +67,42 @@ 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;
+
+    // Drain target for in-flight loads on Dispose; without this an orphan
+    // continuation could still write to a torn-down Texture/Frames field.
+    private static readonly ConcurrentBag<Task> PendingLoads = new();
+
+    internal static void TrackLoad(Task loadTask, string emoteCode)
+    {
+        PendingLoads.Add(loadTask.ContinueWith(t =>
+        {
+            if (t.IsFaulted)
+                Plugin.Log.Error(t.Exception!, $"EmoteCache load failed for {emoteCode}");
+        }, TaskScheduler.Default));
+    }
+
     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 global = await Client.GetAsync(GlobalEmotes, ct);
-            var globalList = await global.Content.ReadAsStringAsync();
+            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 +111,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 top = await Client.GetAsync(Top100Emotes.Format(BetterTTV, lastId), ct);
-                var topList = await top.Content.ReadAsStringAsync();
+                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 +130,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 +149,20 @@ public static class EmoteCache
 
     public static void Dispose()
     {
+        Cts.Cancel();
+
+        // 5s upper bound; anything still running gets abandoned.
+        try
+        {
+            Task.WaitAll(PendingLoads.ToArray(), TimeSpan.FromSeconds(5));
+        }
+        catch (AggregateException)
+        {
+            // Faults already logged in TrackLoad.
+        }
+
+        while (PendingLoads.TryTake(out _)) { }
+
         foreach (var emote in EmoteImages.Values)
             emote.InnerDispose();
     }
@@ -171,7 +218,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 +235,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));
+                var content = await Client.GetAsync(EmotePath.Format(emote.Id), ct);
-                RawData = await content.Content.ReadAsByteArrayAsync();
+                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 +256,27 @@ public static class EmoteCache
     {
         public ImGuiEmote Prepare(Emote emote)
         {
-            Task.Run(() => Load(emote));
+            var ct = EmoteCache.Token;
+            // Task.Run keeps the sync prefix off the ImGui render thread.
+            EmoteCache.TrackLoad(Task.Run(() => LoadAsyncTracked(emote, ct), ct), emote.Code);
             return this;
         }
 
-        private async void Load(Emote emote)
+        private async Task LoadAsyncTracked(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)
+            {
+            }
             catch (Exception ex)
             {
                 Failed = true;
@@ -279,15 +332,16 @@ public static class EmoteCache
 
         public ImGuiGif Prepare(Emote emote)
         {
-            Task.Run(() => Load(emote));
+            var ct = EmoteCache.Token;
+            EmoteCache.TrackLoad(Task.Run(() => LoadAsyncTracked(emote, ct), ct), emote.Code);
             return this;
         }
 
-        private async void Load(Emote emote)
+        private async Task LoadAsyncTracked(Emote emote, CancellationToken ct)
         {
             try
             {
-                var image = await LoadAsync(emote);
+                var image = await LoadAsync(emote, ct);
                 if (image.Length <= 0)
                     return;
 
@@ -299,6 +353,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 +363,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;

HellionChat/FontManager.cs

@@ -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
@@ -128,6 +100,19 @@ public class FontManager
         JpRange = BuildRange(GlyphRangesJapanese.GlyphRanges);
     }
 
+    /// <summary>
+    /// Async wrapper around <see cref="BuildFonts"/> for the Phase-1 LoadAsync
+    /// path. The font-atlas build is CPU-bound, so we offload via Task.Run and
+    /// honour the cancellation token at the scheduling boundary; this lets the
+    /// font build run in parallel with the theme init without blocking the
+    /// loader. Settings-driven manual rebuilds keep using the sync entry point.
+    /// </summary>
+    public async Task BuildFontsAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        await Task.Run(BuildFonts, cancellationToken).ConfigureAwait(false);
+    }
+
     public void BuildFonts()
     {
         SetUpRanges();
@@ -148,7 +133,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");

HellionChat/GameFunctions/Chat.cs

@@ -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;

HellionChat/GameFunctions/ChatBox.cs

@@ -16,6 +16,18 @@ public unsafe class ChatBox
     }
 
     public static void SendMessage(string message)
+    {
+        var bytes = ValidateMessage(message);
+        SendMessageUnsafe(bytes);
+    }
+
+    // Validation split out so the deterministic checks (UTF-8 length, sanitise
+    // round-trip) can run in xUnit without ClientStructs game memory. The
+    // sanitiser is injectable so tests can pin throw behaviour without invoking
+    // Utf8String->SanitizeString, which only resolves in-process. Returns the
+    // already-encoded bytes so SendMessage doesn't pay GetBytes twice.
+    // TEST-MIRROR: ../../../Hellion Build test/GameFunctions/ChatBoxTests.cs
+    internal static byte[] ValidateMessage(string message, Func<string, string>? sanitiserOverride = null)
     {
         var bytes = Encoding.UTF8.GetBytes(message);
         if (bytes.Length == 0)
@@ -24,10 +36,11 @@ public unsafe class ChatBox
         if (bytes.Length > 500)
             throw new ArgumentException(Language.ChatBox_Error_Too_Long, nameof(message));
 
-        if (message.Length != SanitiseText(message).Length)
+        var sanitiser = sanitiserOverride ?? SanitiseText;
+        if (message.Length != sanitiser(message).Length)
             throw new ArgumentException(Language.ChatBox_Error_Invalid, nameof(message));
 
-        SendMessageUnsafe(bytes);
+        return bytes;
     }
 
     private static string SanitiseText(string text)

HellionChat/GameFunctions/GameFunctions.cs

@@ -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;
 

HellionChat/GameFunctions/Types/TellTarget.cs

@@ -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;

HellionChat/HellionChat.csproj

@@ -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.2</Version>
+        <Version>1.4.3</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="Pidgin" Version="[3.5.1, 4.0.0)" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
+        <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>
 
 

HellionChat/HellionChat.yaml

@@ -31,17 +31,54 @@ description: |-
   - Independent plugin state — own config file and database directory,
     so Hellion Chat does not share state with upstream Chat 2
 
+  v1.3.0 First plugin integration cycle. Honorific custom titles
+  are shown in the chat header above the message log, with auto-detect
+  and silent fallback when Honorific is not installed.
+
+  v1.4.0 — Critical Lifecycle Fixes. Plugin reload and shutdown
+  are cleaner: SQLite no longer leans on GC pressure to release
+  its file, worker threads are explicitly background, deferred
+  config saves no longer get lost mid-disable, and pre-v13 config
+  backups carry the user's custom theme opacity into the v14 schema
+  instead of falling back to the default.
+
+  v1.4.1 — Theme Engine Performance plus a tenth built-in.
+  HellionStyle.PushGlobal reads pre-computed ABGR values from a
+  per-theme cache instead of converting RGBA per slot per frame
+  (~13 % render-time recovery in typical scenes). Custom-theme
+  hot-reload survives transient file locks (editor mid-save
+  keeps the last-known-good snapshot). Synthwave Sunset joins
+  as the tenth built-in theme — Hot Magenta + Cyan on midnight
+  violet, 80s neon-grid vibes.
+
+  v1.4.2 — ChatLog Frame-Hot-Path. Three per-frame allocation
+  patterns gone from the chat-log render path: card-mode borders
+  hoist invariants out of the per-message loop, auto-tell tab
+  tint and icon get a per-tab cache, and the status bar gates
+  its tab aggregation behind the same one-second cache it uses
+  for the format strings.
+
+  v1.4.3 — Plugin-Load Async-Init plus Repo-Cutover. Plugin
+  migrated to Dalamud's IAsyncDalamudPlugin so the heavy work
+  (migrations, service allocations, window construction, hook
+  subscription) runs in LoadAsync without blocking Dalamud's
+  UI. Schema-gate replaces the v9 → v16 migration chain;
+  configs on schema v16+ load directly. Custom-repo URL moves
+  to gitea.hellion-forge.cloud, the GitHub repo stays as a
+  frozen v1.4.2 snapshot.
+
   Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
 
   Modding & support: join the Hellion Forge Discord at
   https://discord.gg/X9V7Kcv5gR — community for Hellion Chat and
   other Hellion Online Media plugins/tools.
-repo_url: https://github.com/JonKazama-Hellion/HellionChat
+repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat
 accepts_feedback: true
-icon_url: https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/icon.png
+icon_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png
 image_urls:
-  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/chatWindow.png
+  - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/chatWindow.png
-  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/withSimpleTweaks.png
+  - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/settingsOverview.png
+  - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/themesPicker.png
 tags:
   - Social
   - UI
@@ -49,184 +86,131 @@ tags:
   - Replacement
   - Privacy
 changelog: |-
-  **Hellion Chat 1.0.2 — Polish patch**
+  **Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover (2026-05-08)**
 
-  - New: optionally hide chat (and every other plugin window) while the
+  Plugin lifecycle migrated to Dalamud's `IAsyncDalamudPlugin`
-    New Game+ menu is open. Toggle in Settings → Window → Frame, default
+  API. The constructor now does only the bootstrap-essentials
-    off. Closing the menu restores all windows.
+  (config load, language init, conflict detection); migrations,
-  - New: optionally tint the channel selector button next to the input
+  service allocations, window construction and hook subscription
-    field with the currently active channel's colour. Toggle in
+  move to LoadAsync. Dalamud can keep its UI responsive while the
-    Settings → Appearance → Colours, default on. Matches the existing
+  heavy work runs.
-    input-text tint and respects ExtraChat overrides.
+
-  - Fix: status, item and other inline hover icons keep their original
+  - IAsyncDalamudPlugin two-phase load with per-line CaptureFailure
-    aspect ratio. Debuff icons with non-square dimensions are no longer
+    in DisposeAsync (mirrors LightlessSync's pattern); idempotency
-    visually squished into a 32×32 box.
+    guard protects against reload races
-  - Diagnostic: hide-state transitions (battle, cutscene, user-hide,
+  - Schema-gate replaces the v9 → v16 migration chain. Configs
-    cutscene override) are now logged on Verbose level for easier bug
+    on schema v16+ load directly; older configs trigger an
-    reports — off by default, enable with `/xllog set HellionChat verbose`.
+    "install v1.4.2 first" error so the historic migration
+    path stays intact
+  - AutoTranslate.PreloadCache moved off the load path. First
+    use may have a sub-second hitch instead of every-load; the
+    upstream chose differently, we accept first-use latency
+  - FontManager.BuildFonts is called sync at the start of
+    LoadAsync; Dalamud rebuilds the font atlas on its own
+    pipeline so the custom Hellion-Exo2 font appears with a
+    brief font-pop after load (matches ChatTwo's behaviour)
+  - Custom-repo URL moved to gitea.hellion-forge.cloud/
+    JonKazama-Hellion/HellionChat. GitHub repo stays as a
+    frozen v1.4.2 snapshot; new releases ship from Gitea.
+    Existing testers need to update the custom-repo URL once
+  - Plugin-load time in this release sits at ~3.7 s median
+    (5 reloads), comparable to v1.4.2. Async migration is
+    foundational for v1.4.4 Lazy-Init optimisations rather
+    than an immediate user-perceived win
+
+  Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
 
   Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
 
-  **Hellion Chat 1.0.1 — Window Position Recovery**
+  **Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
 
-  - Automatic bounds check on the first draw after plugin load.
+  Third sub-patch of the v1.4.x Polish Sweep series. Per-frame
-    When the persisted window position has no overlap with the
+  allocations from the chat-log render path eliminated.
-    primary viewport, the window snaps to a safe top-left default.
-    Helpful after a monitor disconnect, resolution change or
-    multi-monitor layout switch between sessions.
-  - New "Reset Window Position" button in Settings → Window → Frame
-    as a manual escape hatch for edge cases the automatic check
-    doesn't catch.
 
-  Tested on Linux/Wayland with a hard-cut three-monitor reduction;
+  - DrawMessages card-mode hoists theme/drawList/winLeft/winRight/
-  window recovers cleanly without manual JSON editing.
+    borderColorAbgr out of the per-message loop. About 500
+    redundant calls per frame at 100 visible messages, multiplied
+    by every pop-out window
+  - Auto-tell tab tint and icon use a per-tab cache. Hash
+    computation and string allocation only happen when the tell
+    target name or world drifts. AutoTellTabTint stays a pure
+    hash helper; cache lives in a thin TabTintCache wrapper
+  - Status bar gates its tab aggregation behind the same
+    one-second cache it already used for the format strings.
+    LINQ Sum and Count replaced with a single foreach pass
+    that runs on roughly 1% of frames
 
-  Housekeeping carried over since v1.0.0:
+  Realistic frame-time recovery: 2-5% in typical scenes, more
+  on pop-out-heavy setups because the card-border hoist scales
+  per window.
 
-  - Documentation restructured into docs/ folder. New CHANGELOG,
+  Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
-    CONTRIBUTORS, LEARNING-JOURNEY and ROADMAP added
-  - Stale ChatTwo/* paths in repo configs updated to HellionChat/*
-  - Pidgin parser library bumped from 3.3.0 to 3.5.1 (CIString
-    Unicode fix relevant for non-ASCII channel/tab names)
-  - GitHub Actions: actions/setup-dotnet bumped 4 → 5,
-    github/codeql-action bumped 3 → 4
 
   Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
 
-  **Hellion Chat 1.0.0 — Standalone Major Release**
+  **Hellion Chat 1.4.1 — Theme Engine Performance**
 
-  First fully standalone release. Internal cleanup plus a sweep of
+  Second sub-patch of the v1.4.x Polish Sweep series. Heap
-  pre-existing correctness, security, threading and resource-leak
+  pressure from the theme engine's per-frame render path
-  fixes carried over from the upstream codebase. No user action
+  removed, plus a tenth built-in theme and hardening for
-  required — auto-update applies cleanly, configuration and database
+  the custom-theme hot-reload.
-  paths unchanged.
 
-  Standalone identity:
+  - Theme records carry a pre-computed ABGR-packed cache
+    for every color slot; cache is filled when the theme
+    is registered and refreshed defensively on every
+    Switch()
+  - HellionStyle.PushGlobal reads ABGR values from the
+    cache instead of calling ColourUtil.RgbaToAbgr per
+    slot per frame; ~13 % render-time recovery measured
+    in typical scenes (plan estimate was 2–6 %, real
+    ~10–15 %)
+  - ThemeRegistry custom-theme reload distinguishes a
+    recoverable file lock (editor mid-save) from a
+    permanent IO failure; locked themes keep their
+    last-known-good snapshot and retry on the next
+    lookup instead of dropping out of the picker
+  - New built-in: Synthwave Sunset — Hot Magenta + Cyan
+    on midnight violet, 80s neon-grid vibes; tenth theme
+    in the picker
+  - Author credits refreshed: brand themes are credited
+    as "Hellion Forge"; Mint Grove and Forge Merchantman
+    now credited to Carla Beleandis as a community thanks
 
-  - Code namespace consolidated from ChatTwo.* to HellionChat.* across
+  No schema bump, no user-visible behaviour change other
-    all source files
+  than smoother frames on GC-sensitive setups and one
-  - IPC channels migrated from ChatTwo.* to HellionChat.* (6 channels:
+  additional colour option.
-    Register, Available, Unregister, Invoke, GetChatInputState,
-    ChatInputStateChanged) — third-party plugins that bound to the old
-    channels need to be updated; none known at release time
-  - ImGui popup ID renamed to hellionchat-context-popup
-  - Repository folder restructured (ChatTwo/ → HellionChat/), all CI
-    and build paths updated accordingly
-  - Public-facing descriptions reworded from upstream-fork framing to
-    standalone framing (Chat 2 attribution preserved per EUPL-1.2)
-  - Colour preset 'ChatTwo Default' is now 'Klassik (Chat 2 Default)'
 
-  Safety:
+  Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
-
-  - Plugin now refuses to load when upstream Chat 2 is also active —
-    bilingual conflict message in EN/DE, throw before any subsystem
-    initialization, prevents the runtime crash that previously occurred
-    when both plugins replaced the same chat window in parallel
-  - SQLite native binary bumped to 3.50.3 (CVE-2025-6965 memory
-    corruption from aggregate-term overflow, CVE-2025-7709)
-  - NuGet restore now honors packages.lock.json so transitive
-    dependencies don't drift between machines or CI runs
-
-  Default tab layout sharpened (one-time tab reset on first start):
-
-  The first-run tab layout is reorganized into five thematic tabs
-  based on external tester feedback. General contains only Say,
-  Yell and Shout (immediate-surroundings public chat). System
-  absorbs the gameplay-event streams (NpcDialogue, Loot, Crafting,
-  Gathering, PF recruitment pings) and announcement noise
-  (BattleSystem, FreeCompanyAnnouncement, PvpTeamAnnouncement)
-  that previously lived in General. FreeCompany, Group and
-  Linkshell each own their channel set. The static Tell tab is
-  gone — Auto-Tell-Tabs spawns per-conversation tabs on demand.
-  The Beginner / Novice-Network preset is no longer added by
-  default but is still available via Settings, Tabs.
-
-  This is a one-time tab-layout reset for users on config version
-  12 or older. Privacy, Retention, Theme and every other setting
-  is preserved. Your previous tab configuration is written to
-  pluginConfigs/HellionChat.json.pre-v13-backup so you can restore
-  it manually if you prefer the old layout.
-
-  Crash-class fixes (formerly latent in upstream):
-
-  - MathUtil.HasOverlap now uses a correct AABB test; identical or
-    edge-touching rectangles are no longer reported as non-overlapping
-  - ChatCode.Equals compares fields directly instead of GetHashCode;
-    removes the hash-collision anti-pattern
-  - IpcManager.Dispose uses UnregisterAction to match the matching
-    RegisterAction call; previous mismatch leaked the action
-    subscription on every plugin reload
-  - ExtraChat.Dispose now unsubscribes all three IPC subscriptions
-    (was only the first); leaks closed
-  - TellTarget.FromTarget guards against a zero IPlayerCharacter.Address
-    before dereferencing the unsafe Character* cast
-  - GameFunctions ResolveTextCommandPlaceholderDetour null-checks the
-    Hook reference instead of using the null-forgiving operator
-  - Popout.cs and SettingsTabs/Tabs.cs bounds-check list indexing so
-    a tab drop or empty-worlds list no longer crashes the UI
-  - Debugger.cs now declares IDisposable so the existing Dispose runs
-
-  Correctness fixes:
-
-  - GlobalParametersCache.GetValue captures Cache into a local before
-    the bounds check, so a concurrent Refresh can't slip a different
-    array between check and read
-  - IconUtil binary search bounds initialized to entries.Length-1 and
-    reset on redirect-restart; entries.Length==0 short-circuits
-  - Sheets.WorldsOnDatacenter now compares DataCenter.RowId (was
-    Region.RowId) so it actually returns same-DC worlds
-  - Message.cs back-reference loop iterates the processed Sender/Content
-    properties so chunks added by CheckMessageContent get Message set
-  - Language.zh-Hans Webinterface_Start_Success corrected to
-    "网页界面已启动" (was "网页界面已停止")
-
-  Threading and async:
-
-  - AutoTranslate Entries/ValidEntries are now serialized behind a
-    single lock; the preload worker thread and main thread no longer
-    race on the underlying dictionary/hash set
-  - Privacy retention and cleanup workers bound their framework-refresh
-    waits to 5 seconds with a logged timeout; a hung framework tick can
-    no longer deadlock the background worker
-
-  Resource handling:
-
-  - EmoteCache reuses the static HttpClient instead of allocating a new
-    one per call (closed socket leak)
-  - FontManager wraps HttpClient/HttpResponseMessage in using-blocks
-    and adds EnsureSuccessStatusCode; failed downloads no longer
-    silently produce a zero-byte font file
-  - SearchSelector mixes the row index into the ImGui ID stack so
-    selectables don't collapse to a single ambiguous ID
-  - SettingsTabs/Chat blocked-emote add-button now opens its selector
-    popup on left-click
-
-  Performance:
-
-  - DbViewer text export caches filteredHistory.Count once instead of
-    re-enumerating the IEnumerable on every batch (O(N) instead of
-    O(N²) on large histories)
-
-  License attribution (NOTICE.md, COPYRIGHT, THIRD_PARTY_NOTICES.md
-  and the Credits section in README) is unchanged.
 
   Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
 
-  **Hellion Chat 0.6.1 — Pop-Out Discoverability & /tell Auto-Pop-Out**
+  **Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
 
-  - Pop-out button now visible in the chat header (no more hunting
+  First sub-patch of the v1.4.x Polish Sweep series. Seven
-    through the right-click menu)
+  known lifecycle and race bugs eliminated before any
-  - One-time hint banner explains pop-out tabs and the right-click
+  performance refactor sits on top.
-    shortcut
+
-  - New setting: open new /tell tabs directly as pop-out windows
+  - MessageStore disposal no longer triggers GC.Collect
-    (Settings → Chat → Auto-Tell-Tabs)
+    globally; Pooling=false on the SQLite connection means
-  - Pop-out input is now enabled by default — closing a pop-out still
+    there's nothing left to clean up by hand
-    returns the tab to the sidebar
+  - PendingMessage and RetentionSweep worker threads are
-  - Bugfix: dropping or logging out with an LRU/popped auto-tell tab
+    explicitly marked IsBackground=true so the plugin domain
-    now also closes its pop-out window (no more ghost windows)
+    can unload during XIVLauncher reload without waiting
-  - Bugfix: dead zone below the chat input bar when the v0.6.0 pop-out
+    for them
-    hint banner was visible (also fixed retroactively for the v0.6.0
+  - EmoteCache image and gif loaders moved from async-void
-    banner inside pop-outs)
+    to async Task with a shared task tracker, draining
+    on Dispose so an in-flight load can no longer write
+    to a disposed EmoteImages entry
+  - DisposeAsync 10s timeout now warns loudly instead of
+    silently leaving the worker behind
+  - Plugin.Dispose flushes any pending DeferredSaveFrames
+    before tearing services down, so settings changes
+    made in the last few frames before disable are no
+    longer lost
+  - The v13→v14 config migration now reads the pre-v13
+    backup and carries HellionThemeWindowOpacity into the
+    new WindowOpacity field instead of falling back to
+    the default 0.85
 
   Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
 
@@ -234,4 +218,4 @@ changelog: |-
 
   ---
 
-  Earlier history: https://github.com/JonKazama-Hellion/HellionChat/releases
+  Earlier history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases

HellionChat/Integrations/HonorificService.cs

@@ -0,0 +1,245 @@
+using System;
+using Dalamud.Plugin;
+using Dalamud.Plugin.Ipc;
+using Dalamud.Plugin.Services;
+using Newtonsoft.Json;
+
+namespace HellionChat.Integrations;
+
+// We pull Newtonsoft.Json into this single file for IPC compatibility:
+// Honorific serialises its TitleData with Newtonsoft (see
+// Honorific-master/IpcProvider.cs:9 and CustomTitle.cs:12). Using the
+// same library guarantees identical handling of System.Numerics.Vector3?
+// and the enum fields we ignore. Newtonsoft is a transitive dependency
+// via Dalamud, so no new NuGet entry is needed. The rest of HellionChat
+// keeps using System.Text.Json.
+internal sealed class HonorificService : IDisposable
+{
+    private const string IpcNamespace = "Honorific";
+
+    // Major version of the Honorific IPC contract HellionChat is built against.
+    // Used both by the runtime compatibility check and by the settings tab when
+    // it tells the user which major version we expected, so the literal lives
+    // in exactly one place.
+    internal const uint ExpectedApiMajor = 3;
+
+    // IPC gates we subscribe to. Keep them as fields so Dispose can
+    // unsubscribe the same instances we subscribed in the constructor.
+    private readonly ICallGateSubscriber<(uint, uint)> _apiVersion;
+    private readonly ICallGateSubscriber<string> _getLocalCharacterTitle;
+    private readonly ICallGateSubscriber<string, object> _localCharacterTitleChanged;
+    private readonly ICallGateSubscriber<object> _ready;
+    private readonly ICallGateSubscriber<object> _disposing;
+
+    private readonly IPluginLog _log;
+    private readonly IFramework _framework;
+    private bool _versionWarningLogged;
+
+    public HonorificTitleData? CurrentTitle { get; private set; }
+    public bool IsAvailable { get; private set; }
+    public (uint Major, uint Minor)? DetectedApiVersion { get; private set; }
+
+    public HonorificService(IDalamudPluginInterface pluginInterface, IPluginLog log, IFramework framework)
+    {
+        _framework = framework;
+        _log = log;
+
+        // Dalamud caches gate objects per-name for the lifetime of the
+        // plugin interface, so we can register subscribers even when
+        // Honorific isn't loaded yet — the gate just won't fire. Calling
+        // InvokeFunc before Honorific is up will throw, which is why the
+        // initial pull below is wrapped in try-catch.
+        //
+        // Thread-context: plugin constructors run on Dalamud's plugin-loader
+        // thread, NOT the framework thread. Honorific's IPC handlers read
+        // ObjectTable.LocalPlayer (Honorific IpcProvider.cs:61), which throws
+        // "Not on main thread!" outside the framework thread. If Honorific is
+        // already loaded when HellionChat starts, a synchronous InvokeFunc
+        // here would surface that exception, the broad catch below would
+        // mark IsAvailable=false, and OnTitleChanged's `if (!IsAvailable)`
+        // gate would block every subsequent title update. We therefore
+        // schedule the initial pull onto the framework thread via
+        // IFramework.RunOnFrameworkThread so the IPC call sees the right
+        // thread context.
+        _apiVersion = pluginInterface
+            .GetIpcSubscriber<(uint, uint)>($"{IpcNamespace}.ApiVersion");
+        _getLocalCharacterTitle = pluginInterface
+            .GetIpcSubscriber<string>($"{IpcNamespace}.GetLocalCharacterTitle");
+        _localCharacterTitleChanged = pluginInterface
+            .GetIpcSubscriber<string, object>($"{IpcNamespace}.LocalCharacterTitleChanged");
+        _ready = pluginInterface
+            .GetIpcSubscriber<object>($"{IpcNamespace}.Ready");
+        _disposing = pluginInterface
+            .GetIpcSubscriber<object>($"{IpcNamespace}.Disposing");
+
+        _localCharacterTitleChanged.Subscribe(OnTitleChanged);
+        _ready.Subscribe(OnReady);
+        _disposing.Subscribe(OnDisposing);
+
+        _framework.RunOnFrameworkThread(TryInitialPull);
+    }
+
+    public void Dispose()
+    {
+        // Honorific may already be gone by the time we dispose. Wrap each
+        // unsubscribe so a missing gate doesn't prevent the others from
+        // unsubscribing — leaking even one subscription leaves a callback
+        // alive that captures `this`, which keeps the whole service alive
+        // and breaks plugin reload.
+        TryUnsubscribe(() => _localCharacterTitleChanged.Unsubscribe(OnTitleChanged));
+        TryUnsubscribe(() => _ready.Unsubscribe(OnReady));
+        TryUnsubscribe(() => _disposing.Unsubscribe(OnDisposing));
+    }
+
+    private void TryInitialPull()
+    {
+        try
+        {
+            var version = _apiVersion.InvokeFunc();
+            DetectedApiVersion = version;
+
+            if (!IsApiVersionCompatible(version))
+            {
+                if (!_versionWarningLogged)
+                {
+                    _log.Warning(
+                        "Honorific API version mismatch — expected major 3, " +
+                        "found {Major}.{Minor}. Disabling Honorific integration.",
+                        version.Item1, version.Item2);
+                    _versionWarningLogged = true;
+                }
+                IsAvailable = false;
+                return;
+            }
+
+            IsAvailable = true;
+            _versionWarningLogged = false;
+            // Pull the current title once at startup; from here on we rely
+            // on LocalCharacterTitleChanged events.
+            var json = _getLocalCharacterTitle.InvokeFunc();
+            CurrentTitle = ParseTitleJson(json);
+        }
+        catch (Exception ex)
+        {
+            // Honorific isn't installed or hasn't initialised yet. The Ready
+            // event will give us a second chance later. Log at Debug so
+            // users without Honorific don't see noise on every reload.
+            _log.Debug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
+            IsAvailable = false;
+            CurrentTitle = null;
+        }
+    }
+
+    // Honorific fires LocalCharacterTitleChanged through its nameplate hook
+    // (Honorific-master/Plugin.cs:665), which means we get title updates on
+    // character switches automatically as soon as the new character is
+    // rendered. While the user is in the character-select menu, HellionChat's
+    // window is hidden by default via HideWhenNotLoggedIn (Configuration.cs:152),
+    // so the stale-title window between logout and login isn't user-visible.
+    private void OnTitleChanged(string json)
+    {
+        // Don't update cached state when we've already decided we can't trust
+        // Honorific (e.g. version mismatch). Subscription stays live in case a
+        // compatible Honorific reloads, in which case Ready triggers TryInitialPull
+        // and sets IsAvailable back to true.
+        if (!IsAvailable) return;
+        CurrentTitle = ParseTitleJson(json);
+    }
+
+    private void OnReady()
+    {
+        // Honorific loaded after HellionChat; redo the version check and
+        // initial pull. Idempotent on purpose — Honorific can fire Ready
+        // more than once across reloads.
+        //
+        // Honorific's NotifyReady may dispatch from any thread, and
+        // TryInitialPull eventually calls IPC handlers that read
+        // ObjectTable.LocalPlayer — same "Not on main thread!" hazard as
+        // the constructor path. Schedule onto the framework thread.
+        _framework.RunOnFrameworkThread(TryInitialPull);
+    }
+
+    private void OnDisposing()
+    {
+        // Honorific is unloading. Drop our cached state so the header
+        // hides on the next frame; subscriptions stay registered because
+        // the gates may come back later (Honorific reload).
+        //
+        // Race-note: Honorific's NotifyDisposing calls ChangedLocalCharacterTitle(null)
+        // BEFORE SendMessage on the Disposing gate (IpcProvider.cs:109-111),
+        // so OnTitleChanged is expected to fire first and already null out
+        // CurrentTitle. We re-clear here as belt-and-braces; should the
+        // ordering ever flip, ShouldRenderSlot would still gate on IsAvailable.
+        CurrentTitle = null;
+        IsAvailable = false;
+        DetectedApiVersion = null;
+    }
+
+    private void TryUnsubscribe(Action unsubscribe)
+    {
+        try
+        {
+            unsubscribe();
+        }
+        catch (Exception ex)
+        {
+            _log.Debug(ex, "Honorific unsubscribe failed (likely already gone).");
+        }
+    }
+
+    // Threading note: Dalamud fires IPC events on the framework thread and
+    // ImGui renders on the framework thread, so OnTitleChanged and the
+    // render path that reads CurrentTitle never race — OnTitleChanged is
+    // safe to keep direct (no RunOnFrameworkThread wrap needed) because
+    // LocalCharacterTitleChanged delivery is framework-thread by Dalamud
+    // contract. If a future change moves either side onto a worker thread,
+    // switch to volatile/Interlocked for the CurrentTitle field.
+    //
+    // The constructor's initial pull and OnReady, on the other hand, are
+    // explicitly scheduled via IFramework.RunOnFrameworkThread because
+    // they run outside that contract: the constructor executes on the
+    // plugin-loader thread, and Honorific's NotifyReady can dispatch from
+    // any thread. Both call paths eventually invoke IPC handlers that read
+    // ObjectTable.LocalPlayer, which throws "Not on main thread!" off the
+    // framework thread — see the constructor comment block for context.
+    //
+    // Divergence from ChatTwo/Ipc/ExtraChat.cs: that file uses `volatile`
+    // on its state fields out of caution. We don't, because the framework-
+    // thread delivery is the documented Dalamud contract. If the two files
+    // ever need to share a threading audit, this is the place to revisit.
+
+    // --- Pure-logic helpers below; tested via HellionChat.Tests/Integrations. ---
+
+    internal static HonorificTitleData? ParseTitleJson(string json)
+    {
+        if (string.IsNullOrEmpty(json))
+            return null;
+
+        try
+        {
+            return JsonConvert.DeserializeObject<HonorificTitleData>(json);
+        }
+        catch (JsonException)
+        {
+            return null;
+        }
+    }
+
+    internal static bool IsApiVersionCompatible((uint Major, uint Minor) apiVersion)
+    {
+        return apiVersion.Major == ExpectedApiMajor;
+    }
+
+    internal static bool ShouldRenderSlot(
+        bool toggleEnabled,
+        bool isAvailable,
+        HonorificTitleData? title)
+    {
+        if (!toggleEnabled) return false;
+        if (!isAvailable) return false;
+        if (title is null) return false;
+        if (title.IsOriginal) return false;
+        if (string.IsNullOrEmpty(title.Title)) return false;
+        return true;
+    }
+}

HellionChat/Integrations/HonorificTitleData.cs

@@ -0,0 +1,17 @@
+using System.Numerics;
+
+namespace HellionChat.Integrations;
+
+// Local DTO mirroring Honorific's TitleData shape. We replicate the structure
+// instead of referencing Honorific.dll because a hard build-time dependency
+// would couple the two assemblies and break HellionChat at load time when
+// Honorific is missing. Glow, Color3, GradientColourSet and GradientAnimationStyle
+// are intentionally omitted — Cycle 1 renders text in the primary Color only;
+// the "Honorific Full Fidelity" backlog item adds them later as a pure
+// extension that won't break this DTO's existing consumers.
+internal sealed record HonorificTitleData(
+    string? Title,
+    bool IsPrefix,
+    bool IsOriginal,
+    Vector3? Color
+);

HellionChat/Integrations/IntegrationLinks.cs

@@ -0,0 +1,12 @@
+namespace HellionChat.Integrations;
+
+// External URLs for the third-party plugins HellionChat integrates with.
+// Kept separate from BrandingLinks (which is for Hellion-owned URLs) so
+// future cycles can extend this file with maintainer attribution links
+// for Moodles, NotificationMaster, ExtraChat, etc. without polluting the
+// brand-links class.
+internal static class IntegrationLinks
+{
+    public const string HonorificRepo = "https://github.com/Caraxi/Honorific";
+    public const string HonorificAuthor = "https://github.com/Caraxi";
+}

HellionChat/Ipc/ExtraChat.cs

@@ -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?)");
         }
     }
 

HellionChat/MessageManager.cs

@@ -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();
@@ -63,7 +66,12 @@ internal class MessageManager : IAsyncDisposable
 
         Store = new MessageStore(DatabasePath());
 
-        PendingMessageThread = new Thread(() => ProcessPendingMessages(PendingThreadCancellationToken.Token));
+        // IsBackground so a stuck worker never blocks plugin unload.
+        // Cooperative cancel via PendingThreadCancellationToken first, background flag is the safety net.
+        PendingMessageThread = new Thread(() => ProcessPendingMessages(PendingThreadCancellationToken.Token))
+        {
+            IsBackground = true,
+        };
         PendingMessageThread.Start();
 
         ContentIdResolverHook = Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.AddMsgSourceEntry>(RaptureLogModule.MemberFunctionPointers.AddMsgSourceEntry, ContentIdResolver);
@@ -82,16 +90,23 @@ internal class MessageManager : IAsyncDisposable
         Plugin.ChatGui.ChatMessageUnhandled -= ChatMessage;
 
         await PendingThreadCancellationToken.CancelAsync();
-        var timeout = 10_000; // 10s
-        while (timeout > 0)
-        {
-            if (!PendingMessageThread.IsAlive)
-                break;
 
-            timeout -= 100;
+        // 10s cooperative window; Thread.Abort is gone since .NET 5, so a
+        // stuck worker has to ride out the next AppDomain unload.
+        var deadline = TimeSpan.FromSeconds(10);
+        var stopwatch = Stopwatch.StartNew();
+        while (stopwatch.Elapsed < deadline && PendingMessageThread.IsAlive)
             await Task.Delay(100);
-            Plugin.Log.Debug("Sleeping because PendingMessageThread thread still alive");
+
-        }
+        if (PendingMessageThread.IsAlive)
+            Plugin.Log.Warning(
+                "PendingMessageThread did not observe cancellation within 10s. " +
+                "Worker remains on a background thread; next plugin reload releases it. " +
+                "If this recurs, file a bug with /xllog after the previous reload.");
+
+        // CTS owns an unmanaged WaitHandle; dispose even if the worker is
+        // alive — it checks IsCancellationRequested via the linked token.
+        PendingThreadCancellationToken.Dispose();
 
         Store.Dispose();
     }
@@ -113,8 +128,11 @@ internal class MessageManager : IAsyncDisposable
             LastContentId = contentId;
 
         // Drain the PendingSync queue into the PendingAsync queue.
-        while (PendingSync.TryDequeue(out var pending))
+        while (PendingSync.First is { } first)
-            PendingAsync.Enqueue(pending);
+        {
+            PendingSync.RemoveFirst();
+            PendingAsync.Enqueue(first.Value);
+        }
     }
 
     private void ProcessPendingMessages(CancellationToken token)
@@ -141,7 +159,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 +179,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 +247,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 +259,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;
+            last.Value.ContentId = contentId;
-            PendingSync.Last().AccountId = accountId;
+            last.Value.AccountId = accountId;
         }
         catch (Exception ex)
         {

HellionChat/MessageStore.cs

@@ -131,11 +131,12 @@ internal class MessageStore : IDisposable
 
     public void Dispose()
     {
+        // Pooling=false (set in Connect) avoids ClearAllPools, which is
+        // provider-wide and would touch other plugins' SQLite connections.
+        // GC.Collect was here as a defensive flush; removed because explicit
+        // Close already releases everything we hold.
         Connection.Close();
         Connection.Dispose();
-        // Closing the connection doesn't immediately release the file.
-        GC.Collect();
-        GC.WaitForPendingFinalizers();
     }
 
     private SqliteConnection Connect()
@@ -452,7 +453,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;
         }
 

HellionChat/Plugin.cs

@@ -2,6 +2,7 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
+using System.Runtime.ExceptionServices;
 using HellionChat.Ipc;
 using HellionChat.Resources;
 using HellionChat.Ui;
@@ -17,7 +18,7 @@ using Dalamud.Interface.ImGuiFileDialog;
 namespace HellionChat;
 
 // ReSharper disable once ClassNeverInstantiated.Global
-public sealed class Plugin : IDalamudPlugin
+public sealed class Plugin : IAsyncDalamudPlugin
 {
     public const string PluginName = "Hellion Chat";
 
@@ -41,28 +42,41 @@ public sealed class Plugin : IDalamudPlugin
     [PluginService] public static IAddonLifecycle AddonLifecycle { get; private set; } = null!;
     [PluginService] public static IPlayerState PlayerState { get; private set; } = null!;
     [PluginService] public static ISeStringEvaluator Evaluator { get; private set; } = null!;
+    [PluginService] public static ISelfTestRegistry SelfTestRegistry { get; private set; } = null!;
 
     public static Configuration Config = null!;
     public static FileDialogManager FileDialogManager { get; private set; } = null!;
 
     public readonly WindowSystem WindowSystem = new(PluginName);
-    public SettingsWindow SettingsWindow { get; }
-    public ChatLogWindow ChatLogWindow { get; }
-    public DbViewer DbViewer { get; }
-    public InputPreview InputPreview { get; }
-    public CommandHelpWindow CommandHelpWindow { get; }
-    public SeStringDebugger SeStringDebugger { get; }
-    public FirstRunWizard FirstRunWizard { get; }
-    public DebuggerWindow DebuggerWindow { get; }
 
-    internal Commands Commands { get; }
+    // v1.4.3: properties moved from { get; } to { get; private set; } = null!;
-    internal GameFunctions.GameFunctions Functions { get; }
+    // because LoadAsync now owns construction of the Phase-2 services.
-    internal MessageManager MessageManager { get; }
+    // Phase-1 services use the same shape for consistency, even though
-    internal AutoTellTabsService AutoTellTabsService { get; }
+    // they're still allocated in the ctor.
-    internal IpcManager Ipc { get; }
+    public SettingsWindow SettingsWindow { get; private set; } = null!;
-    internal ExtraChat ExtraChat { get; }
+    public ChatLogWindow ChatLogWindow { get; private set; } = null!;
-    internal TypingIpc TypingIpc { get; }
+    public DbViewer DbViewer { get; private set; } = null!;
-    internal FontManager FontManager { get; }
+    public InputPreview InputPreview { get; private set; } = null!;
+    public CommandHelpWindow CommandHelpWindow { get; private set; } = null!;
+    public SeStringDebugger SeStringDebugger { get; private set; } = null!;
+    public FirstRunWizard FirstRunWizard { get; private set; } = null!;
+    public DebuggerWindow DebuggerWindow { get; private set; } = null!;
+
+    internal Commands Commands { get; private set; } = null!;
+    internal GameFunctions.GameFunctions Functions { get; private set; } = null!;
+    internal MessageManager MessageManager { get; private set; } = null!;
+    internal AutoTellTabsService AutoTellTabsService { get; private set; } = null!;
+    internal IpcManager Ipc { get; private set; } = null!;
+    internal ExtraChat ExtraChat { get; private set; } = null!;
+    internal TypingIpc TypingIpc { get; private set; } = null!;
+    internal FontManager FontManager { get; private set; } = null!;
+    internal Themes.ThemeRegistry ThemeRegistry { get; private set; } = null!;
+    internal Ui.StatusBar StatusBar { get; private set; } = null!;
+    internal Integrations.HonorificService HonorificService { get; private set; } = null!;
+
+    // (B3) Lightless idempotency guard — Dalamud may fire DisposeAsync twice
+    // in a reload race; second call short-circuits.
+    private int _disposeStarted;
 
     internal int DeferredSaveFrames = -1;
 
@@ -94,14 +108,18 @@ public sealed class Plugin : IDalamudPlugin
 
     public Plugin()
     {
+        // Phase-1 ctor stays minimal: bootstrap-essentials only (conflict
+        // gate, config load, language + ImGui init, WindowSystem skeleton).
+        // Schema migrations and every service / window allocation moved to
+        // LoadAsync so the sync ctor returns fast. On failure here nothing
+        // is initialized yet, so just throw — there is nothing to clean up.
+
         // Refuse to start if upstream Chat 2 is loaded — prevents IPC
         // channel collisions and double-replacement of the in-game chat
         // window. Throwing here makes Dalamud abort the load cleanly with
         // our localized message instead of crashing FFXIV mid-frame.
         ChatTwoConflictDetector.ThrowIfChatTwoIsLoaded(Interface);
 
-        try
-        {
         GameStarted = Process.GetCurrentProcess().StartTime.ToUniversalTime();
 
         // Hellion Chat: take over config + database from upstream ChatTwo
@@ -111,132 +129,38 @@ public sealed class Plugin : IDalamudPlugin
 
         Config = Interface.GetPluginConfig() as Configuration ?? new Configuration();
 
+        // Schema-gate: v1.4.3 only supports config schema v16. Older configs
+        // went through their migrations in v1.2.1 (v15→v16) and earlier; users
+        // who skipped past those releases need to install v1.4.2 first to run
+        // the migration chain, then upgrade to v1.4.3.
+        if (Config.Version < 16)
+        {
+            throw new InvalidOperationException(
+                $"HellionChat v1.4.3 requires config schema v16, got v{Config.Version}. " +
+                "Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.3.");
+        }
+
         // Hellion Chat — Auto-Tell-Tabs Defense-in-Depth. SaveConfig
         // already strips temp tabs before persistence, but a previous
         // crash or external write could have left them in the JSON.
         // Drop them on load to guarantee the session-only invariant.
         Config.Tabs.RemoveAll(t => t.IsTempTab);
 
-            // Hellion Chat v9 → v10 — wipes the configuration so the new 8-tab
+        LanguageChanged(Interface.UiLanguage);
-            // layout starts from defaults instead of mapping every previous setting
+        ImGuiUtil.Initialize(this);
-            // to its new position. Backup-Failure ist non-fatal, der Wipe läuft
+
-            // trotzdem; dem User fehlt dann nur das manuelle Restore-Sicherheitsnetz.
+        DeferredSaveFrames = -1;
-            if (Config.Version < 10)
+
+        // WindowSystem skeleton is initialised by the readonly field above —
+        // no AddWindow yet; window construction lives in LoadAsync.
+    }
+
+    public async Task LoadAsync(CancellationToken cancellationToken)
     {
-                var pluginConfigsDir = Interface.ConfigDirectory.Parent?.FullName;
+        cancellationToken.ThrowIfCancellationRequested();
-                if (pluginConfigsDir is not null)
-                {
-                    var liveConfigPath = Path.Combine(pluginConfigsDir, $"{Interface.InternalName}.json");
-                    var backupPath = Path.Combine(pluginConfigsDir, $"{Interface.InternalName}.json.pre-v10-backup");
 
         try
         {
-                        if (File.Exists(liveConfigPath))
-                        {
-                            File.Copy(liveConfigPath, backupPath, overwrite: true);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Warning(ex, "HellionChat: pre-v10 config backup failed");
-                    }
-                }
-
-                Config = new Configuration
-                {
-                    Version = 10,
-                    FirstRunCompleted = true,
-                };
-                SaveConfig();
-
-                Notification.AddNotification(new Dalamud.Interface.ImGuiNotification.Notification
-                {
-                    Title = HellionStrings.SettingsRefactor_Migration_Title,
-                    Content = HellionStrings.SettingsRefactor_Migration_Content,
-                    Type = Dalamud.Interface.ImGuiNotification.NotificationType.Info,
-                    InitialDuration = TimeSpan.FromSeconds(25),
-                });
-            }
-
-            // Hellion Chat v10 → v11 — adds the global Configuration.PopOutInputEnabled
-            // master switch and SeenPopOutInputHint flag for the v0.6.0 pop-out
-            // input feature. Lightweight migration: defaults both fields,
-            // no user-facing notification because the change is opt-in only.
-            if (Config.Version < 11)
-            {
-                Config.PopOutInputEnabled = false;
-                Config.SeenPopOutInputHint = false;
-                Config.Version = 11;
-                SaveConfig();
-                Log.Information(
-                    "Migrated config v10 → v11: PopOutInputEnabled added (global, default off), " +
-                    "SeenPopOutInputHint added (default false)");
-            }
-
-            // Hellion Chat v11 → v12 — flips Configuration.PopOutInputEnabled from
-            // the v0.6.0 opt-in default (false) to opt-out (true) per v0.6.1 UX
-            // polish. Hard-flip is a deliberate design call (see Spec section 5.7);
-            // users are notified via the v0.6.1 hint banner (SeenPopOutHeaderHint
-            // reset). Re-toggle after migration is preserved because this block
-            // only fires for Version < 12.
-            if (Config.Version < 12)
-            {
-                Config.PopOutInputEnabled = true;
-                Config.SeenPopOutHeaderHint = false;
-                Config.Version = 12;
-                SaveConfig();
-                Log.Information(
-                    "Migrated config v11 → v12: PopOutInputEnabled hard-flipped to true (v0.6.1 default), " +
-                    "SeenPopOutHeaderHint reset to false (v0.6.1 banner re-armed)");
-            }
-
-            // Hellion Chat v12 → v13 — hard-resets the tab layout to the
-            // sharpened v1.0.0 defaults (5 thematic tabs, see TabsUtil and
-            // the default-fill block below). Existing tab state is wiped
-            // because per-channel mapping from the old General preset to
-            // the new General/System split would be ambiguous and would
-            // produce subtly wrong results for users who tweaked the old
-            // layout. A timestamped backup of the live config is written
-            // alongside it as a manual restore safety net. The wipe scope
-            // is intentionally narrow: only Config.Tabs is reset; Privacy,
-            // Retention, Theme and every other knob keeps its current value.
-            if (Config.Version < 13)
-            {
-                var pluginConfigsDir = Interface.ConfigDirectory.Parent?.FullName;
-                if (pluginConfigsDir is not null)
-                {
-                    var liveConfigPath = Path.Combine(pluginConfigsDir, $"{Interface.InternalName}.json");
-                    var backupPath = Path.Combine(pluginConfigsDir, $"{Interface.InternalName}.json.pre-v13-backup");
-
-                    try
-                    {
-                        if (File.Exists(liveConfigPath))
-                            File.Copy(liveConfigPath, backupPath, overwrite: true);
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Warning(ex, "HellionChat: pre-v13 config backup failed");
-                    }
-                }
-
-                Config.Tabs.Clear();
-                Config.Version = 13;
-                SaveConfig();
-
-                Log.Information(
-                    "Migrated config v12 → v13: tab layout hard-reset to v1.0.0 defaults; " +
-                    "pre-v13 config backup written next to the live file. " +
-                    "Default tabs will be populated by the Tabs.Count == 0 block.");
-
-                Notification.AddNotification(new Dalamud.Interface.ImGuiNotification.Notification
-                {
-                    Title = HellionStrings.SettingsRefactor_Migration_Title,
-                    Content = HellionStrings.SettingsRefactor_Migration_Content,
-                    Type = Dalamud.Interface.ImGuiNotification.NotificationType.Info,
-                    InitialDuration = TimeSpan.FromSeconds(25),
-                });
-            }
-
             // 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
@@ -254,32 +178,54 @@ public sealed class Plugin : IDalamudPlugin
                 Config.Tabs.Add(TabsUtil.HellionLinkshell);
             }
 
-            LanguageChanged(Interface.UiLanguage);
+            cancellationToken.ThrowIfCancellationRequested();
-            ImGuiUtil.Initialize(this);
 
+            // Sync allocation + handle registration. BuildFonts() registers
+            // IFontHandles with Dalamud's UiBuilder.FontAtlas — registration
+            // itself is non-blocking (handles stored, lambdas queued). Dalamud
+            // rebuilds the atlas on its own pipeline a few frames later; first
+            // frames render with the default font until the rebuild lands and
+            // ImGui switches to Hellion-Exo2 / NotoSans (visible "font-pop").
+            // Mirrors ChatTwo Plugin.cs:152.
+            FontManager = new FontManager();
+            FontManager.BuildFonts();
+
+            // Theme init stays sync on the LoadAsync continuation — cheap,
+            // and Active is read every Draw frame, so the registry must be
+            // wired before the first hook fires.
+            var customThemesDir = Path.Combine(Interface.ConfigDirectory.FullName, "themes");
+            Directory.CreateDirectory(customThemesDir);
+            SeedExampleThemeIfEmpty(customThemesDir);
+            ThemeRegistry = new Themes.ThemeRegistry(customThemesDir);
+            ThemeRegistry.Switch(Config.Theme);
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Service allocations: order encodes dependencies. Commands is
+            // alloc-only here; Initialise() runs after windows exist so the
+            // slash-commands can toggle their visibility. HonorificService
+            // registers IPC subscribers up-front so Ready/Disposing events
+            // are caught from the very first frame.
             FileDialogManager = new FileDialogManager();
-
             Commands = new Commands();
             Functions = new GameFunctions.GameFunctions(this);
             Ipc = new IpcManager();
             TypingIpc = new TypingIpc(this);
             ExtraChat = new ExtraChat();
-            FontManager = new FontManager();
+            HonorificService = new Integrations.HonorificService(Interface, Log, Framework);
+            StatusBar = new Ui.StatusBar();
+            MessageManager = new MessageManager(this);
 
-            MessageManager = new MessageManager(this); // Does it require UI?
+            // Auto-Tell-Tabs subscribes to MessageManager.MessageProcessed for
-
+            // live tells and to ClientState.Logout for cleanup; needs the live
-            // Hellion Chat — Auto-Tell-Tabs service. Subscribes to the
+            // store handed in at construction.
-            // MessageManager's MessageProcessed event for live tells and
-            // to ClientState.Logout for the cleanup pass. Created after
-            // MessageManager so the constructor can hand off the live
-            // store and event source.
             AutoTellTabsService = new AutoTellTabsService(this, MessageManager, MessageManager.Store);
             AutoTellTabsService.Initialize();
 
-            // Hellion Chat — daily retention sweep, off-thread so it never
+            // SelfTest steps poll Active per frame and need the registry wired.
-            // blocks plugin load. Skips itself when disabled or already ran
+            SelfTestRegistry.RegisterTestSteps([
-            // within the past 24 hours.
+                new SelfTests.ThemeSwitchSelfTestStep(this),
-            RunRetentionSweepIfDue();
+            ]);
 
             ChatLogWindow = new ChatLogWindow(this);
             SettingsWindow = new SettingsWindow(this);
@@ -304,17 +250,38 @@ public sealed class Plugin : IDalamudPlugin
             if (!Config.FirstRunCompleted)
                 FirstRunWizard.IsOpen = true;
 
-            FontManager.BuildFonts();
+            cancellationToken.ThrowIfCancellationRequested();
-
-            Interface.UiBuilder.DisableCutsceneUiHide = true;
-            Interface.UiBuilder.DisableGposeUiHide = true;
 
             // let all the other components register, then initialize commands
             Commands.Initialise();
 
+            // Daily retention sweep, fire-and-forget. Skips itself when
+            // disabled or when it already ran within the past 24 hours.
+            RunRetentionSweepIfDue();
+
+            if (Config.ShowEmotes)
+                _ = EmoteCache.LoadData(); // Fire-and-forget, exceptions caught inside
+
             if (Interface.Reason is not PluginLoadReason.Boot)
                 MessageManager.FilterAllTabsAsync();
 
+            Interface.UiBuilder.DisableCutsceneUiHide = true;
+            Interface.UiBuilder.DisableGposeUiHide = true;
+
+            #if !DEBUG
+            // Fire-and-forget on a worker thread. The first auto-translate use of
+            // a session may have a sub-second hitch if the cache hasn't filled yet,
+            // but that's preferable to making every user wait ~300 ms during
+            // plugin load for a cache they may never touch. ChatTwo (upstream)
+            // does this sync; we trade load-time for first-use latency.
+            _ = Task.Run(AutoTranslate.PreloadCache, cancellationToken);
+            #endif
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // (B1) Hooks last: every service and window must be live before
+            // Dalamud fires our first Draw / FrameworkUpdate tick. Anything
+            // earlier risks rendering against null FontManager / ThemeRegistry.
             Framework.Update += FrameworkUpdate;
             Interface.UiBuilder.Draw += Draw;
             Interface.LanguageChanged += LanguageChanged;
@@ -323,58 +290,127 @@ public sealed class Plugin : IDalamudPlugin
             // most useful landing place; OpenConfigUi is already wired to
             // the same toggle inside SettingsWindow.
             Interface.UiBuilder.OpenMainUi += OpenMainUi;
-
-            if (Config.ShowEmotes)
-                _ = EmoteCache.LoadData(); // Fire-and-forget intentional, exceptions are caught inside
-
-            #if !DEBUG
-            // Avoid 300ms hitch when sending first message by preloading the
-            // auto-translate cache. Don't do this in debug because it makes
-            // profiling difficult.
-            AutoTranslate.PreloadCache();
-            #endif
         }
-        catch (Exception ex)
+        catch
         {
-            Log.Error(ex, "Plugin load threw an error, turning off plugin");
+            // Mirror the v1.4.0 load-failure recovery: hand off to DisposeAsync
-            Dispose();
+            // so partially-built services are torn down. Swallow the cleanup
-
+            // exception so the original load failure stays the visible cause.
-            // Re-throw the exception to fail the plugin load.
+            try { await DisposeAsync().ConfigureAwait(false); }
+            catch { /* keep original failure */ }
             throw;
         }
     }
 
-    // Suppressing this warning because Dispose() is called in Plugin() if the
+    // Suppressing this warning because DisposeAsync may run after a partial
-    // load fails, so some values may not be initialized.
+    // LoadAsync, so some properties may not be initialized.
     [SuppressMessage("ReSharper", "ConditionalAccessQualifierIsNonNullableAccordingToAPIContract")]
-    public void Dispose()
+    public async ValueTask DisposeAsync()
     {
-        Interface.UiBuilder.OpenMainUi -= OpenMainUi;
+        // (B3) Idempotency guard — Dalamud may reload-race us; second
-        Interface.LanguageChanged -= LanguageChanged;
+        // call short-circuits so we don't double-dispose services.
-        Interface.UiBuilder.Draw -= Draw;
+        if (Interlocked.Exchange(ref _disposeStarted, 1) != 0)
-        Framework.Update -= FrameworkUpdate;
+            return;
-        GameFunctions.GameFunctions.SetChatInteractable(true);
 
-        WindowSystem?.RemoveAllWindows();
+        Exception? failure = null;
-        ChatLogWindow?.Dispose();
-        DbViewer?.Dispose();
-        InputPreview?.Dispose();
-        SettingsWindow?.Dispose();
-        DebuggerWindow?.Dispose();
-        SeStringDebugger?.Dispose();
 
-        TypingIpc?.Dispose();
+        // Hooks unsubscribe FIRST so no Draw / FrameworkUpdate / LanguageChanged
-        ExtraChat?.Dispose();
+        // tick can fire while we're tearing services down. Mirrors the
-        Ipc?.Dispose();
+        // hooks-last subscribe order in LoadAsync.
-        // Dispose the Auto-Tell-Tabs service before MessageManager so it
+        failure = CaptureFailure(failure, () => Interface.UiBuilder.OpenMainUi -= OpenMainUi);
-        // can cleanly unsubscribe from the MessageProcessed event before
+        failure = CaptureFailure(failure, () => Interface.LanguageChanged -= LanguageChanged);
-        // its source goes away.
+        failure = CaptureFailure(failure, () => Interface.UiBuilder.Draw -= Draw);
-        AutoTellTabsService?.Dispose();
+        failure = CaptureFailure(failure, () => Framework.Update -= FrameworkUpdate);
-        MessageManager?.DisposeAsync().AsTask().Wait();
-        Functions?.Dispose();
-        Commands?.Dispose();
 
-        EmoteCache.Dispose();
+        // v1.4.0 F5.3 — flush a pending DeferredSave before service teardown,
+        // since FrameworkUpdate just got unsubscribed and won't fire it.
+        failure = CaptureFailure(failure, () =>
+        {
+            if (DeferredSaveFrames >= 0)
+            {
+                SaveConfig();
+                DeferredSaveFrames = -1;
+            }
+        });
+
+        // Auto-Tell-Tabs unsubscribes from MessageProcessed before MessageManager
+        // goes away. Pure-memory cleanup, no framework-thread requirement.
+        failure = CaptureFailure(failure, () => AutoTellTabsService?.Dispose());
+
+        // v1.4.0 F6.2 — MessageManager has its own async dispose path
+        // (DB flush, pending-message thread shutdown). Run it before the
+        // framework-block so the worker threads are quiesced first.
+        if (MessageManager is not null)
+        {
+            failure = await CaptureFailureAsync(failure, () => MessageManager.DisposeAsync().AsTask())
+                .ConfigureAwait(false);
+        }
+
+        // (B4) Game-Function / IPC / UI-Window cleanup MUST run on the
+        // framework thread. WindowSystem mutations and IPC subscriber
+        // disposes touch Dalamud state that's only safe from the framework.
+        // Worker-thread DisposeAsync would race the next Draw tick.
+        // Per-line CaptureFailure so a single throw can't strand the lines
+        // behind it; mirrors Lightless DisposeFrameworkBoundServicesAsync.
+        try
+        {
+            await Framework.RunOnFrameworkThread(() =>
+            {
+                // Game-Functions first — other services may still query
+                // chat-interactable state during their Dispose.
+                failure = CaptureFailure(failure, () => GameFunctions.GameFunctions.SetChatInteractable(true));
+
+                // IPC subscribers — dispose before windows so any final
+                // event firing from the IPC source can't reach a half-torn
+                // ChatLogWindow.
+                failure = CaptureFailure(failure, () => HonorificService?.Dispose());
+                failure = CaptureFailure(failure, () => TypingIpc?.Dispose());
+                failure = CaptureFailure(failure, () => ExtraChat?.Dispose());
+                failure = CaptureFailure(failure, () => Ipc?.Dispose());
+
+                // Windows — RemoveAllWindows first, then per-window Dispose.
+                // Order matches the pre-v1.4.3 Dispose body byte-for-byte.
+                // CommandHelpWindow and FirstRunWizard don't implement
+                // IDisposable; their resources are reclaimed via WindowSystem.
+                failure = CaptureFailure(failure, () => WindowSystem?.RemoveAllWindows());
+                failure = CaptureFailure(failure, () => ChatLogWindow?.Dispose());
+                failure = CaptureFailure(failure, () => DbViewer?.Dispose());
+                failure = CaptureFailure(failure, () => InputPreview?.Dispose());
+                failure = CaptureFailure(failure, () => SettingsWindow?.Dispose());
+                failure = CaptureFailure(failure, () => DebuggerWindow?.Dispose());
+                failure = CaptureFailure(failure, () => SeStringDebugger?.Dispose());
+            }).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            failure ??= ex;
+        }
+
+        // Pure-memory cleanups — no Framework / UI / IPC touch, so they
+        // run on whatever thread DisposeAsync resumes on.
+        failure = CaptureFailure(failure, () => Functions?.Dispose());
+        failure = CaptureFailure(failure, () => Commands?.Dispose());
+        failure = CaptureFailure(failure, () => EmoteCache.Dispose());
+
+        if (failure is not null)
+            ExceptionDispatchInfo.Capture(failure).Throw();
+    }
+
+    // Lightless-pattern capture helpers: run cleanup, remember the FIRST
+    // exception, keep going. Without these one mid-teardown failure would
+    // skip every cleanup behind it and leave services half-torn.
+    private static Exception? CaptureFailure(Exception? failure, Action action)
+    {
+        try { action(); }
+        catch (Exception ex) { failure ??= ex; }
+        return failure;
+    }
+
+    private static async ValueTask<Exception?> CaptureFailureAsync(Exception? failure, Func<Task> action)
+    {
+        try { await action().ConfigureAwait(false); }
+        catch (Exception ex) { failure ??= ex; }
+        return failure;
     }
 
     private static void MigrateFromChatTwoLayout()
@@ -508,6 +544,11 @@ public sealed class Plugin : IDalamudPlugin
             policy[(int)(ushort)type] = days;
         var defaultDays = Config.RetentionDefaultDays;
 
+        // IsBackground = true for the same reason as PendingMessageThread:
+        // a stuck sweep must never block plugin unload. RunRetentionSweepIfDue
+        // guards the run-frequency, and the sweep itself uses the framework's
+        // cooperative cancellation pattern. The background flag is the safety
+        // net if the sweep ever takes longer than expected.
         new Thread(() =>
         {
             // Bail out cheaply if a manual sweep is already in flight; the
@@ -529,10 +570,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 +600,10 @@ public sealed class Plugin : IDalamudPlugin
 
     private void Draw()
     {
-        // Hellion theme is pushed once per frame here so every plugin window
+        // Theme-Engine ist ab v14 immer aktiv; Klassik ist jetzt ein eigenes
-        // (chat log, settings, viewers, wizard, file dialog) renders with
+        // Theme statt einem deaktivierten Hellion-Theme. Active wird einmal
-        // the same palette. Skipping the push leaves the upstream Dalamud
+        // pro Frame aus der Registry gelesen.
-        // look untouched for users who flipped the toggle off.
+        using IDisposable _style = HellionStyle.PushGlobal(ThemeRegistry.Active, Config.WindowOpacity);
-        using IDisposable? _style = Config.HellionThemeEnabled
-            ? HellionStyle.PushGlobal(Config.HellionThemeWindowOpacity)
-            : null;
 
         ChatLogWindow.BeginFrame();
 
@@ -645,4 +688,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();
+        }
+    }
 }

HellionChat/Resources/HellionStrings.Designer.cs

@@ -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,77 @@ 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));
+    internal static string Settings_Card_Integrations_Title => Get(nameof(Settings_Card_Integrations_Title));
+    internal static string Settings_Card_Integrations_Subtext => Get(nameof(Settings_Card_Integrations_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));
+
+    // Hellion Chat — v1.3.0 Integrations tab (Honorific + Coming-Soon roadmap)
+    internal static string Settings_Tab_Integrations => Get(nameof(Settings_Tab_Integrations));
+    internal static string Settings_Integrations_Intro => Get(nameof(Settings_Integrations_Intro));
+    internal static string Settings_Integrations_Honorific_SectionHeader => Get(nameof(Settings_Integrations_Honorific_SectionHeader));
+    internal static string Settings_Integrations_Honorific_Status_Detected => Get(nameof(Settings_Integrations_Honorific_Status_Detected));
+    internal static string Settings_Integrations_Honorific_Status_NotInstalled => Get(nameof(Settings_Integrations_Honorific_Status_NotInstalled));
+    internal static string Settings_Integrations_Honorific_Status_Incompatible => Get(nameof(Settings_Integrations_Honorific_Status_Incompatible));
+    internal static string Settings_Integrations_Honorific_Toggle => Get(nameof(Settings_Integrations_Honorific_Toggle));
+    internal static string Settings_Integrations_Honorific_ToggleHint => Get(nameof(Settings_Integrations_Honorific_ToggleHint));
+    internal static string Settings_Integrations_Honorific_LinkRepo => Get(nameof(Settings_Integrations_Honorific_LinkRepo));
+    internal static string Settings_Integrations_Honorific_LinkAuthor => Get(nameof(Settings_Integrations_Honorific_LinkAuthor));
+    internal static string Settings_Integrations_ComingSoon_SectionHeader => Get(nameof(Settings_Integrations_ComingSoon_SectionHeader));
+    internal static string Settings_Integrations_ComingSoon_Intro => Get(nameof(Settings_Integrations_ComingSoon_Intro));
+    internal static string Settings_Integrations_ComingSoon_ContextMenu_Title => Get(nameof(Settings_Integrations_ComingSoon_ContextMenu_Title));
+    internal static string Settings_Integrations_ComingSoon_ContextMenu_Description => Get(nameof(Settings_Integrations_ComingSoon_ContextMenu_Description));
+    internal static string Settings_Integrations_ComingSoon_Notifications_Title => Get(nameof(Settings_Integrations_ComingSoon_Notifications_Title));
+    internal static string Settings_Integrations_ComingSoon_Notifications_Description => Get(nameof(Settings_Integrations_ComingSoon_Notifications_Description));
+    internal static string Settings_Integrations_ComingSoon_RPStatus_Title => Get(nameof(Settings_Integrations_ComingSoon_RPStatus_Title));
+    internal static string Settings_Integrations_ComingSoon_RPStatus_Description => Get(nameof(Settings_Integrations_ComingSoon_RPStatus_Description));
+    internal static string Settings_Integrations_ComingSoon_ExtraChat_Title => Get(nameof(Settings_Integrations_ComingSoon_ExtraChat_Title));
+    internal static string Settings_Integrations_ComingSoon_ExtraChat_Description => Get(nameof(Settings_Integrations_ComingSoon_ExtraChat_Description));
+    internal static string Settings_Integrations_ComingSoon_QuickDM_Title => Get(nameof(Settings_Integrations_ComingSoon_QuickDM_Title));
+    internal static string Settings_Integrations_ComingSoon_QuickDM_Description => Get(nameof(Settings_Integrations_ComingSoon_QuickDM_Description));
+    internal static string Settings_Integrations_GotAnIdea_SectionHeader => Get(nameof(Settings_Integrations_GotAnIdea_SectionHeader));
+    internal static string Settings_Integrations_GotAnIdea_Body => Get(nameof(Settings_Integrations_GotAnIdea_Body));
+    internal static string Settings_Integrations_GotAnIdea_LinkLabel => Get(nameof(Settings_Integrations_GotAnIdea_LinkLabel));
+
+    // Hellion Chat — v1.3.0 Honorific title slot tooltip
+    internal static string ChatHeader_HonorificTitle_Tooltip => Get(nameof(ChatHeader_HonorificTitle_Tooltip));
 }

HellionChat/Resources/HellionStrings.de.resx

@@ -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,244 @@
   <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_Card_Integrations_Title" xml:space="preserve">
+    <value>Integrationen</value>
+  </data>
+  <data name="Settings_Card_Integrations_Subtext" xml:space="preserve">
+    <value>Andere Dalamud-Plugins, mit denen HellionChat zusammenarbeitet. Auto-detected, mit Vorschau auf kommende Integrationen.</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>
+  <data name="Settings_Tab_Integrations" xml:space="preserve">
+    <value>Integrationen</value>
+  </data>
+  <data name="Settings_Integrations_Intro" xml:space="preserve">
+    <value>Plugin-Integrationen lassen HellionChat mit anderen installierten Dalamud-Plugins zusammenarbeiten. Jede Integration erkennt ihr Ziel automatisch und deaktiviert sich still, wenn das Ziel-Plugin fehlt.</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_SectionHeader" xml:space="preserve">
+    <value>Honorific</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Status_Detected" xml:space="preserve">
+    <value>Erkannt (v{0}.{1})</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Status_NotInstalled" xml:space="preserve">
+    <value>Nicht installiert</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Status_Incompatible" xml:space="preserve">
+    <value>Inkompatible API-Version ({0} erwartet, {1}.{2} gefunden)</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Toggle" xml:space="preserve">
+    <value>Honorific-Titel im Chat-Header anzeigen</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_ToggleHint" xml:space="preserve">
+    <value>Zeigt deinen Custom-Titel aus Honorific im Header über dem Chat-Log an, in der von dir gewählten Farbe.</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve">
+    <value>Honorific auf GitHub</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_LinkAuthor" xml:space="preserve">
+    <value>von Caraxi</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_SectionHeader" xml:space="preserve">
+    <value>Demnächst</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_Intro" xml:space="preserve">
+    <value>Diese Integrationen sind auf der Roadmap. Die Einstellungen erscheinen automatisch, sobald das jeweilige Plugin angebunden ist.</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_ContextMenu_Title" xml:space="preserve">
+    <value>Kontextmenü-Aktionen</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_ContextMenu_Description" xml:space="preserve">
+    <value>Rechtsklick auf einen Namen im Chat: zu PlayerTrack springen, Lodestone-Profil öffnen oder mit einem Klick eine DM verfassen.</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_Notifications_Title" xml:space="preserve">
+    <value>Smart Notifications (NotificationMaster)</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_Notifications_Description" xml:space="preserve">
+    <value>Mentions und DMs über NotificationMaster: System-Toasts, Taskbar-Flash und Sounds pro Channel.</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_RPStatus_Title" xml:space="preserve">
+    <value>RP-Status-Block (Moodles · LightlessClient)</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_RPStatus_Description" xml:space="preserve">
+    <value>Moodles-Status-Icons und Pair-Badges direkt neben den Chat-Namen anzeigen, für mehr Roleplay-Kontext.</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_ExtraChat_Title" xml:space="preserve">
+    <value>ExtraChat-Channels</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_ExtraChat_Description" xml:space="preserve">
+    <value>End-to-End-verschlüsselte Cross-Datacenter-Linkshells nativ in HellionChat hosten.</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_QuickDM_Title" xml:space="preserve">
+    <value>Quick-DM-Button (XIVInstantMessenger)</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_QuickDM_Description" xml:space="preserve">
+    <value>DM-Schnellzugriff direkt aus dem Chat-Fenster, ein Klick.</value>
+  </data>
+  <data name="Settings_Integrations_GotAnIdea_SectionHeader" xml:space="preserve">
+    <value>Idee?</value>
+  </data>
+  <data name="Settings_Integrations_GotAnIdea_Body" xml:space="preserve">
+    <value>Idee für eine Plugin-Integration, die nicht auf der Liste steht? Komm auf den Hellion-Forge-Discord und schreib mir. Community-Input bestimmt die Roadmap.</value>
+  </data>
+  <data name="Settings_Integrations_GotAnIdea_LinkLabel" xml:space="preserve">
+    <value>Hellion Forge öffnen</value>
+  </data>
+  <data name="ChatHeader_HonorificTitle_Tooltip" xml:space="preserve">
+    <value>Custom-Titel von Honorific</value>
+  </data>
 </root>

HellionChat/Resources/HellionStrings.resx

@@ -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,244 @@
   <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_Card_Integrations_Title" xml:space="preserve">
+    <value>Integrations</value>
+  </data>
+  <data name="Settings_Card_Integrations_Subtext" xml:space="preserve">
+    <value>Other Dalamud plugins HellionChat reacts to. Auto-detected, with a "coming soon" preview of upcoming integrations.</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>
+  <data name="Settings_Tab_Integrations" xml:space="preserve">
+    <value>Integrations</value>
+  </data>
+  <data name="Settings_Integrations_Intro" xml:space="preserve">
+    <value>Plugin integrations let HellionChat react to other installed Dalamud plugins. Each integration auto-detects its target and silently disables itself when the target plugin is not present.</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_SectionHeader" xml:space="preserve">
+    <value>Honorific</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Status_Detected" xml:space="preserve">
+    <value>Detected (v{0}.{1})</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Status_NotInstalled" xml:space="preserve">
+    <value>Not installed</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Status_Incompatible" xml:space="preserve">
+    <value>Incompatible API version ({0} expected, {1}.{2} detected)</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Toggle" xml:space="preserve">
+    <value>Show Honorific title in chat header</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_ToggleHint" xml:space="preserve">
+    <value>Displays your custom title from Honorific in the header above the chat log, in your chosen colour.</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve">
+    <value>Honorific on GitHub</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_LinkAuthor" xml:space="preserve">
+    <value>by Caraxi</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_SectionHeader" xml:space="preserve">
+    <value>Coming soon</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_Intro" xml:space="preserve">
+    <value>These integrations are on the roadmap. The settings for each appear automatically once the underlying plugin is wired up.</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_ContextMenu_Title" xml:space="preserve">
+    <value>Context menu actions</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_ContextMenu_Description" xml:space="preserve">
+    <value>Right-click a name in chat to jump to PlayerTrack, open the Lodestone profile, or compose a DM in one click.</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_Notifications_Title" xml:space="preserve">
+    <value>Smart notifications (NotificationMaster)</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_Notifications_Description" xml:space="preserve">
+    <value>Route mentions and DMs through NotificationMaster for system toasts, taskbar flash, and per-channel sounds.</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_RPStatus_Title" xml:space="preserve">
+    <value>RP status block (Moodles · LightlessClient)</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_RPStatus_Description" xml:space="preserve">
+    <value>Show Moodles status icons and pair-badges inline next to chat names for richer roleplay context.</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_ExtraChat_Title" xml:space="preserve">
+    <value>ExtraChat channels</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_ExtraChat_Description" xml:space="preserve">
+    <value>Host end-to-end-encrypted cross-datacenter linkshells natively in HellionChat.</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_QuickDM_Title" xml:space="preserve">
+    <value>Quick DM button (XIVInstantMessenger)</value>
+  </data>
+  <data name="Settings_Integrations_ComingSoon_QuickDM_Description" xml:space="preserve">
+    <value>One-click DM compose without leaving the chat window.</value>
+  </data>
+  <data name="Settings_Integrations_GotAnIdea_SectionHeader" xml:space="preserve">
+    <value>Got an idea?</value>
+  </data>
+  <data name="Settings_Integrations_GotAnIdea_Body" xml:space="preserve">
+    <value>Got an idea for a plugin integration that's not on this list? Hop on the Hellion Forge Discord and tell me. Community input drives the roadmap.</value>
+  </data>
+  <data name="Settings_Integrations_GotAnIdea_LinkLabel" xml:space="preserve">
+    <value>Open Hellion Forge</value>
+  </data>
+  <data name="ChatHeader_HonorificTitle_Tooltip" xml:space="preserve">
+    <value>Honorific custom title</value>
+  </data>
 </root>

HellionChat/SelfTests/ThemeSwitchSelfTestStep.cs

@@ -0,0 +1,85 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Plugin.SelfTest;
+using HellionChat.Themes;
+
+namespace HellionChat.SelfTests;
+
+// Validates the runtime theme-switch contract from the user side. The
+// caller toggles the active theme via Settings -> Theme & Layout, the
+// step polls ThemeRegistry.Active per frame and only passes once the
+// slug has moved away from the initial value and back. The ABGR cache
+// is sanity-checked on every frame: a freshly switched theme must carry
+// a populated cache, otherwise Switch() forgot the recompute and the UI
+// would still draw, just with all-transparent slots.
+internal sealed class ThemeSwitchSelfTestStep : ISelfTestStep
+{
+    private readonly Plugin plugin;
+    private string? initialSlug;
+    private bool switchedAway;
+
+    public ThemeSwitchSelfTestStep(Plugin plugin)
+    {
+        this.plugin = plugin;
+    }
+
+    public string Name => "Hellion Chat - Theme switch";
+
+    public SelfTestStepResult RunStep()
+    {
+        var registry = this.plugin.ThemeRegistry;
+        if (registry is null)
+            return SelfTestStepResult.Fail;
+
+        var active = registry.Active;
+        if (active is null)
+            return SelfTestStepResult.Fail;
+
+        if (!HasPopulatedCache(active))
+            return SelfTestStepResult.Fail;
+
+        if (this.initialSlug is null)
+        {
+            this.initialSlug = active.Slug;
+            ImGui.Text($"Initial theme: \"{this.initialSlug}\". Open Settings -> Theme & Layout and pick a different theme.");
+            return SelfTestStepResult.Waiting;
+        }
+
+        if (!this.switchedAway)
+        {
+            if (!string.Equals(active.Slug, this.initialSlug, StringComparison.OrdinalIgnoreCase))
+            {
+                this.switchedAway = true;
+                return SelfTestStepResult.Waiting;
+            }
+
+            ImGui.Text($"Switch the active theme away from \"{this.initialSlug}\".");
+            return SelfTestStepResult.Waiting;
+        }
+
+        if (!string.Equals(active.Slug, this.initialSlug, StringComparison.OrdinalIgnoreCase))
+        {
+            ImGui.Text($"Switch back to \"{this.initialSlug}\" to finish the test.");
+            return SelfTestStepResult.Waiting;
+        }
+
+        return SelfTestStepResult.Pass;
+    }
+
+    public void CleanUp()
+    {
+        this.initialSlug = null;
+        this.switchedAway = false;
+    }
+
+    // Any non-zero slot proves the cache was actually recomputed for the
+    // current theme. We don't compare against a reference, because custom
+    // themes can legitimately share slot values with a built-in.
+    private static bool HasPopulatedCache(Theme theme)
+    {
+        var cache = theme.AbgrCache;
+        return (cache.Primary
+              | cache.WindowBg
+              | cache.TextPrimary
+              | cache.Border) != 0u;
+    }
+}

HellionChat/Themes/Builtin/Chat2Classic.cs

@@ -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
+    );
+}

HellionChat/Themes/Builtin/EventHorizon.cs

@@ -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 Forge",
+        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"),
+        })
+    );
+}

HellionChat/Themes/Builtin/ForgeMerchantman.cs

@@ -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: "Carla Beleandis",
+        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"),
+        })
+    );
+}

HellionChat/Themes/Builtin/HellionArctic.cs

@@ -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 Forge",
+        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"),
+        })
+    );
+}

HellionChat/Themes/Builtin/HellionSpectrum.cs

@@ -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 Forge",
+        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"),
+        })
+    );
+}

HellionChat/Themes/Builtin/IndigoViolet.cs

@@ -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"),
+        })
+    );
+}

HellionChat/Themes/Builtin/MintGrove.cs

@@ -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: "Carla Beleandis",
+        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"),
+        })
+    );
+}

HellionChat/Themes/Builtin/MoonlitBloom.cs

@@ -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 Forge",
+        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"),
+        })
+    );
+}

HellionChat/Themes/Builtin/NightBlue.cs

@@ -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"),
+        })
+    );
+}

HellionChat/Themes/Builtin/SynthwaveSunset.cs

@@ -0,0 +1,76 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class SynthwaveSunset
+{
+    public const string Slug = "synthwave-sunset";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Synthwave Sunset",
+        Author: "Hellion Forge",
+        Description: "Hot Magenta + Cyan on midnight violet. 80s neon-grid vibes for late-night raids.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#C71585"),
+            Primary:        ColourUtil.HexToRgba("#FF2D95"),
+            PrimaryLight:   ColourUtil.HexToRgba("#FF6BB6"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#FF2D9599"),
+
+            AccentDark:     ColourUtil.HexToRgba("#0098B8"),
+            Accent:         ColourUtil.HexToRgba("#00F0FF"),
+            AccentLight:    ColourUtil.HexToRgba("#5CFFFE"),
+
+            Identity:       ColourUtil.HexToRgba("#FF2D95"),
+
+            WindowBg:       ColourUtil.HexToRgba("#13041F"),
+            ChildBg:        ColourUtil.HexToRgba("#1E0A35"),
+            FrameBg:        ColourUtil.HexToRgba("#2A1247"),
+            Surface:        ColourUtil.HexToRgba("#3A1860"),
+            SurfaceHover:   ColourUtil.HexToRgba("#4A2475"),
+            Border:         ColourUtil.HexToRgba("#FF2D9566"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#F0DFFF"),
+            TextMuted:      ColourUtil.HexToRgba("#A88BC4"),
+            TextDim:        ColourUtil.HexToRgba("#6F4D8E"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#39FF14"),
+            StatusDanger:   ColourUtil.HexToRgba("#FF3838"),
+            StatusWarning:  ColourUtil.HexToRgba("#FFD700"),
+            StatusInfo:     ColourUtil.HexToRgba("#00F0FF")
+        ),
+        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>
+        {
+            // Synthwave Sunset — Magenta dominiert die warmen Channels (Yell/Shout/FC),
+            // Cyan dominiert die kühlen (Tell/Party). Neon-Akzente für Status-nahe Channels.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#F0DFFF"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#FF2D95"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#FF6BB6"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#00F0FF"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#5CFFFE"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#5CFFFE"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#FF8C00"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#FF2D95"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#39FF14"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#5CFFFE"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#39FF14"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#FF8C00"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#FFD700"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#00F0FF"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#FF6BB6"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#FF2D95"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#A88BC4"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#5CFFFE"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#FF6BB6"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#A88BC4"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#A88BC4"),
+        })
+    );
+}

HellionChat/Themes/Builtin/example-theme.json

@@ -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
+  }
+}

HellionChat/Themes/Theme.cs

@@ -0,0 +1,58 @@
+using HellionChat.Util;
+
+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
+)
+{
+    // Pre-computed ABGR mirror of ThemeColors so PushGlobal can skip the
+    // RgbaToAbgr conversion per slot per frame.
+    public ThemeAbgrCache AbgrCache { get; private set; }
+
+    public void RecomputeAbgrCache()
+    {
+        AbgrCache = new ThemeAbgrCache(
+            PrimaryDark:   ColourUtil.RgbaToAbgr(Colors.PrimaryDark),
+            Primary:       ColourUtil.RgbaToAbgr(Colors.Primary),
+            PrimaryLight:  ColourUtil.RgbaToAbgr(Colors.PrimaryLight),
+            PrimaryGlow:   ColourUtil.RgbaToAbgr(Colors.PrimaryGlow),
+            AccentDark:    ColourUtil.RgbaToAbgr(Colors.AccentDark),
+            Accent:        ColourUtil.RgbaToAbgr(Colors.Accent),
+            AccentLight:   ColourUtil.RgbaToAbgr(Colors.AccentLight),
+            Identity:      ColourUtil.RgbaToAbgr(Colors.Identity),
+            WindowBg:      ColourUtil.RgbaToAbgr(Colors.WindowBg),
+            ChildBg:       ColourUtil.RgbaToAbgr(Colors.ChildBg),
+            FrameBg:       ColourUtil.RgbaToAbgr(Colors.FrameBg),
+            Surface:       ColourUtil.RgbaToAbgr(Colors.Surface),
+            SurfaceHover:  ColourUtil.RgbaToAbgr(Colors.SurfaceHover),
+            Border:        ColourUtil.RgbaToAbgr(Colors.Border),
+            TextPrimary:   ColourUtil.RgbaToAbgr(Colors.TextPrimary),
+            TextMuted:     ColourUtil.RgbaToAbgr(Colors.TextMuted),
+            TextDim:       ColourUtil.RgbaToAbgr(Colors.TextDim),
+            StatusSuccess: ColourUtil.RgbaToAbgr(Colors.StatusSuccess),
+            StatusDanger:  ColourUtil.RgbaToAbgr(Colors.StatusDanger),
+            StatusWarning: ColourUtil.RgbaToAbgr(Colors.StatusWarning),
+            StatusInfo:    ColourUtil.RgbaToAbgr(Colors.StatusInfo));
+    }
+}
+
+// Mirrors ThemeColors slot-for-slot. The FillsAll21Slots test pins the
+// contract — a new slot without its mirror fails the build.
+public readonly record struct ThemeAbgrCache(
+    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
+);

HellionChat/Themes/ThemeChatColors.cs

@@ -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
+);

HellionChat/Themes/ThemeColors.cs

@@ -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
+);

HellionChat/Themes/ThemeJsonLoader.cs

@@ -0,0 +1,135 @@
+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)
+    {
+        // FileShare.Read lets concurrent readers and well-behaved editors share
+        // the handle; atomic-replace editors still raise IOException, caught upstream.
+        using var stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
+        using var reader = new StreamReader(stream);
+        var json = reader.ReadToEnd();
+        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();
+    }
+}

HellionChat/Themes/ThemeJsonWriter.cs

@@ -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}");
+    }
+}

HellionChat/Themes/ThemeLayout.cs

@@ -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
+);

HellionChat/Themes/ThemeRegistry.cs

@@ -0,0 +1,128 @@
+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() },
+            { SynthwaveSunset.Slug,   SynthwaveSunset.Build() },
+        };
+
+        // Centralised so the ten .Build() factories stay free of cache plumbing.
+        foreach (var theme in _builtIns.Values)
+            theme.RecomputeAbgrCache();
+
+        _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)
+    {
+        var theme = Get(slug);
+        // Defensive — idempotent and cheap, so any future theme source
+        // that forgets the cache fill still ends up with a populated one.
+        theme.RecomputeAbgrCache();
+        _active = theme;
+    }
+
+    // 0x80070020 = SHARING_VIOLATION, 0x80070021 = LOCK_VIOLATION. Other
+    // IO failures are permanent and get the theme dropped instead of retried.
+    internal static bool IsRecoverableFileLock(Exception? ex)
+    {
+        if (ex is not IOException io)
+            return false;
+        var code = (uint)io.HResult;
+        return code == 0x80070020u || code == 0x80070021u;
+    }
+
+    // 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);
+                    theme.RecomputeAbgrCache();
+                    _customCache[key] = (theme, stamp);
+                }
+                catch (Exception ex) when (IsRecoverableFileLock(ex))
+                {
+                    // Editor mid-save: keep the cached snapshot, leave the stamp
+                    // alone so the next refresh retries automatically.
+                    Plugin.Log.Debug($"Custom theme {Path.GetFileName(path)} is locked, keeping last known good");
+                    if (cached.Theme is not null)
+                        theme = cached.Theme;
+                }
+                catch (Exception)
+                {
+                    continue;
+                }
+            }
+
+            if (theme is not null && seenSlugs.Add(theme.Slug))
+                yield return theme;
+        }
+    }
+}

HellionChat/Themes/ThemeTypography.cs

@@ -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
+);

HellionChat/Ui/AutoTellTabTint.cs

@@ -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)];
+    }
+}

HellionChat/Ui/ChatInputBar.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Numerics;
+using HellionChat._Helpers;
 using HellionChat.Code;
 using HellionChat.Util;
 using Dalamud.Bindings.ImGui;
@@ -89,60 +90,42 @@ public sealed class ChatInputBar
         }
     }
 
-    private void SubmitCompact(Tab tab)
+    // TEST-MIRROR: ../_Helpers/CompactInputSubmitter.cs
-    {
+    private void SubmitCompact(Tab tab) =>
-        if (string.IsNullOrWhiteSpace(_state.Buffer))
+        CompactInputSubmitter.TrySubmit(_state, tab, _host.SendChatBoxFromExternal);
-            return;
 
-        var text = _state.Buffer;
+    // History-navigation callback for the compact input. Cursor math is
-        _state.Buffer = string.Empty;
+    // delegated to CompactInputHistoryNavigator; only the ImGui buffer
-        _state.HistoryCursor = -1;
+    // splice stays here because it needs the live callback data.
-        _host.SendChatBoxFromExternal(tab, text);
+    // TEST-MIRROR: ../_Helpers/CompactInputHistoryNavigator.cs
-    }
+    private int CompactCallback(scoped ref ImGuiInputTextCallbackData data)
-
-    // History-navigation callback for the compact input. Mirrors the main
-    // 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)
     {
         if (data.EventFlag != ImGuiInputTextFlags.CallbackHistory)
             return 0;
 
-        var prev = _state.HistoryCursor;
+        var direction = data.EventKey switch
-        switch (data.EventKey)
         {
-            case ImGuiKey.UpArrow:
+            ImGuiKey.UpArrow => CompactInputHistoryNavigator.Direction.Up,
-                switch (_state.HistoryCursor)
+            ImGuiKey.DownArrow => CompactInputHistoryNavigator.Direction.Down,
-                {
+            _ => (CompactInputHistoryNavigator.Direction?)null,
-                    case -1:
+        };
-                        var offset = 0;
+        if (direction is null)
-                        if (!string.IsNullOrWhiteSpace(_state.Buffer))
-                        {
-                            InputHistoryService.Push(_state.Buffer);
-                            offset = 1;
-                        }
-                        _state.HistoryCursor = InputHistoryService.Count - 1 - offset;
-                        break;
-                    case > 0:
-                        _state.HistoryCursor--;
-                        break;
-                }
-                break;
-            case ImGuiKey.DownArrow:
-                if (_state.HistoryCursor != -1)
-                    if (++_state.HistoryCursor >= InputHistoryService.Count)
-                        _state.HistoryCursor = -1;
-                break;
-        }
-
-        if (prev == _state.HistoryCursor)
             return 0;
 
-        var historyStr = InputHistoryService.GetByCursor(_state.HistoryCursor) ?? string.Empty;
+        var (cursor, replacement) = CompactInputHistoryNavigator.Navigate(
-        data.DeleteChars(0, data.BufTextLen);
+            direction.Value,
-        data.InsertChars(0, historyStr);
+            _state.HistoryCursor,
+            _state.Buffer,
+            () => InputHistoryService.Count,
+            InputHistoryService.Push,
+            InputHistoryService.GetByCursor);
 
+        _state.HistoryCursor = cursor;
+        if (replacement is null)
+            return 0;
+
+        data.DeleteChars(0, data.BufTextLen);
+        data.InsertChars(0, replacement);
         return 0;
     }
 

HellionChat/Ui/ChatLogWindow.cs

@@ -6,6 +6,7 @@ using System.Text;
 using HellionChat.Code;
 using HellionChat.GameFunctions;
 using HellionChat.GameFunctions.Types;
+using HellionChat.Integrations;
 using HellionChat.Resources;
 using HellionChat.Util;
 using Dalamud.Game.Addon.Lifecycle;
@@ -34,6 +35,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 +107,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 +117,14 @@ public sealed class ChatLogWindow : Window
         SetUpTextCommandChannels();
         SetUpAllCommands();
 
-        Plugin.Commands.Register("/clearhellion", "Clear the Hellion Chat log").Execute += ClearLog;
+        // Cache the registered wrapper instances so Dispose can detach the same
-        Plugin.Commands.Register("/hellion").Execute += ToggleChat;
+        // 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 +139,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;
+        _hellionCommand.Execute -= ToggleChat;
-        Plugin.Commands.Register("/clearhellion").Execute -= ClearLog;
+        _clearHellionCommand.Execute -= ClearLog;
     }
 
     private void Logout(int _, int __)
@@ -366,6 +379,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 +500,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
+            BgAlpha = Plugin.Config.WindowOpacity;
-                ? Plugin.Config.HellionThemeWindowOpacity
-                : Plugin.Config.WindowAlpha / 100f;
 
         LastViewport = ImGui.GetWindowViewport().Handle;
         WasDocked = ImGui.IsWindowDocked();
@@ -519,8 +539,11 @@ public sealed class ChatLogWindow : Window
         if (Plugin.Config.KeepInputFocus && Activate)
             ImGui.SetWindowFocus(WindowName);
 
-        if (Plugin.Config is { OverrideStyle: true, ChosenStyle: not null })
+        // Hellion Chat v1.1.0+ — Theme-Engine ist Source-of-Truth, kein
-            StyleModel.GetConfiguredStyles()?.FirstOrDefault(style => style.Name == Plugin.Config.ChosenStyle)?.Push();
+        // 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 +554,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 +617,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
+        // sits above the tab area / sidebar in full window width. ImGui's
-        // height for GetRemainingHeightForMessageLog so the message log
+        // GetContentRegionAvail subtracts its height automatically because the
-        // shrinks accordingly while the banner is visible.
+        // cursor advances past it before the message log calls
-        _v061HintBannerHeight = DrawV061HintBannerIfNeeded();
+        // GetRemainingHeightForMessageLog, so we don't track the height here.
+        DrawV061HintBannerIfNeeded();
 
         if (Plugin.Config.SidebarTabView)
             DrawTabSidebar();
@@ -782,15 +803,19 @@ public sealed class ChatLogWindow : Window
         if (ImGui.IsWindowHovered(ImGuiHoveredFlags.ChildWindows))
             LastActivityTime = FrameTime;
 
-        if (!showNovice)
+        if (showNovice)
-            return;
+        {
-
             ImGui.SameLine();
 
             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()
     {
         var channels = new Dictionary<string, InputChannel>();
@@ -1178,6 +1203,15 @@ public sealed class ChatLogWindow : Window
 
             var maxLines = Plugin.Config.MaxLinesToRender;
             var startLine = messages.Count > maxLines ? messages.Count - maxLines : 0;
+
+            // Card-mode pre-loop hoist: theme/drawList/winLeft/winRight/border
+            // are invariant per DrawMessages call; only cursorY moves per row.
+            var theme = Plugin.ThemeRegistry.Active;
+            var drawList = ImGui.GetWindowDrawList();
+            var winLeft = ImGui.GetWindowPos().X;
+            var winRight = winLeft + ImGui.GetWindowSize().X;
+            var borderColorAbgr = ColourUtil.RgbaToAbgr((theme.Colors.Border & 0xFFFFFF00u) | 0x33u);
+
             for (var i = startLine; i < messages.Count; i++)
             {
                 var message = messages[i];
@@ -1308,6 +1342,46 @@ public sealed class ChatLogWindow : Window
                     ImGui.TableNextColumn();
 
                 var lineWidth = ImGui.GetContentRegionAvail().X;
+
+                // 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 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 rowEndY = ImGui.GetCursorScreenPos().Y;
+                        drawList.AddLine(
+                            new Vector2(winLeft + 4, rowEndY - 1),
+                            new Vector2(winRight - 4, rowEndY - 1),
+                            borderColorAbgr,
+                            1f);
+                        ImGui.Dummy(new Vector2(0, 2));
+                    }
+                }
+                else
+                {
                     if (message.Sender.Count > 0)
                     {
                         DrawChunks(message.Sender, true, handler, lineWidth);
@@ -1319,6 +1393,7 @@ public sealed class ChatLogWindow : Window
                         DrawChunks([new TextChunk(ChunkSource.Content, null, " ")], true, handler, lineWidth);
                     else
                         DrawChunks(message.Content, true, handler, lineWidth);
+                }
 
                 message.IsVisible[tab.Identifier] = ImGui.IsItemVisible();
             }
@@ -1358,6 +1433,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 +1464,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("tabs", ImGuiTableColumnFlags.WidthFixed, 44f);
-        ImGui.TableSetupColumn("chat", ImGuiTableColumnFlags.WidthStretch, 4);
+        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 +1518,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 +1552,107 @@ public sealed class ChatLogWindow : Window
                         ImGui.SameLine();
                     }
 
-                    bool clicked;
+                    // v1.2.0 — Icon-only Sidebar mit Tooltip beim Hover.
-                    if (showGreetedAffordance && tab.IsGreeted)
+                    // 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
+                        iconColor = theme.Colors.Accent;
-                        // 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);
                     }
+                    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 = TabTintCache.GetTint(tab);
                     }
                     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;
 
@@ -1510,7 +1686,17 @@ public sealed class ChatLogWindow : Window
     // log so users discover the feature without having to right-click the tab.
     // Renders only for the active tab in the main ChatLogWindow; pop-out
     // windows have their own render path and skip this toolbar.
+    //
+    // Hellion Chat v1.3.0 also renders the optional Honorific title slot
+    // left of the pop-out button, when HonorificService reports an active
+    // custom title and the user has ShowHonorificTitleInHeader enabled.
     private void DrawChatHeaderToolbar(Tab tab)
+    {
+        DrawHonorificTitleSlot();
+        DrawPopOutButton(tab);
+    }
+
+    private void DrawPopOutButton(Tab tab)
     {
         var avail = ImGui.GetContentRegionAvail().X;
         var iconWidth = ImGui.GetFrameHeight();
@@ -1523,6 +1709,81 @@ public sealed class ChatLogWindow : Window
         }
     }
 
+    // Renders the Honorific custom title to the left of the pop-out button,
+    // wrapped in guillemets to match how the game itself displays titles.
+    // We lay out the title first, then DrawPopOutButton uses
+    // GetContentRegionAvail to anchor itself flush right, which is why the
+    // call order in DrawChatHeaderToolbar matters: title first, button second.
+    //
+    // The slot stays on the same line as the pop-out button so the chat
+    // log doesn't lose vertical space; we use ImGui.SameLine after our
+    // text so the cursor X is still on the toolbar row when the pop-out
+    // button takes over.
+    private void DrawHonorificTitleSlot()
+    {
+        var service = Plugin.HonorificService;
+        var title = service.CurrentTitle;
+        if (!HonorificService.ShouldRenderSlot(
+                Plugin.Config.ShowHonorificTitleInHeader,
+                service.IsAvailable,
+                title))
+        {
+            return;
+        }
+
+        // Reserve space for the crown icon plus a small gap before the title,
+        // then the title itself, then the gap-to-pop-out-button. We measure the
+        // crown width inside the FontAwesome font push because FontAwesome
+        // glyphs render in a different font than the regular ImGui text.
+        const float gapAfterCrown = 4f;
+        const float gapBeforeButton = 8f;
+        var avail = ImGui.GetContentRegionAvail().X;
+        var iconWidth = ImGui.GetFrameHeight();
+
+        float crownWidth;
+        using (Plugin.FontManager.FontAwesome.Push())
+        {
+            crownWidth = ImGui.CalcTextSize(FontAwesomeIcon.Crown.ToIconString()).X;
+        }
+
+        var maxTitleWidth = avail - iconWidth - gapBeforeButton - crownWidth - gapAfterCrown;
+        if (maxTitleWidth <= 0)
+        {
+            return;
+        }
+
+        var rendered = "«" + title!.Title + "»";
+        rendered = StringUtil.TruncateToFitWidth(rendered, maxTitleWidth);
+
+        var titleColor = title.Color is { } c
+            ? new Vector4(c.X, c.Y, c.Z, 1f)
+            : ImGui.GetStyle().Colors[(int)ImGuiCol.Text];
+
+        var theme = Plugin.ThemeRegistry.Active;
+
+        // Group so the tooltip's IsItemHovered check fires for hover anywhere
+        // on the crown-plus-title pair, not just one of the two.
+        ImGui.BeginGroup();
+        using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(theme.Colors.TextMuted)))
+        using (Plugin.FontManager.FontAwesome.Push())
+        {
+            ImGui.TextUnformatted(FontAwesomeIcon.Crown.ToIconString());
+        }
+        ImGui.SameLine(0f, gapAfterCrown);
+        using (ImRaii.PushColor(ImGuiCol.Text, titleColor))
+        {
+            ImGui.TextUnformatted(rendered);
+        }
+        ImGui.EndGroup();
+
+        if (ImGui.IsItemHovered())
+        {
+            ImGui.SetTooltip(HellionStrings.ChatHeader_HonorificTitle_Tooltip);
+        }
+
+        ImGui.SameLine();
+    }
+
     // Hellion Chat v0.6.1 — One-Time-Hint-Banner introducing the chat header
     // pop-out toolbar button and the right-click pathway. Reuses the visual
     // pattern from Popout.cs DrawHintBannerIfNeeded so users see a familiar
@@ -1540,11 +1801,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 +1825,6 @@ public sealed class ChatLogWindow : Window
             }
         }
 
-        ImGui.PopStyleVar();
-        ImGui.PopStyleColor();
         ImGui.Spacing();
 
         if (dismiss)
@@ -1636,13 +1898,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,7 +2000,8 @@ public sealed class ChatLogWindow : Window
             return;
 
         var clipper = new ImGuiListClipperPtr(ImGuiNative.ImGuiListClipper());
-
+        try
+        {
             clipper.Begin(AutoCompleteList.Count);
             while (clipper.Step())
             {
@@ -1787,6 +2043,13 @@ public sealed class ChatLogWindow : Window
             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();
+        }
+    }
 
     private int AutoCompleteCallback(scoped ref ImGuiInputTextCallbackData data)
     {

HellionChat/Ui/CommandHelpWindow.cs

@@ -47,8 +47,11 @@ public class CommandHelpWindow : Window {
         Position = pos;
         SizeConstraints = new WindowSizeConstraints
         {
-            MinimumSize = new Vector2(width, 0),
+            // Use scaledWidth here so the size constraints stay in the same
-            MaximumSize = LogWindow.LastWindowSize with { X = width }
+            // 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;

HellionChat/Ui/HellionStyle.cs

@@ -1,3 +1,4 @@
+using HellionChat.Themes;
 using HellionChat.Util;
 using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility.Raii;
@@ -5,207 +6,132 @@ using Dalamud.Interface.Utility.Raii;
 namespace HellionChat.Ui;
 
 /// <summary>
-/// ImGui style override for Hellion Chat. Industrial HUD palette with three
+/// ImGui style override for Hellion Chat. v1.1.0 ist die Engine
-/// distinct accents — cyan-teal as the primary action color, industrial
+/// theme-getrieben: PushGlobal nimmt eine Theme-Instance + Window-
-/// amber for active state highlights, slate-violet for title bars and
+/// Opacity, die gesamten Color- und Style-Slots werden aus dem Theme
-/// active tabs — on a deep-slate frame background with steel borders.
+/// gelesen statt aus einer fixen Konstanten-Tabelle.
-///
-/// 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.
 /// </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
+    /// Local color stack auf Basis des aktiven Themes. Cheap. Use inside a
-    /// `using var _ = HellionStyle.Push();` block.
+    /// `using var _ = HellionStyle.Push(theme);` block.
     /// </summary>
-    internal static IDisposable Push()
+    internal static IDisposable Push(Theme theme)
     {
+        var a = theme.AbgrCache;
         var stack = new StackHandle();
-        stack.PushColor(ImGuiCol.Button, PrimaryRgba);
+        stack.PushColorAbgr(ImGuiCol.Button,           a.Primary);
-        stack.PushColor(ImGuiCol.ButtonHovered, PrimaryHoverRgba);
+        stack.PushColorAbgr(ImGuiCol.ButtonHovered,    a.PrimaryLight);
-        stack.PushColor(ImGuiCol.ButtonActive, PrimaryActiveRgba);
+        stack.PushColorAbgr(ImGuiCol.ButtonActive,     a.PrimaryDark);
-        stack.PushColor(ImGuiCol.FrameBg, FrameBgRgba);
+        stack.PushColorAbgr(ImGuiCol.FrameBg,          a.FrameBg);
-        stack.PushColor(ImGuiCol.FrameBgHovered, FrameBgHoverRgba);
+        stack.PushColorAbgr(ImGuiCol.FrameBgHovered,   a.SurfaceHover);
-        stack.PushColor(ImGuiCol.FrameBgActive, FrameBgActiveRgba);
+        stack.PushColorAbgr(ImGuiCol.FrameBgActive,    a.Surface);
-        stack.PushColor(ImGuiCol.Border, BorderRgba);
+        stack.PushColorAbgr(ImGuiCol.Border,           a.Border);
-        stack.PushColor(ImGuiCol.Header, HeaderRgba);
+        stack.PushColorAbgr(ImGuiCol.Header,           a.Surface);
-        stack.PushColor(ImGuiCol.HeaderHovered, HeaderHoverRgba);
+        stack.PushColorAbgr(ImGuiCol.HeaderHovered,    a.SurfaceHover);
-        stack.PushColor(ImGuiCol.HeaderActive, HeaderActiveRgba);
+        stack.PushColorAbgr(ImGuiCol.HeaderActive,     a.Identity);
-        stack.PushColor(ImGuiCol.CheckMark, PrimaryRgba);
+        stack.PushColorAbgr(ImGuiCol.CheckMark,        a.Primary);
-        stack.PushColor(ImGuiCol.SliderGrab, PrimaryRgba);
+        stack.PushColorAbgr(ImGuiCol.SliderGrab,       a.Primary);
-        stack.PushColor(ImGuiCol.SliderGrabActive, PrimaryHoverRgba);
+        stack.PushColorAbgr(ImGuiCol.SliderGrabActive, a.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
+    /// Plugin.Draw. Drives every Hellion-rendered window from the active
-    /// Hellion look is consistent across upstream and Hellion tabs.
+    /// theme's palette and layout values.
     /// </summary>
-    /// <param name="windowOpacity">Window background alpha (0.5–1.0). Lower
+    /// <param name="theme">Active theme from ThemeRegistry.</param>
-    /// values let the game shine through the plugin panes.</param>
+    /// <param name="windowOpacity">Window background alpha (0.5–1.0).</param>
-    internal static IDisposable PushGlobal(float windowOpacity = 1.0f)
+    internal static IDisposable PushGlobal(Theme theme, float windowOpacity = 1.0f)
     {
+        var c = theme.Colors;
+        var l = theme.Layout;
+        var a = theme.AbgrCache;
         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 windowBgWithAlpha = (c.WindowBg & 0xFFFFFF00u) | alphaByte;
-        var childBgWithAlpha = (ChildBgRgba & 0xFFFFFF00u) | alphaByte;
 
-        // Layout — geometric edges, modest rounding, single-pixel borders.
+        // ChildBg-Alpha: Sub-Bereiche (Tab-Sidebar, Message-Area, Input-Bar)
-        stack.PushStyleVar(ImGuiStyleVar.WindowRounding, 4f);
+        // werden im ChatLog-Window als BeginChild gezeichnet. Würde der ChildBg
-        stack.PushStyleVar(ImGuiStyleVar.ChildRounding, 3f);
+        // mit dem gleichen Alpha wie WindowBg gerendert, multiplizieren sich
-        stack.PushStyleVar(ImGuiStyleVar.PopupRounding, 3f);
+        // die Layer (1 - (1-α)² Deckung), und 50 % WindowOpacity kommt mit
-        stack.PushStyleVar(ImGuiStyleVar.FrameRounding, 2f);
+        // 75 % Deckung im Child-Bereich an — das Fenster wirkt solider als der
-        stack.PushStyleVar(ImGuiStyleVar.GrabRounding, 2f);
+        // Slider verspricht. Bei voller Opacity bleibt der Theme-Akzent
-        stack.PushStyleVar(ImGuiStyleVar.TabRounding, 2f);
+        // erhalten (Theme-eigene Alpha-Komponente, i.d.R. FF); sobald der User
-        stack.PushStyleVar(ImGuiStyleVar.ScrollbarRounding, 2f);
+        // Transparenz zieht, wird ChildBg vollständig durchsichtig damit nur
-        stack.PushStyleVar(ImGuiStyleVar.WindowBorderSize, 1f);
+        // der WindowBg-Layer die finale Deckung bestimmt.
-        stack.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 1f);
+        var childBgAlpha = windowOpacity >= 0.999f ? (c.ChildBg & 0xFFu) : 0u;
+        var childBgWithAlpha = (c.ChildBg & 0xFFFFFF00u) | childBgAlpha;
 
-        // Surfaces.
+        // 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);
+
+        // Surfaces — WindowBg/ChildBg use the per-push opacity-modulated value,
+        // so they go through the RGBA path; everything else reads from cache.
         stack.PushColor(ImGuiCol.WindowBg,         windowBgWithAlpha);
         stack.PushColor(ImGuiCol.ChildBg,          childBgWithAlpha);
-        stack.PushColor(ImGuiCol.PopupBg, PopupBgRgba);
+        stack.PushColorAbgr(ImGuiCol.PopupBg,      a.ChildBg);
-        stack.PushColor(ImGuiCol.Border, BorderRgba);
+        stack.PushColorAbgr(ImGuiCol.Border,       a.Border);
-        stack.PushColor(ImGuiCol.BorderShadow, BorderShadowRgba);
+        stack.PushColorAbgr(ImGuiCol.BorderShadow, 0u);
 
-        // Frames (input fields, combos, sliders).
+        // Frames
-        stack.PushColor(ImGuiCol.FrameBg, FrameBgRgba);
+        stack.PushColorAbgr(ImGuiCol.FrameBg,        a.FrameBg);
-        stack.PushColor(ImGuiCol.FrameBgHovered, FrameBgHoverRgba);
+        stack.PushColorAbgr(ImGuiCol.FrameBgHovered, a.SurfaceHover);
-        stack.PushColor(ImGuiCol.FrameBgActive, FrameBgActiveRgba);
+        stack.PushColorAbgr(ImGuiCol.FrameBgActive,  a.Surface);
 
-        // Title bars — tertiary identity on active.
+        // Title bars
-        stack.PushColor(ImGuiCol.TitleBg, TitleBgRgba);
+        stack.PushColorAbgr(ImGuiCol.TitleBg,          a.WindowBg);
-        stack.PushColor(ImGuiCol.TitleBgActive, TitleBgActiveRgba);
+        stack.PushColorAbgr(ImGuiCol.TitleBgActive,    a.Identity);
-        stack.PushColor(ImGuiCol.TitleBgCollapsed, TitleBgCollapsedRgba);
+        stack.PushColorAbgr(ImGuiCol.TitleBgCollapsed, a.WindowBg);
 
-        // Buttons — primary cyan.
+        // Buttons
-        stack.PushColor(ImGuiCol.Button, PrimaryRgba);
+        stack.PushColorAbgr(ImGuiCol.Button,        a.Primary);
-        stack.PushColor(ImGuiCol.ButtonHovered, PrimaryHoverRgba);
+        stack.PushColorAbgr(ImGuiCol.ButtonHovered, a.PrimaryLight);
-        stack.PushColor(ImGuiCol.ButtonActive, PrimaryActiveRgba);
+        stack.PushColorAbgr(ImGuiCol.ButtonActive,  a.PrimaryDark);
 
-        // Headers / selectables — slate with subtle steps.
+        // Headers / selectables
-        stack.PushColor(ImGuiCol.Header, HeaderRgba);
+        stack.PushColorAbgr(ImGuiCol.Header,        a.Surface);
-        stack.PushColor(ImGuiCol.HeaderHovered, HeaderHoverRgba);
+        stack.PushColorAbgr(ImGuiCol.HeaderHovered, a.SurfaceHover);
-        stack.PushColor(ImGuiCol.HeaderActive, HeaderActiveRgba);
+        stack.PushColorAbgr(ImGuiCol.HeaderActive,  a.Identity);
 
-        // Tabs — tertiary identity for the active tab.
+        // Tabs
-        stack.PushColor(ImGuiCol.Tab, TabRgba);
+        stack.PushColorAbgr(ImGuiCol.Tab,                a.FrameBg);
-        stack.PushColor(ImGuiCol.TabHovered, TabHoveredRgba);
+        stack.PushColorAbgr(ImGuiCol.TabHovered,         a.PrimaryLight);
-        stack.PushColor(ImGuiCol.TabActive, TabActiveRgba);
+        stack.PushColorAbgr(ImGuiCol.TabActive,          a.Identity);
-        stack.PushColor(ImGuiCol.TabUnfocused, TabUnfocusedRgba);
+        stack.PushColorAbgr(ImGuiCol.TabUnfocused,       a.ChildBg);
-        stack.PushColor(ImGuiCol.TabUnfocusedActive, TabUnfocusedActiveRgba);
+        stack.PushColorAbgr(ImGuiCol.TabUnfocusedActive, a.PrimaryDark);
 
-        // Scrollbar.
+        // Scrollbar
-        stack.PushColor(ImGuiCol.ScrollbarBg, ScrollbarBgRgba);
+        stack.PushColorAbgr(ImGuiCol.ScrollbarBg,          a.WindowBg);
-        stack.PushColor(ImGuiCol.ScrollbarGrab, ScrollbarGrabRgba);
+        stack.PushColorAbgr(ImGuiCol.ScrollbarGrab,        a.Surface);
-        stack.PushColor(ImGuiCol.ScrollbarGrabHovered, ScrollbarGrabHoveredRgba);
+        stack.PushColorAbgr(ImGuiCol.ScrollbarGrabHovered, a.AccentLight);
-        stack.PushColor(ImGuiCol.ScrollbarGrabActive, ScrollbarGrabActiveRgba);
+        stack.PushColorAbgr(ImGuiCol.ScrollbarGrabActive,  a.Accent);
 
-        // Resize grip — secondary amber on active.
+        // Resize grip
-        stack.PushColor(ImGuiCol.ResizeGrip, ResizeGripRgba);
+        stack.PushColorAbgr(ImGuiCol.ResizeGrip,        a.FrameBg);
-        stack.PushColor(ImGuiCol.ResizeGripHovered, ResizeGripHoveredRgba);
+        stack.PushColorAbgr(ImGuiCol.ResizeGripHovered, a.AccentLight);
-        stack.PushColor(ImGuiCol.ResizeGripActive, ResizeGripActiveRgba);
+        stack.PushColorAbgr(ImGuiCol.ResizeGripActive,  a.Accent);
 
-        // Check mark + slider grab — primary cyan.
+        // Check mark + slider grab
-        stack.PushColor(ImGuiCol.CheckMark, PrimaryRgba);
+        stack.PushColorAbgr(ImGuiCol.CheckMark,         a.Primary);
-        stack.PushColor(ImGuiCol.SliderGrab, PrimaryRgba);
+        stack.PushColorAbgr(ImGuiCol.SliderGrab,        a.Primary);
-        stack.PushColor(ImGuiCol.SliderGrabActive, PrimaryHoverRgba);
+        stack.PushColorAbgr(ImGuiCol.SliderGrabActive,  a.PrimaryLight);
 
-        // Separator — primary cyan when hovered/active so the eye
+        // Separator
-        // immediately sees that splitters are interactive.
+        stack.PushColorAbgr(ImGuiCol.Separator,         a.Border);
-        stack.PushColor(ImGuiCol.Separator, BorderRgba);
+        stack.PushColorAbgr(ImGuiCol.SeparatorHovered,  a.PrimaryLight);
-        stack.PushColor(ImGuiCol.SeparatorHovered, PrimaryHoverRgba);
+        stack.PushColorAbgr(ImGuiCol.SeparatorActive,   a.Primary);
-        stack.PushColor(ImGuiCol.SeparatorActive, PrimaryRgba);
 
         return stack;
     }
@@ -217,6 +143,9 @@ internal static class HellionStyle
         internal void PushColor(ImGuiCol slot, uint rgba)
             => _items.Add(ImRaii.PushColor(slot, ColourUtil.RgbaToAbgr(rgba)));
 
+        internal void PushColorAbgr(ImGuiCol slot, uint abgr)
+            => _items.Add(ImRaii.PushColor(slot, abgr));
+
         internal void PushStyleVar(ImGuiStyleVar var, float value)
             => _items.Add(ImRaii.PushStyle(var, value));
 

HellionChat/Ui/InputPreview.cs

@@ -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;

HellionChat/Ui/Popout.cs

@@ -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 })
+        // Hellion Chat v1.1.0+ — Theme-Engine ist Source-of-Truth, kein
-            StyleModel.GetConfiguredStyles()?.FirstOrDefault(style => style.Name == Plugin.Config.ChosenStyle)?.Push();
+        // 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
+                BgAlpha = Plugin.Config.WindowOpacity;
-                    ? Plugin.Config.HellionThemeWindowOpacity
-                    : Plugin.Config.WindowAlpha / 100f;
             }
         }
     }
@@ -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()

HellionChat/Ui/SeStringDebugger.cs

@@ -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?>

HellionChat/Ui/Settings.cs

@@ -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,19 @@ 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 SettingsTabs.Integrations(Plugin, Mutable),
             new Information(Mutable),
         ];
 
@@ -72,40 +84,81 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
     public override void Draw()
     {
         if (ImGui.IsWindowAppearing())
+        {
             Initialise();
-
+            View = SettingsView.Overview;
-        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();
+        // 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", new Vector2(-1, height));
+        using var child = ImRaii.Child("##chat2-settings-detail", new Vector2(-1, height));
         if (child.Success)
-                    Tabs[CurrentTab].Draw(changed);
+            Tabs[CurrentTab].Draw(false);
-            }
     }
 
-        ImGui.Separator();
+    private void DrawSaveButtons()
-
+    {
         var save = ImGui.Button(Language.Settings_Save);
 
         ImGui.SameLine();
@@ -158,14 +211,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;
+        if (filtersChanged)
+        {
             Plugin.MessageManager.ClearAllTabs();
             Plugin.MessageManager.FilterAllTabsAsync();
+        }
 
         if (fontChanged || fontSizeChanged || italicStateChanged)
             Plugin.FontManager.BuildFonts();
@@ -181,4 +244,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;
+    }
 }

HellionChat/Ui/SettingsOverview.cs

@@ -0,0 +1,106 @@
+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.Plug,            "Settings_Card_Integrations_Title",    "Settings_Card_Integrations_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);
+        }
+    }
+}

HellionChat/Ui/SettingsTabs/Chat.cs

@@ -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;

HellionChat/Ui/SettingsTabs/DataManagement.cs

@@ -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();
+    }
+}

HellionChat/Ui/SettingsTabs/Database.cs

@@ -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();
-    }
-}

HellionChat/Ui/SettingsTabs/FontsAndColours.cs

@@ -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);
-        }
-    }
 }

HellionChat/Ui/SettingsTabs/General.cs

@@ -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);
         }

HellionChat/Ui/SettingsTabs/Information.cs

@@ -76,7 +76,7 @@ internal sealed class Information : ISettingsTab
             ImGui.TextUnformatted(Language.Options_About_Github_Issues);
             ImGui.SameLine();
             if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "githubIssues"))
-                Dalamud.Utility.Util.OpenLink("https://github.com/JonKazama-Hellion/HellionChat/issues");
+                Dalamud.Utility.Util.OpenLink("https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/issues");
         }
     }
 

HellionChat/Ui/SettingsTabs/Integrations.cs

@@ -0,0 +1,191 @@
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface;
+using Dalamud.Interface.Utility.Raii;
+using HellionChat.Branding;
+using HellionChat.Integrations;
+using HellionChat.Resources;
+using HellionChat.Util;
+
+namespace HellionChat.Ui.SettingsTabs;
+
+// First settings tab introduced in v1.3.0 (Plugin Integrations Cycle 1).
+// Designed to grow organically: each future cycle adds a new section above
+// the "Coming soon" block and removes the corresponding stub item.
+internal sealed class Integrations : ISettingsTab
+{
+    private Plugin Plugin { get; }
+    private Configuration Mutable { get; }
+
+    public string Name => HellionStrings.Settings_Tab_Integrations + "###tabs-integrations";
+
+    internal Integrations(Plugin plugin, Configuration mutable)
+    {
+        Plugin = plugin;
+        Mutable = mutable;
+    }
+
+    public void Draw(bool changed)
+    {
+        ImGui.TextWrapped(HellionStrings.Settings_Integrations_Intro);
+        ImGui.Spacing();
+        ImGui.Spacing();
+
+        DrawHonorificSection();
+        ImGui.Spacing();
+        ImGui.Spacing();
+
+        DrawComingSoonSection();
+        ImGui.Spacing();
+        ImGui.Spacing();
+
+        DrawGotAnIdeaSection();
+    }
+
+    private void DrawHonorificSection()
+    {
+        DrawSectionHeader(HellionStrings.Settings_Integrations_Honorific_SectionHeader);
+
+        DrawHonorificStatus();
+        ImGui.Spacing();
+
+        // The toggle is enabled regardless of detection state — leaving it
+        // on means "render when available, hide otherwise". Disabling the
+        // toggle when Honorific is missing would force the user to retoggle
+        // it every time Honorific is reloaded, which is worse UX than the
+        // silent auto-hide.
+        if (ImGui.Checkbox(
+            HellionStrings.Settings_Integrations_Honorific_Toggle,
+            ref Mutable.ShowHonorificTitleInHeader))
+        {
+            Plugin.SaveConfig();
+        }
+
+        using (ImRaii.PushIndent())
+        {
+            using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(Plugin.ThemeRegistry.Active.Colors.TextMuted)))
+            {
+                ImGui.TextWrapped(HellionStrings.Settings_Integrations_Honorific_ToggleHint);
+            }
+        }
+
+        // Maintainer attribution. Honorific has no LICENSE in its repo so we
+        // can't bundle its assets, but linking to the upstream and the
+        // author's profile is the polite minimum. Plain ImGui buttons keep
+        // the visual weight modest, the FontAwesome Brands subset is not
+        // guaranteed in Dalamud's font set so we use text labels.
+        ImGui.Spacing();
+        if (ImGui.Button(HellionStrings.Settings_Integrations_Honorific_LinkRepo))
+        {
+            Dalamud.Utility.Util.OpenLink(IntegrationLinks.HonorificRepo);
+        }
+        ImGui.SameLine();
+        if (ImGui.Button(HellionStrings.Settings_Integrations_Honorific_LinkAuthor))
+        {
+            Dalamud.Utility.Util.OpenLink(IntegrationLinks.HonorificAuthor);
+        }
+    }
+
+    private void DrawHonorificStatus()
+    {
+        var theme = Plugin.ThemeRegistry.Active;
+        var service = Plugin.HonorificService;
+
+        if (service.IsAvailable && service.DetectedApiVersion is { } version)
+        {
+            DrawStatusGlyph('●', theme.Colors.StatusSuccess);
+            ImGui.SameLine();
+            ImGui.TextUnformatted(string.Format(
+                HellionStrings.Settings_Integrations_Honorific_Status_Detected,
+                version.Major, version.Minor));
+        }
+        else if (service.DetectedApiVersion is { } incompatibleVersion)
+        {
+            DrawStatusGlyph('⚠', theme.Colors.StatusWarning);
+            ImGui.SameLine();
+            ImGui.TextUnformatted(string.Format(
+                HellionStrings.Settings_Integrations_Honorific_Status_Incompatible,
+                HonorificService.ExpectedApiMajor, incompatibleVersion.Major, incompatibleVersion.Minor));
+        }
+        else
+        {
+            DrawStatusGlyph('○', theme.Colors.TextMuted);
+            ImGui.SameLine();
+            ImGui.TextUnformatted(HellionStrings.Settings_Integrations_Honorific_Status_NotInstalled);
+        }
+    }
+
+    private static void DrawStatusGlyph(char glyph, uint rgba)
+    {
+        using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(rgba)))
+        {
+            ImGui.TextUnformatted(glyph.ToString());
+        }
+    }
+
+    private void DrawComingSoonSection()
+    {
+        DrawSectionHeader(HellionStrings.Settings_Integrations_ComingSoon_SectionHeader);
+        ImGui.TextWrapped(HellionStrings.Settings_Integrations_ComingSoon_Intro);
+        ImGui.Spacing();
+
+        // Static list maintained in code (not Configuration). Each cycle
+        // that lands a real integration removes its stub here and adds a
+        // full section above the Coming Soon block.
+        DrawComingSoonItem(
+            HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Title,
+            HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Description);
+        DrawComingSoonItem(
+            HellionStrings.Settings_Integrations_ComingSoon_Notifications_Title,
+            HellionStrings.Settings_Integrations_ComingSoon_Notifications_Description);
+        DrawComingSoonItem(
+            HellionStrings.Settings_Integrations_ComingSoon_RPStatus_Title,
+            HellionStrings.Settings_Integrations_ComingSoon_RPStatus_Description);
+        DrawComingSoonItem(
+            HellionStrings.Settings_Integrations_ComingSoon_ExtraChat_Title,
+            HellionStrings.Settings_Integrations_ComingSoon_ExtraChat_Description);
+        DrawComingSoonItem(
+            HellionStrings.Settings_Integrations_ComingSoon_QuickDM_Title,
+            HellionStrings.Settings_Integrations_ComingSoon_QuickDM_Description);
+    }
+
+    private void DrawComingSoonItem(string title, string description)
+    {
+        var theme = Plugin.ThemeRegistry.Active;
+        using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(theme.Colors.TextMuted)))
+        using (Plugin.FontManager.FontAwesome.Push())
+        {
+            ImGui.TextUnformatted(FontAwesomeIcon.Hourglass.ToIconString());
+        }
+        ImGui.SameLine();
+        ImGui.TextUnformatted(title);
+        using (ImRaii.PushIndent())
+        {
+            using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(theme.Colors.TextMuted)))
+            {
+                ImGui.TextWrapped(description);
+            }
+        }
+        ImGui.Spacing();
+    }
+
+    private void DrawGotAnIdeaSection()
+    {
+        DrawSectionHeader(HellionStrings.Settings_Integrations_GotAnIdea_SectionHeader);
+        ImGui.TextWrapped(HellionStrings.Settings_Integrations_GotAnIdea_Body);
+        ImGui.Spacing();
+
+        if (ImGui.Button(HellionStrings.Settings_Integrations_GotAnIdea_LinkLabel))
+        {
+            Dalamud.Utility.Util.OpenLink(BrandingLinks.HellionForgeDiscordInvite);
+        }
+    }
+
+    private void DrawSectionHeader(string label)
+    {
+        var theme = Plugin.ThemeRegistry.Active;
+        using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(theme.Colors.Primary)))
+        {
+            ImGui.TextUnformatted("── " + label + " ──");
+        }
+    }
+}

HellionChat/Ui/SettingsTabs/Privacy.cs

@@ -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();
-    }
 }

HellionChat/Ui/SettingsTabs/Tabs.cs

@@ -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)

HellionChat/Ui/SettingsTabs/ThemeAndLayout.cs

@@ -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);
+        }
+    }
+}

HellionChat/Ui/SettingsTabs/ThemeMockup.cs

@@ -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);
+    }
+}

HellionChat/Ui/SettingsTabs/Window.cs

@@ -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

HellionChat/Ui/StatusBar.cs

@@ -0,0 +1,183 @@
+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")}";
+    }
+
+    // Single-pass replacement for the LINQ Sum+Count pair in Draw. Pure
+    // helper so a future LINQ regression gets pinned by xUnit.
+    internal static (int messages, int tells) AggregateForStatusBar(IList<Tab> tabs)
+    {
+        int messages = 0, tells = 0;
+        foreach (var t in tabs)
+        {
+            messages += t.Messages.Count;
+            if (t.IsTempTab) tells++;
+        }
+        return (messages, 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;
+
+        // Outer gate keeps the foreach out of the hot path 99% of frames.
+        // UpdateCacheIfDue runs the same check internally — idempotent.
+        if (now - _lastUpdateMs >= UpdateIntervalMs)
+        {
+            var (messages, tells) = AggregateForStatusBar(Plugin.Config.Tabs);
+            UpdateCacheIfDue(now, Plugin.Config.Tabs.Count, 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("·");
+    }
+}

HellionChat/Ui/TabIconGlyphResolver.cs

@@ -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";
+    }
+}

HellionChat/Ui/TabIconMapping.cs

@@ -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 = TabTintCache.GetIcon(tab);
+        }
+
+        var glyph = TabIconGlyphResolver.ResolveGlyphName(tab, autoTellGlyph);
+        return GlyphLookup.TryGetValue(glyph, out var icon)
+            ? icon
+            : FontAwesomeIcon.Hashtag;
+    }
+}

HellionChat/Ui/TabTintCache.cs

@@ -0,0 +1,36 @@
+namespace HellionChat.Ui;
+
+// Per-Tab cache wrapper around the pure AutoTellTabTint hash helpers.
+// Each cache (tint, icon) carries its own name+world validation key so
+// neither read path mutates the other's state — refilling one never
+// invalidates the other. No string allocation in the steady-state lookup.
+internal static class TabTintCache
+{
+    public static uint GetTint(Tab tab)
+    {
+        var name = tab.TellTarget.Name;
+        var world = tab.TellTarget.World;
+        if (tab._cachedTintTellName != name || tab._cachedTintTellWorld != world)
+        {
+            tab._cachedTintTellName = name;
+            tab._cachedTintTellWorld = world;
+            tab._cachedTellTint = AutoTellTabTint.For(name, world);
+        }
+        return tab._cachedTellTint;
+    }
+
+    public static string GetIcon(Tab tab)
+    {
+        var name = tab.TellTarget.Name;
+        var world = tab.TellTarget.World;
+        if (tab._cachedTellIcon is null
+            || tab._cachedIconTellName != name
+            || tab._cachedIconTellWorld != world)
+        {
+            tab._cachedIconTellName = name;
+            tab._cachedIconTellWorld = world;
+            tab._cachedTellIcon = AutoTellTabTint.IconFor(name, world);
+        }
+        return tab._cachedTellIcon;
+    }
+}

HellionChat/Util/AutoTranslate.cs

@@ -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;
         }
     }

HellionChat/Util/ColourUtil.cs

@@ -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;
+    }
 }

HellionChat/Util/ExtraPayload.cs

@@ -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;

HellionChat/Util/IconUtil.cs

@@ -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;
+            if (GfdFile is null)
-            return new GfdFileView(new ReadOnlySpan<byte>(Unsafe.AsPointer(ref GfdFile[0]), GfdFile.Length));
+            {
+                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);
         }
     }
 

HellionChat/Util/Lender.cs

@@ -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()

HellionChat/Util/MemoryUtil.cs

@@ -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++)

HellionChat/Util/Payloads.cs

@@ -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}://")))

HellionChat/Util/StringUtil.cs

@@ -1,4 +1,6 @@
+using System.Globalization;
 using System.Text;
+using Dalamud.Bindings.ImGui;
 
 namespace HellionChat.Util;
 
@@ -23,6 +25,41 @@ 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];
+    }
+
+    // Returns the text unchanged when it already fits the width budget,
+    // otherwise the longest prefix plus a horizontal-ellipsis character that
+    // still fits. Used by the chat header Honorific title slot and reused by
+    // the chat-line truncation path in later cycles.
+    public static string TruncateToFitWidth(string text, float maxWidth)
+    {
+        if (ImGui.CalcTextSize(text).X <= maxWidth)
+        {
+            return text;
+        }
+
+        // Binary-search the longest prefix that fits with an ellipsis.
+        const string ellipsis = "…";
+        var lo = 0;
+        var hi = text.Length;
+        while (lo < hi)
+        {
+            var mid = (lo + hi + 1) / 2;
+            var candidate = text[..mid] + ellipsis;
+            if (ImGui.CalcTextSize(candidate).X <= maxWidth)
+            {
+                lo = mid;
+            }
+            else
+            {
+                hi = mid - 1;
+            }
+        }
+
+        return lo == 0 ? ellipsis : text[..lo] + ellipsis;
     }
 }

HellionChat/_Helpers/CompactInputHistoryNavigator.cs

@@ -0,0 +1,75 @@
+using System;
+
+namespace HellionChat._Helpers;
+
+// Pure-helper mirror of the compact pop-out history-navigation cursor
+// math. The original CompactCallback was tangled with ImGuiInputTextCallbackData
+// (DeleteChars/InsertChars), which can't be exercised in xUnit. The
+// ImGui buffer mutation stays at the call site; only the deterministic
+// cursor-and-replacement decision lives here.
+//
+// Index semantics match InputHistoryService:
+//   index 0          = oldest entry
+//   index Count - 1  = newest entry
+//   cursor == -1     = "not browsing history"
+//
+// TEST-MIRROR: ../../../Hellion Build test/Ui/CompactInputHistoryNavigatorTests.cs
+public static class CompactInputHistoryNavigator
+{
+    public enum Direction { Up, Down }
+
+    // replacement == null means: caller must NOT touch the buffer. This
+    // distinguishes "cursor unchanged, leave the user's typing alone"
+    // from "cursor moved to an empty slot, clear the buffer".
+    public static (int cursor, string? replacement) Navigate(
+        Direction direction,
+        int currentCursor,
+        string currentBuffer,
+        Func<int> getCount,
+        Action<string> push,
+        Func<int, string?> getByCursor)
+    {
+        ArgumentNullException.ThrowIfNull(getCount);
+        ArgumentNullException.ThrowIfNull(push);
+        ArgumentNullException.ThrowIfNull(getByCursor);
+
+        var prev = currentCursor;
+        var next = currentCursor;
+
+        switch (direction)
+        {
+            case Direction.Up:
+                if (currentCursor == -1)
+                {
+                    // First Up press from a fresh buffer: stash whatever
+                    // the user typed so they can recover it after browsing.
+                    var offset = 0;
+                    if (!string.IsNullOrWhiteSpace(currentBuffer))
+                    {
+                        push(currentBuffer);
+                        offset = 1;
+                    }
+                    next = getCount() - 1 - offset;
+                }
+                else if (currentCursor > 0)
+                {
+                    next--;
+                }
+                break;
+            case Direction.Down:
+                if (currentCursor != -1)
+                {
+                    next++;
+                    if (next >= getCount())
+                        next = -1;
+                }
+                break;
+        }
+
+        if (prev == next)
+            return (next, null);
+
+        var replacement = getByCursor(next) ?? string.Empty;
+        return (next, replacement);
+    }
+}

HellionChat/_Helpers/CompactInputSubmitter.cs

@@ -0,0 +1,29 @@
+using System;
+using HellionChat.Ui;
+
+namespace HellionChat._Helpers;
+
+// Pure-helper mirror of the compact pop-out submit flow. ChatInputBar's
+// SubmitCompact used to inline this against a sealed ChatLogWindow, which
+// blocks Moq-based isolation. Lifting the deterministic part into a POCO
+// keeps the production call site a one-liner while letting xUnit assert
+// the buffer/cursor reset and the sender contract directly.
+// TEST-MIRROR: ../../../Hellion Build test/Ui/CompactInputSubmitterTests.cs
+public static class CompactInputSubmitter
+{
+    public static bool TrySubmit(InputState state, Tab tab, Action<Tab, string> sender)
+    {
+        ArgumentNullException.ThrowIfNull(state);
+        ArgumentNullException.ThrowIfNull(tab);
+        ArgumentNullException.ThrowIfNull(sender);
+
+        if (string.IsNullOrWhiteSpace(state.Buffer))
+            return false;
+
+        var text = state.Buffer;
+        state.Buffer = string.Empty;
+        state.HistoryCursor = -1;
+        sender(tab, text);
+        return true;
+    }
+}