Merge branch 'feature/v1.5.0'

chore(release): v1.5.0 manifest bump
Version strings bumped across all eight tracked surfaces: - HellionChat/HellionChat.csproj <Version>1.5.0</Version> - repo.json AssemblyVersion + TestingAssemblyVersion = 1.5.0.0 - repo.json three DownloadLink* URLs -> /v1.5.0/latest.zip - repo.json Changelog field synced with yaml - HellionChat/HellionChat.yaml new v1.5.0 changelog block on top; v1.4.7 drops out per the four-block slim rule - docs/CHANGELOG.md v1.5.0 entry prepended - docs/ROADMAP.md Next Cycle pointer moves to v1.5.1, v1.5.0 joins the released-cycle archive block - README.md three status surfaces (badge, header, Project Status long-form) on v1.5.0 - .github/forge-posts/v1.5.0.md Discord announcement body (German) Preflight blocks A-F all green. Changelog embed total 2050 / 5500 chars (four subblocks), forge-post frontmatter inside the 60/40 char caps. Tag, push, merge are reserved for Flo.
2026-05-17 11:45:16 +02:00 · 2026-05-17 11:43:07 +02:00 · 2026-05-17 11:35:44 +02:00 · 2026-05-17 11:15:40 +02:00 · 2026-05-17 11:02:08 +02:00 · 2026-05-17 10:26:47 +02:00
111 changed files with 6253 additions and 2945 deletions
@@ -32,10 +32,10 @@ jobs:

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

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

@@ -101,16 +101,16 @@ jobs:
                  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 { $_ }
+                      if ($_ -match '^    ') { $_.Substring(4) } else { $_ }
                  }) -join "`n"

-                  $header = "**Hellion Chat $version"
+                  $header = "**v$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)
+                  $nextHdr = $rest.IndexOf("`n`n**v", 1)
                  $trailer = $rest.IndexOf("`n`n---")
                  if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
                      $enBlock = $rest.Substring(0, $nextHdr).TrimEnd()
@@ -120,17 +120,37 @@ jobs:
                      $enBlock = $rest.TrimEnd()
                  }

-                  # ---------- Char-Cap-Check (5500 Total auf title + description + footer) ----------
+                  # ---------- Embed-Felder + Per-Field-Caps (Discord-Hard-Limits) ----------
+                  # Discord enforces per-embed-field limits separately from the
+                  # combined-total limit. We split the DE and EN blocks into two
+                  # embeds that share the same release URL so Discord stitches
+                  # them into one visual card. Hard caps per Discord docs:
+                  #   description: 4096 per embed
+                  #   title:        256 per embed
+                  #   footer.text: 2048 per embed
+                  #   combined sum across all embeds: 6000
                  $title = "Hellion Chat $version — $subtitle"
-                  $description = "**Deutsch**`n`n$deBody`n`n**English**`n`n$enBlock"
+                  $deDesc = "**Deutsch**`n`n$deBody"
+                  $enDesc = "**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"
+                  $releaseUrl = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/$tag"

-                  # ---------- Embed-Payload bauen ----------
+                  if ($deDesc.Length -gt 4096) {
+                      throw "V6a: DE-Body too long for one embed ($($deDesc.Length) chars, max 4096). Trim .github/forge-posts/$tag.md or post the announcement manually (see forge style §8)."
+                  }
+                  if ($enDesc.Length -gt 4096) {
+                      throw "V6b: EN-Block too long for one embed ($($enDesc.Length) chars, max 4096). Trim the changelog entry in HellionChat/HellionChat.yaml or post manually."
+                  }
+                  $totalChars = $title.Length + $deDesc.Length + $enDesc.Length + $footerText.Length
+                  if ($totalChars -gt 6000) {
+                      throw "V6c: Combined embed chars $totalChars exceed Discord's 6000-total limit. Major-Release detected — post manually via Bot/Multi-Embed (see forge style §8)."
+                  }
+                  Write-Host "Embed-Caps OK: de=$($deDesc.Length)/4096, en=$($enDesc.Length)/4096, total=$totalChars/6000"
+
+                  # ---------- Embed-Payload bauen (zwei Embeds, gleiche url) ----------
+                  # Sharing the same `url` tells Discord to render both embeds as a
+                  # single contiguous card block. The title sits on the first embed,
+                  # the footer + timestamp on the last so it reads as one post.
                  $payload = [ordered]@{
                      username = "Forge Herald"
                      avatar_url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png"
@@ -142,9 +162,14 @@ jobs:
                      embeds = @(
                          [ordered]@{
                              title = $title
-                              url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/$tag"
+                              url = $releaseUrl
                              color = 12730636
-                              description = $description
+                              description = $deDesc
+                          },
+                          [ordered]@{
+                              url = $releaseUrl
+                              color = 12730636
+                              description = $enDesc
                              footer = [ordered]@{ text = $footerText }
                              timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
                          }
@@ -20,16 +20,12 @@ on:
    push:
        tags:
            - "v*"
-    # Manual recovery trigger. Use when a tag was pushed but the auto-run
-    # was missed or failed: `gh workflow run release.yml -f tag=v0.6.1`.
-    # The tag input is validated against the same semver regex as the
-    # auto-trigger before any string interpolation happens.
+    # Manual recovery trigger. Use Gitea's "Run workflow" UI and select the
+    # tag (e.g. v1.4.4) from the Ref dropdown - not main. The Validate tag
+    # ref step below hard-fails if a non-tag ref is selected, because the
+    # release-action reads GITHUB_REF directly and rejects anything that
+    # does not start with refs/tags/.
    workflow_dispatch:
-        inputs:
-            tag:
-                description: "Existing tag to (re)release, e.g. v0.6.1"
-                required: true
-                type: string

 permissions:
    contents: write
@@ -41,17 +37,24 @@ jobs:
        timeout-minutes: 20

        steps:
-            # On push:tags, github.ref_name is the tag — checkout default works.
-            # On workflow_dispatch, ref defaults to the branch the action was
-            # invoked from; we need to explicitly check out the tag the user
-            # supplied so the build comes from the tagged commit, not main.
+            # release-action@main reads GITHUB_REF directly (its action.yml
+            # does not declare a tag_name input). Validate up-front so manual
+            # dispatches from a branch ref fail loud here instead of burning
+            # a full build before the final step errors out with "ref X is
+            # not a tag".
+            - name: Validate tag ref
+              run: |
+                  if [[ "${GITHUB_REF}" != refs/tags/v* ]]; then
+                      echo "::error::Release workflow must run on a v*.X.Y tag ref, got ${GITHUB_REF}"
+                      echo "::error::Push a tag, or pick the tag (not main) in the workflow_dispatch Ref dropdown."
+                      exit 1
+                  fi
+
            - name: Checkout
-              uses: actions/checkout@v6
-              with:
-                  ref: ${{ github.event.inputs.tag || github.ref }}
+              uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

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

@@ -89,12 +92,11 @@ jobs:
            - name: Generate release body
              shell: pwsh
              env:
-                  # workflow_dispatch carries the user-supplied tag in inputs.tag;
-                  # push:tags carries it in github.ref_name. Either way the value
-                  # is treated as a PowerShell variable (env-var pass), not as
-                  # inline shell text, and validated against the semver regex
-                  # below before any string interpolation.
-                  TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
+                  # github.ref_name is the tag because Validate tag ref above
+                  # already enforced refs/tags/v*. Read via env: so the value
+                  # is a PowerShell variable, not inline shell text, and gets
+                  # re-validated against the semver regex below.
+                  TAG_NAME: ${{ github.ref_name }}
              run: |
                  $tag = $env:TAG_NAME
                  if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
@@ -111,20 +113,22 @@ jobs:

                  # changelog: is the last top-level key in the manifest, so
                  # everything after the marker is the literal block. Strip the
-                  # 2-space yaml indent from each line.
+                  # 4-space yaml indent (prettier convention) from each line.
                  $afterMarker = $raw.Substring($idx + $marker.Length)
                  $changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
-                      if ($_ -match '^  ') { $_.Substring(2) } else { $_ }
+                      if ($_ -match '^    ') { $_.Substring(4) } else { $_ }
                  }) -join "`n"

-                  $header = "**Hellion Chat $version"
+                  # Subblock convention: "**vX.Y.Z — <subtitle> (<date>)**"
+                  # matches verify-changelog-sync.sh and slim-rule grep.
+                  $header = "**v$version "
                  $start = $changelogBody.IndexOf($header)
                  if ($start -lt 0) {
                      throw "No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging a release."
                  }

                  $rest = $changelogBody.Substring($start)
-                  $nextHdr = $rest.IndexOf("`n`n**Hellion Chat ", 1)
+                  $nextHdr = $rest.IndexOf("`n`n**v", 1)
                  $trailer = $rest.IndexOf("`n`n---")

                  if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
@@ -152,19 +156,28 @@ jobs:
                  Write-Host $body
                  Write-Host "----------------------------------------"

+            # release-action@main only declares files/title/body/pre_release/
+            # draft/api_key/insecure as inputs (see its action.yml). It silently
+            # ignores anything else, including body_path and tag_name. The tag
+            # itself comes from GITHUB_REF, the body must be passed inline via
+            # body:, so we re-emit release-body.md as a step output first.
+            - name: Expose release body for release-action
+              id: body
+              shell: bash
+              run: |
+                  {
+                      echo 'content<<RELEASE_BODY_EOF'
+                      cat release-body.md
+                      echo 'RELEASE_BODY_EOF'
+                  } >> "$GITHUB_OUTPUT"
+
            # Gitea-native release action. Creates the release if the tag has no
-            # 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.
+            # release yet, or updates the existing one with latest.zip attached
+            # and the generated body. 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)
-                  # modes. Without this, dispatch runs would default to the branch
-                  # ref (main) and fail to find the release.
-                  tag_name: ${{ github.event.inputs.tag || github.ref_name }}
                  files: ${{ steps.locate.outputs.path }}
-                  body_path: release-body.md
+                  body: ${{ steps.body.outputs.content }}
                  api_key: ${{ secrets.GITHUB_TOKEN }}
@@ -0,0 +1,36 @@
+---
+subtitle: Symbol-Picker und Tell-History Fix
+versionsnatur: Feature-Patch + Hotfix
+---
+
+- Symbol-Picker im Chat-Eingang: ein kleiner Smile-Button links neben
+  dem Kanal-Indikator öffnet ein Popup mit zwei Tabs. Der erste listet
+  alle 161 FFXIV-PUA-Glyphen (Dalamuds SeIconChar); der zweite trägt
+  97 verifizierte BMP-Symbole (Latin-Marken, Währungen, das ganze
+  griechische Alphabet, Geometrie, Spielkarten, Noten) — jedes davon
+  über `/echo` und `/say` in einer vierrundigen Whitelist-Probe
+  durchgereicht, damit der Channel-Render dem entspricht, was der
+  Picker anzeigt. Klick fügt das Symbol an der Cursor-Position ein,
+  Multi-Insert lässt das Popup offen, eine Recent-Used-Leiste zeigt
+  die letzten sechzehn Picks über beide Tabs. Toggle in Settings →
+  Chat → Nachrichten-Verhalten, Default an.
+- Verlauf in angepinnten Tell-Tabs lädt wieder vollständig: ein
+  versteckter 500-Zeilen-Scan-Cap in PreloadHistory hat das
+  User-Setting `AutoTellTabsHistoryPreload` überschrieben, wodurch
+  weniger-frequente Tell-Partner ihren Backlog verloren haben sobald
+  die Scan-Schicht mit anderen Chat-Partnern voll lief. Cap ist raus,
+  der Index auf `(Receiver, Date)` hält die Query schnell.
+- Slash-Command-Teardown: /hellion, /hellionView, /hellionDebugger
+  (und im Debug-Build /hellionSeString) sind als private Felder
+  gecached. Plugin-Dispose detached die echte Registrierung, statt
+  mit identischen Args neu zu registrieren — schließt eine latente
+  Wartungs-Falle aus v1.4.9.
+- v1.4.x-Polish-Sweep endet hier. Der ImGuiListClipper-Refactor von
+  der v1.4.10-Reserve-Liste wurde gecancelt, nachdem der Cross-
+  Plattform-Smoke gezeigt hat dass das Scroll-Gummi ein Wine/Linux-
+  Quirk ist — Windows-User haben es nie gesehen. Spike dafür kommt in
+  einem späteren Patch. Nächster Major-Cycle ist v1.5.0 mit der
+  DI-Container-Adoption (`Microsoft.Extensions.Hosting` +
+  `ILogger<T>`) nach dem Lightless-Vorbild.
+- Migration v17 unverändert: kein Schema-Bump, kein
+  Config-Migrations-Aufwand.
@@ -0,0 +1,34 @@
+---
+subtitle: Threading- und IPC-Sicherheits-Politur
+versionsnatur: Wartung und Robustheit
+---
+
+**Hellion Chat 1.4.4 — Threading- und IPC-Sicherheits-Politur**
+
+Fünfter Sub-Patch der v1.4.x Polish-Sweep-Serie. Threading-Annahmen werden explizit pro Methode dokumentiert, ein
+Hot-Path-Lock im Auto-Tell-Tab-Counter fällt weg, IPC-Cleanup wird sichtbar wenn er fehlschlägt und der Privacy-Filter
+spricht jetzt bei unbekannten ChatTypes.
+
+- **AutoTellTabsService Hot-Path-Lock entfernt.** `ActiveTempTabCount` hat bisher pro Render-Frame ein LINQ-Count unter
+  einem Lock gemacht. Jetzt läuft das über einen Interlocked-Counter der parallel zur Tabs-Liste mitgeführt wird,
+  inklusive Resync-Hook für den Snapshot-Restore-Pfad in `SaveConfig`. Plus Pure-Helper-Test-Mirror in der Build-Suite
+  damit die Atomicity-Semantik nicht versehentlich wegrefactored wird
+- **HonorificService selbst-dokumentierende Threading-Banner.** Statt eines Block-Comments am Klassen-Ende hat jede
+  IPC-Callback-Methode jetzt einen 1-Zeilen-Banner darüber, der den Thread-Kontext direkt am Call-Site benennt
+  (framework only, framework scheduled, any). Mehr Hilfe für künftige Reviews als ein abstraktes Threading-Kapitel
+- **Unsubscribe-Failure ist jetzt sichtbar.** `TryUnsubscribe` hat ein Honorific-Unsubscribe-Failure bisher als Debug
+  geloggt, was bei Standard-Loglevel verschluckt wurde. Eine geleakte Subscription kann den Service über Plugin-Reloads
+  hinweg leben lassen, also läuft der Log jetzt auf Warning
+- **AutoTranslate-Warmup blockiert den Plugin-Unload nicht mehr.** Der Cache-Warmup-Thread war ohne `IsBackground=true`
+  unterwegs, was den Unload um 100-300 ms verzögern konnte. Pattern-Match zu MessageManager und RetentionSweep (beide
+  seit v1.4.0)
+- **Privacy-Filter loggt unbekannte ChatTypes.** Wenn FFXIV durch einen Patch einen neuen ChatType einführt der weder in
+  der Whitelist noch in den Defaults steht, wird er bisher silent durch den Failsafe geleitet. Jetzt loggt der Filter
+  einmalig pro Runtime eine Warning mit dem Type und dem Failsafe-Wert. Dedup über ein NonSerialized-HashSet, also kein
+  Log-Spam
+- **Default-Flip für neue Installationen.** `PrivacyPersistUnknownChannels` startet bei neuen Configs jetzt auf `true`,
+  damit ein Patch-bedingt neuer ChatType nicht stillschweigend gedroppt wird bevor der User entscheiden kann. Bestehende
+  Configs behalten ihre Wahl, weil der Deserializer den Initializer überschreibt. Keine Migration, kein Schema-Bump
+
+Keine User-sichtbaren Funktions-Änderungen außer dem Default-Flip für neue Installationen. Settings, Themes, Tabs und
+das Privacy-Verhalten für Bestand bleiben unangetastet.
@@ -0,0 +1,28 @@
+---
+subtitle: UX und Robustheit
+versionsnatur: UX-Polish-Cycle
+---
+
+**Hellion Chat 1.4.5 — UX und Robustheit**
+
+Sechster Sub-Patch der v1.4.x Polish-Sweep-Serie. Render-Fehler im Chat-Fenster werden jetzt sichtbar, der
+First-Run-Wizard hat eine explizite Cancel-Schaltfläche, der Eingabe-Verlauf bleibt nicht mehr über Plugin-Reloads
+hinweg liegen, und die Statusleiste klippt in schmalen Fenstern nicht mehr.
+
+- **Fehler-Benachrichtigung im Chat-Fenster.** Wenn ein Render-Fehler in `DrawChatLog` auftritt, zeigt das Plugin jetzt
+  eine einmalige Warning-Notification mit Verweis aufs `/xllog`, statt das Fenster stillschweigend leer zu lassen. Der
+  Stack-Trace selbst geht weiter via `Plugin.Log.Error` ins Logfile. De-Dup über Per-Session-Bool, damit ein
+  wiederkehrender Fehler die Notification-Stack nicht pro Frame neu vollkippt
+- **First-Run-Wizard trennt Accept und Close.** `OnClose` setzt nicht mehr stillschweigend `FirstRunCompleted=true`,
+  also lässt das X den Wizard schwebend zurück und er kommt beim nächsten Plugin-Reload wieder. Eine neue „Später —
+  Defaults behalten"-Schaltfläche im Footer ist der explizite Weg, ohne Profil-Auswahl rauszukommen. Strings bilingual
+  EN+DE plus Tooltip
+- **Eingabe-Verlauf wird beim Plugin-Reload geleert.** `InputHistoryService.Reset` hängt jetzt in `Plugin.DisposeAsync`
+  neben den anderen Pure-Memory-Cleanups, damit der statische Zustand aus der vorigen Session den nächsten Load nicht
+  mehr erbt
+- **Statusleiste klippt nicht mehr.** Der rechtsbündige Versions-Slot wird ausgeblendet wenn die Chat-Window-Breite
+  abzüglich Versions-Text unter 200 px fällt — vorher überlappte er die vier linken Slots. Ab ausreichender Breite
+  taucht der Slot wieder auf
+- **Intern:** `FontManager` fällt auf System-Font zurück wenn die eingebettete Hellion-Font-Resource fehlt
+  (Broken-csproj-Pfad, nie ein Produktions-Build), plus expliziter Session-Only-Invariant-Kommentar für Auto-Tell-Tabs
+  in `Plugin.cs:167-168` mit einem TempTabCounter-Init-Pin in der Build-Suite. Kein Schema-Bump, keine Migration
@@ -0,0 +1,33 @@
+---
+subtitle: Code Hygiene and Refactor
+versionsnatur: Maintenance-Cycle
+---
+
+Wartungs-Patch ohne User-sichtbare Änderungen. Saubere Code-Basis als Vorbereitung auf das v1.4.7-Backlog-Cleanup, plus
+zwei geerbte Bugfixes aus dem ChatTwo-Upstream `f35b7d3`.
+
+- **preflight.sh härter**: csharpier-Reflow-Check (Block E) und markdownlint (Block F) laufen jetzt im Pre-Push-Gate,
+  statt erst beim Pre-Merge-Review aufzufallen.
+- **FontManager-Fallback robuster**: Atlas-Toolkit-Throws aus kaputten Font-Configs (IO, InvalidOperation,
+  ArgumentException) fallen jetzt zuverlässig auf NotoSansCjkRegular, statt den Atlas-Build mitzureißen. Der
+  Exception-Typ wird im Log mitgegeben für die Diagnose.
+- **URL-Validation beim Plugin-Load**: BrandingLinks (5 URLs) und IntegrationLinks (2 URLs) werden via
+  `[ModuleInitializer]` geprüft. Ein Tippfehler bei einer künftigen URL-Rotation wirft jetzt sofort beim Plugin-Load,
+  statt still beim Klick zu scheitern.
+- **Cherry-Pick aus ChatTwo `f35b7d3`** — Memory-Leak in `Chat.SetChannel`: der native `Utf8String` wird jetzt auch dann
+  freigegeben, wenn der Linkshell-Check den Channel ablehnt (vorher gefangen im early-return).
+- **Cherry-Pick aus ChatTwo `f35b7d3`** — `Tab.Clone()` Deep-cloned jetzt `UsedChannel` und `TellTarget`. Vorher
+  Reference-Share-Bug: PopOut- und Temp-Tabs mutierten sich gegenseitig.
+- **Aktive-Tab-Underline pixel-perfect bei DPI-Scaling**: Die Underline-Pill skaliert jetzt mit
+  `ImGuiHelpers.GlobalScale` und rundet die DrawList-Koordinaten auf physische Pixel. Kein Sub-Pixel-Blur mehr auf
+  125/150%-Setups.
+- **IconButton-Width-Fix**: der manuelle `width - 2 * CellPadding.X`-Subtract verlor den HUD-Scale (Padding skaliert,
+  der raw int nicht). Gemessene Breite läuft jetzt unverändert durch.
+- **Test-Isolation für MessageStore**: `Dalamud.Utility.Util`-Surface (IsWine, OpenLink) läuft jetzt durch eine
+  `IPlatformUtil`-Indirektion. MessageStores `IsWine`-Probe ist isoliert testbar in der Build-Suite. Plus:
+  HellionStyle-ChildBgAlpha als Pure-Helper extrahiert, Plugin.SaveConfig kopiert nur Session-Tabs statt der ganzen
+  Tab-Liste, SettingsOverview cached den DrawList einmal pro Frame.
+- **Built-in-Theme-Roster**: Crystal Nocturne (Royal Sapphire + Electric Magenta auf Obsidian, von CRYSTALLITE) ersetzt
+  Moonlit Bloom. User mit Moonlit Bloom als aktivem Theme fallen beim ersten Plugin-Load auf Hellion Arctic zurück.
+
+Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
@@ -0,0 +1,29 @@
+---
+subtitle: Backlog Cleanup and Mid-Features
+versionsnatur: Mid-Feature-Patch
+---
+
+Achter Sub-Patch der v1.4.x Polish-Sweep-Serie. Erstes User-sichtbares Feature-Bundle seit v1.4.5 — angepinnte Tell-Tabs
+die Relog überleben, opt-in Honorific-Glow, plus eine konfigurierbare Sidebar.
+
+- **TempTell anpinnen**: Rechtsklick auf einen TempTell-Tab in der Sidebar → „Tab anpinnen". Angepinnte Tabs überleben
+  Plugin-Reload und Char-Logout, behalten ihre Konversations-Historie (wird beim Rehydrate aus dem MessageStore
+  nachgeladen) und bleiben an die gleiche /tell-Person gebunden. Hard-Cap 5 angepinnte Tabs in einem separaten Pool —
+  die normalen Auto-Tell-Tabs (15er Cap) sind davon entkoppelt, Gesamt-Decke 20. Die Sidebar gruppiert angepinnte Tabs
+  in einer eigenen „Angepinnt"-Sektion mit eigenem Trenner.
+- **Honorific Glow-Outline**: rendert jetzt eine 8-Richtungs-DrawList-Outline wenn der Honorific-Titel eine Glow-Farbe
+  trägt. Opt-in via **Settings → Integrationen → Glow-Outline rendern (Honorific)** (Default OFF). Gradient (Color3 /
+  GradientColourSet / Wave / Pulse) wird geparst und im DTO weitergereicht, rendert aktuell aber statisch als
+  Primärfarbe — der volle Gradient-Port (Animations-Algorithmus + Pride-Palette) kommt als eigener Cycle nach.
+- **Sidebar-Breite konfigurierbar**: in **Theme & Layout** ein Slider 44–160 px. Default bleibt 44 px (icon-only), aber
+  breiter machen damit Sektion-Header wie „Aktive Tells (3)" oder „Angepinnt (2)" nicht abgeschnitten werden.
+- **Settings-Save Channel-Fix**: ein Save mit aktivem Party- oder Linkshell-Tab konnte den Chat-Input zurück auf
+  `/tell <angepinnte Person>` springen lassen. `Configuration.UpdateFrom` bewahrt jetzt den Runtime-`CurrentChannel`
+  über den persistent-Tab-Merge hinweg, und `TabSwitched` deep-cloned den Seed-Channel statt sich den `UsedChannel` mit
+  dem vorigen Tab zu teilen.
+- **Internal**: `IPluginLogProxy`-Indirektion vor Dalamud's `IPluginLog` über alle ~91 `Plugin.Log`-Call-Sites. Damit
+  läuft `MessageStore.Migrate0` voll-isoliert in xUnit (F12.1-Lücke aus v1.4.6 geschlossen). Plus: TempTab-Counter als
+  abgeleitete Property statt gecachtes Interlocked-Feld — die neuen Pin/Unpin-Übergänge sind Cold-Path, kein
+  Lock-Free-Vorteil mehr. Migration v16 → v17 ist rein additiv (neues `Tab.IsPinned`-Bool, Default false).
+
+Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
@@ -0,0 +1,21 @@
+---
+subtitle: Hook-Layer und Polish-Quick-Wins
+versionsnatur: Polish-Patch
+---
+
+- DbViewer Volltext-Suche: optionaler FTS5-Index über die ganze Chat-Historie.
+  Wird beim ersten v1.4.8-Start asynchron im Hintergrund gebaut, Progress als
+  Toast. Lokale Page-Suche bleibt Default. Such-Eingaben werden als exakte
+  Wortfolge gematcht; mehrere Wörter werden nur gefunden, wenn sie zusammen
+  und in der Reihenfolge stehen. Wer rohe FTS5-MATCH-Syntax nutzen will, setzt
+  eigene Anführungszeichen um den Suchbegriff.
+- Custom-Theme-Files laden sich beim Speichern automatisch neu, wenn das Theme
+  aktiv ist. Kein Picker-Klick mehr nötig.
+- Retention-Sweep blockt nicht mehr den Framework-Thread. Der Mini-Hitch von
+  ~194ms pro Sweep ist weg.
+- Statusleiste rendert sauber bei Windows-Skalierung über 100%.
+- Receive-Suppressed-Tells-Routing wurde in diesem Cycle untersucht und auf
+  v1.5.x verschoben: wenn andere Plugins Tells via CheckMessageHandled
+  unterdrücken, überspringt FFXIVs Chat-Pipeline den RaptureLogModule-Resolver
+  und HellionChats Tab-Routing verliert den Tell-Partner. Der Fix liegt
+  architektonisch neben dem geplanten Ad-Block-Hook-Layer und kommt dort mit.
@@ -0,0 +1,37 @@
+---
+subtitle: Plugin-Load Render Polish
+versionsnatur: Performance-Patch
+---
+
+- First-Frame-HITCH unter 100 ms: der erste Render-Frame des Plugins liegt
+  jetzt bei ~76 ms Median (vorher ~127 ms), die Dalamud-Warnung
+  „UiBuilder(Hellion Chat) > 100ms" beim Plugin-Start ist damit weg.
+  Erreicht durch das Verlagern von sechs nicht-essentiellen Render-
+  Sektionen (Statusleiste, Kanalname-Chunks, Fenster-Bounds-Check,
+  Hinweis-Banner, Autocomplete, Input-Preview) auf den zweiten Frame.
+  Bei 60 fps sieht man die deferred-Sektionen ~17 ms später, was im
+  Atlas-Build-Fenster nach einem Reload unsichtbar bleibt.
+- Slash-Commands zentral registriert: /hellion, /hellionView,
+  /hellionSeString und /hellionDebugger werden jetzt im Plugin-Load zentral
+  registriert statt erst beim ersten Öffnen ihres Ziel-Fensters. Heißt: die
+  Befehle funktionieren ab dem ersten Tick, auch wenn das jeweilige Fenster
+  nie geöffnet wurde. Der „Einstellungen"-Button im Plugin-Manager hängt am
+  selben Pfad.
+- Plugin-Load-Diagnose-Logs als Tripwire: die Profiling-Logs für
+  MessageStore.Connect, MessageStore.Migrate, FilterAllTabs und den
+  Auto-Translate-Warmup bleiben auf Information-Level eingeschaltet. Falls
+  eine zukünftige Änderung die Lade-Zeit wieder über 100 ms drückt, taucht
+  der Mehrverbrauch direkt im /xllog auf, ohne dass jemand erst den
+  Debug-Filter einschalten muss.
+- ChatTwo-IPC-Kompatibilitäts-Layer: HellionChat spiegelt jetzt die
+  komplette ChatTwo-IPC-Surface (`GetChatInputState`,
+  `ChatInputStateChanged`, `Register`, `Unregister`, `Available`,
+  `Invoke`) zusätzlich zu unseren eigenen `HellionChat.*`-Gates unter
+  dem `ChatTwo.*`-Namensraum. Drittseitige Integrationen die nur auf
+  ChatTwo's IPC reagieren, etwa die Kontextmenü-Hooks von Artisan und
+  AllaganTools, funktionieren damit weiter ohne Code-Änderung auf
+  ihrer Seite. Die Conflict-Detection blockiert das parallele Laden
+  von ChatTwo, daher kein Namensraum-Konflikt im Live-Betrieb.
+- Migration v17 unverändert: kein Schema-Bump, kein Config-Migrations-
+  Aufwand. Nach dem Update läuft das Plugin gegen die bestehende
+  v17-Datenbank weiter.
@@ -0,0 +1,37 @@
+---
+subtitle: DI Foundation und Service-Refactor
+versionsnatur: Architektur-Cycle
+---
+
+- **Architektur-Umbau ohne User-spürbare Verhaltens-Änderung:** der
+  Plugin-Bootstrap wechselt auf einen Generic-Host DI-Container
+  (`Microsoft.Extensions.Hosting` + `IServiceCollection`) nach dem
+  Lightless-Sync-Muster. 18 Service-Klassen wandern von einem
+  statischen `Plugin.LogProxy`-Locator auf typisierte
+  `ILogger<T>`-Constructor-Injection. `DalamudLogger` brückt
+  `Microsoft.Extensions.Logging` über auf Dalamuds `IPluginLog` —
+  im xllog erscheinen jetzt Service-spezifische Spalten wie
+  `[ MessageManager]` und `[Honori...ervice]`.
+- **Plugin.LogProxy bleibt für die acht Buckets erhalten,** die
+  Constructor-Injection nicht erreicht: Static-Helper (EmoteCache,
+  AutoTranslate, MemoryUtil, WrapperUtil), Dalamud-Reflektion
+  (Configuration), Data-Class mit Massen-Instanziierung (Message)
+  und Instanz-Klassen die nur aus Static-Methods loggen (FontManager,
+  eine GameFunctions-Stelle).
+- **Performance bestätigt durch Cross-Plugin-Baseline:** HellionChat
+  First-Frame-HITCH 77 ms Median, Chat 2 v1.40.2 74 ms Median — kein
+  DI-Penalty gegenüber dem Upstream-Fork-Origin. Lightless und
+  XIVInstantMessenger liegen bei ~7 ms weil sie ihren FontAtlas-Build
+  deferren; das wird das v1.5.1-Item.
+- **User-sichtbarer Bug-Fix nebenbei:** Slash-Command-Einfügen in das
+  Chat-Eingabefeld (Friend-List "/tell"-Action plus Plugin-Inserts
+  von Artisan, AllaganTools und ähnlichen) ersetzt jetzt den
+  vorhandenen Input, statt anzukonkatenieren. Cherry-Pick aus ChatTwo
+  upstream `ee7768ac` mit Namespace-Anpassung.
+- **Foundation für die Plugin-Integrations-Wave:** v1.5.7-11
+  (Context-Menu, NotificationMaster, Moodles, ExtraChat, XIVIM
+  Quick-DM) werden ab jetzt strukturell handhabbar — neue Services
+  sind ein `services.AddSingleton<T>` plus ein paar Factory-Lambda-
+  Zeilen, kein Plugin.cs-Anflanschen mehr.
+- Migration v17 unverändert: kein Schema-Bump, kein
+  Config-Migrations-Aufwand.
@@ -384,3 +384,7 @@ ChatTwo.Tests
 TestResults
 *.db-shm
 *.db-wal
+
+# Claude Code projekt-spezifisches Setup (lokal, nicht committed)
+/.claude/
+/CLAUDE.md
@@ -1,7 +1,9 @@
 {
    "MD007": { "indent": 4 },
    "MD013": false,
+    "MD024": { "siblings_only": true },
    "MD029": false,
    "MD033": false,
+    "MD036": false,
    "MD041": false
 }
@@ -1,12 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Interface.ImGuiNotification;
 using HellionChat.Code;
 using HellionChat.GameFunctions.Types;
 using HellionChat.Resources;
 using HellionChat.Util;
+using Microsoft.Extensions.Logging;

 namespace HellionChat;

@@ -17,27 +20,38 @@ internal sealed class AutoTellTabsService : IDisposable
    private readonly Plugin _plugin;
    private readonly MessageManager _messageManager;
    private readonly MessageStore _store;
+    private readonly ILogger<AutoTellTabsService> _logger;
    private readonly object _tempTabsLock = new();

+    // Hard cap on pinned TempTabs so the sidebar doesn't inflate over years
+    // of usage. Separate pool from AutoTellTabsLimit (15) — pinned tabs live
+    // in their own bucket. A configurable cap is a vault-backlog anchor for
+    // a later cycle if tester feedback demands it.
+    internal const int MaxPinnedTempTabs = 5;
+
    private bool _initialized;

-    internal AutoTellTabsService(Plugin plugin, MessageManager messageManager, MessageStore store)
+    internal AutoTellTabsService(
+        Plugin plugin,
+        MessageManager messageManager,
+        MessageStore store,
+        ILogger<AutoTellTabsService> logger
+    )
    {
        _plugin = plugin;
        _messageManager = messageManager;
        _store = store;
+        _logger = logger;
    }

-    internal int ActiveTempTabCount
-    {
-        get
-        {
-            lock (_tempTabsLock)
-            {
-                return Plugin.Config.Tabs.Count(t => t.IsTempTab);
-            }
-        }
-    }
+    // Derived from the tab list on read. Pin/Unpin/Promote/Logout simply
+    // mutate IsPinned or remove tabs — the count adapts automatically.
+    // Replaces the F2.1 Interlocked counter because the new pin-state
+    // transitions are cold-path and don't need lock-free reads.
+    internal int ActiveTempTabCount =>
+        Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInUnpinnedPool);
+
+    internal int PinnedTempTabCount => Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);

    internal void Initialize()
    {
@@ -46,11 +60,53 @@ internal sealed class AutoTellTabsService : IDisposable
            return;
        }

+        // Pinned tabs come out of the JSON with TellTarget set but
+        // CurrentChannel reset (NonSerialized). Without re-seeding, the chat
+        // input has no tell-target on the active pinned tab, and the
+        // game-side channel hook only repaints CurrentChannel once the user
+        // triggers a /tell or channel switch.
+        RehydratePinnedTabs();
+
        _messageManager.MessageProcessed += HandleTell;
        Plugin.ClientState.Logout += OnLogout;
        _initialized = true;
    }

+    private void RehydratePinnedTabs()
+    {
+        var pinned = Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);
+        _logger.LogDebug($"[Pin] Rehydrate scan: {pinned} pinned tab(s) found");
+
+        foreach (var tab in Plugin.Config.Tabs)
+        {
+            if (!TabLifecycleHelpers.IsInPinnedPool(tab))
+                continue;
+
+            if (tab.TellTarget is null || !tab.TellTarget.IsSet())
+            {
+                _logger.LogWarning(
+                    $"[Pin] Pinned tab '{tab.Name}' has no usable TellTarget "
+                        + $"(Name={tab.TellTarget?.Name ?? "<null>"} World={tab.TellTarget?.World ?? 0}). "
+                        + "Chat input on this tab will be empty until the partner sends a tell or you /tell manually."
+                );
+                continue;
+            }
+
+            tab.Channel ??= InputChannel.Tell;
+            tab.CurrentChannel.Channel = InputChannel.Tell;
+            tab.CurrentChannel.TellTarget = tab.TellTarget.Clone();
+
+            // MessageList is NonSerialized so pinned tabs come back empty.
+            // Preload the same history window the spawn path uses so the user
+            // sees the recent conversation, not a blank tab.
+            PreloadHistory(tab, tab.TellTarget.Name, tab.TellTarget.World, Guid.Empty);
+
+            _logger.LogDebug(
+                $"[Pin] Rehydrated '{tab.Name}' -> Tell target {tab.TellTarget.Name}@{tab.TellTarget.World}"
+            );
+        }
+    }
+
    public void Dispose()
    {
        if (!_initialized)
@@ -82,7 +138,7 @@ internal sealed class AutoTellTabsService : IDisposable
        if (partner == null)
        {
            // Diagnostics: helps detect regressions (FFXIV payload changes, new edge cases)
-            Plugin.Log.Warning(
+            _logger.LogWarning(
                $"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, "
                    + $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, "
                    + $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, "
@@ -96,7 +152,23 @@ internal sealed class AutoTellTabsService : IDisposable
            var existing = FindTempTab(partner.Value.Name, partner.Value.World);
            if (existing != null)
            {
-                // Already routed via MessageManager pipeline
+                // Already routed via MessageManager pipeline. Repair the
+                // tell-target if the fallback hit a pinned tab whose
+                // TellTarget didn't survive a previous round-trip — keeps
+                // FindTempTab fast on the next message.
+                if (
+                    existing.IsPinned
+                    && (existing.TellTarget is null || !existing.TellTarget.IsSet())
+                )
+                {
+                    existing.TellTarget = new TellTarget(
+                        partner.Value.Name,
+                        partner.Value.World,
+                        0,
+                        TellReason.Direct
+                    );
+                    _plugin.SaveConfig();
+                }
                return;
            }

@@ -146,22 +218,35 @@ internal sealed class AutoTellTabsService : IDisposable
        return null;
    }

-    private Tab? FindTempTab(string name, uint world)
+    private static Tab? FindTempTab(string name, uint world)
    {
-        return Plugin.Config.Tabs.FirstOrDefault(t =>
+        var byTarget = Plugin.Config.Tabs.FirstOrDefault(t =>
            t.IsTempTab
            && t.TellTarget != null
            && string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase)
            && t.TellTarget.World == world
        );
+        if (byTarget != null)
+            return byTarget;
+
+        // Fallback: match by tab name. Pinned tabs are named via
+        // FormatTabName(player, world) at spawn time, so the name is a
+        // stable secondary key when TellTarget didn't survive a save/load
+        // (older configs from a renamed pin, malformed migrations, etc.).
+        var expectedName = FormatTabName(name, world);
+        return Plugin.Config.Tabs.FirstOrDefault(t =>
+            t.IsTempTab && string.Equals(t.Name, expectedName, StringComparison.OrdinalIgnoreCase)
+        );
    }

-    private void DropOldestTempTab()
+    internal void DropOldestTempTab()
    {
-        // Prioritize greeted tabs for drop; within each bucket, drop by oldest LastActivity
+        // Pinned tabs live in their own bucket (MaxPinnedTempTabs) and are
+        // never drop candidates. They leave the bucket only via Unpin or
+        // PromoteToPermanent.
        var victim = Plugin
            .Config.Tabs.Select((tab, idx) => (Tab: tab, Index: idx))
-            .Where(t => t.Tab.IsTempTab)
+            .Where(t => TabLifecycleHelpers.IsInUnpinnedPool(t.Tab))
            .OrderByDescending(t => t.Tab.IsGreeted)
            .ThenBy(t => t.Tab.LastActivity)
            .FirstOrDefault();
@@ -284,7 +369,7 @@ internal sealed class AutoTellTabsService : IDisposable
        catch (Exception ex)
        {
            // Non-fatal: tab still spawns with visible error notice instead of silent history loss
-            Plugin.Log.Error(ex, "[AutoTellTabs] History preload failed");
+            _logger.LogError(ex, "[AutoTellTabs] History preload failed");
            tab.Messages.AddPrune(
                MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
                MessageManager.MessageDisplayLimit
@@ -338,14 +423,16 @@ internal sealed class AutoTellTabsService : IDisposable
    {
        lock (_tempTabsLock)
        {
-            // Snapshot active tab index before mutating list
+            // Pinned TempTabs must survive char-switch — that's the whole point
+            // of pinning. Only unpinned ones get stripped.
            var lastIndex = _plugin.LastTab;
            var lastIndexValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
-            var currentWasTempTab = lastIndexValid && Plugin.Config.Tabs[lastIndex].IsTempTab;
+            var currentWasUnpinnedTempTab =
+                lastIndexValid
+                && TabLifecycleHelpers.IsInUnpinnedPool(Plugin.Config.Tabs[lastIndex]);

-            // Clean up pop-out windows before removing temp tabs
            var poppedTempTabIds = Plugin
-                .Config.Tabs.Where(t => t.IsTempTab && t.PopOut)
+                .Config.Tabs.Where(t => TabLifecycleHelpers.IsInUnpinnedPool(t) && t.PopOut)
                .Select(t => t.Identifier)
                .ToList();
            if (poppedTempTabIds.Count > 0)
@@ -361,14 +448,76 @@ internal sealed class AutoTellTabsService : IDisposable
                }
            }

-            Plugin.Config.Tabs.RemoveAll(t => t.IsTempTab);
+            Plugin.Config.Tabs.RemoveAll(TabLifecycleHelpers.IsInUnpinnedPool);

-            // Force switch to tab 0 if active tab was temp or index is now out of range
+            // Force switch to tab 0 if active tab was an unpinned temp tab or
+            // index is now out of range. Pinned tabs survive — no switch needed.
            var stillValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
-            if (currentWasTempTab || !stillValid)
+            if (currentWasUnpinnedTempTab || !stillValid)
            {
                _plugin.WantedTab = 0;
            }
        }
    }
+
+    internal bool TryPin(Tab tab)
+    {
+        if (!tab.IsTempTab || tab.IsPinned)
+        {
+            _logger.LogDebug(
+                $"[Pin] TryPin skipped: IsTempTab={tab.IsTempTab} IsPinned={tab.IsPinned}"
+            );
+            return false;
+        }
+
+        if (PinnedTempTabCount >= MaxPinnedTempTabs)
+        {
+            WrapperUtil.AddNotification(
+                string.Format(HellionStrings.PinTab_LimitReached, MaxPinnedTempTabs),
+                NotificationType.Warning
+            );
+            return false;
+        }
+
+        tab.IsPinned = true;
+        _logger.LogDebug(
+            $"[Pin] Pinned tab '{tab.Name}' target={tab.TellTarget?.Name}@{tab.TellTarget?.World}"
+        );
+        _plugin.SaveConfig();
+        return true;
+    }
+
+    internal void Unpin(Tab tab)
+    {
+        if (!tab.IsPinned)
+        {
+            return;
+        }
+
+        // If the unpinned pool is already full, dropping the oldest before
+        // flipping the flag avoids counting the just-unpinned tab as a drop
+        // candidate.
+        if (ActiveTempTabCount >= Plugin.Config.AutoTellTabsLimit)
+        {
+            DropOldestTempTab();
+        }
+
+        tab.IsPinned = false;
+        _logger.LogDebug("[Pin] Unpinned tab '{TabName}'", tab.Name);
+        _plugin.SaveConfig();
+    }
+
+    internal void PromoteToPermanent(Tab tab)
+    {
+        if (!tab.IsTempTab)
+        {
+            return;
+        }
+
+        tab.IsTempTab = false;
+        tab.IsPinned = false;
+        tab.TellTarget = TellTarget.Empty();
+        _logger.LogDebug($"[Pin] Promoted tab '{tab.Name}' to permanent (tell-binding dropped)");
+        _plugin.SaveConfig();
+    }
 }
@@ -1,3 +1,6 @@
+using System.Runtime.CompilerServices;
+using HellionChat.Util;
+
 namespace HellionChat.Branding;

 // Centralised — a future invite/URL rotation only touches this file.
@@ -9,4 +12,22 @@ internal static class BrandingLinks
        "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat";
    public const string HellionForgeWebsite = "https://hellion-forge.cloud";
    public const string HellionMediaWebsite = "https://hellion-media.de/de";
+
+    // CA2255 warns against [ModuleInitializer] in library code, but Dalamud
+    // loads the plugin DLL directly so the module-init pass is the right hook
+    // for a one-shot URL sanity check at plugin load.
+#pragma warning disable CA2255
+    [ModuleInitializer]
+#pragma warning restore CA2255
+    internal static void ValidateUrls()
+    {
+        UrlValidation.ValidateAll(
+            nameof(BrandingLinks),
+            HellionForgeDiscordInvite,
+            HellionForgeGitea,
+            HellionChatRepo,
+            HellionForgeWebsite,
+            HellionMediaWebsite
+        );
+    }
 }
@@ -7,36 +7,36 @@ public enum ChatSource : ushort
 {
    None = 0,

-    /// <summary>The player currently controlled by the local client.</summary>
+    // The player controlled by this client
    LocalPlayer = 1 << XivChatRelationKind.LocalPlayer,

-    /// <summary>A player in the same 4-man or 8-man party as the local player.</summary>
+    // Member of the local party
    PartyMember = 1 << XivChatRelationKind.PartyMember,

-    /// <summary>A player in the same alliance raid.</summary>
+    // Member of the alliance
    AllianceMember = 1 << XivChatRelationKind.AllianceMember,

-    /// <summary>A player not in the local player's party or alliance.</summary>
+    // Other player
    OtherPlayer = 1 << XivChatRelationKind.OtherPlayer,

-    /// <summary>An enemy entity that is currently in combat with the player or party.</summary>
+    // Enemy in combat
    EngagedEnemy = 1 << XivChatRelationKind.EngagedEnemy,

-    /// <summary>An enemy entity that is not yet in combat or claimed.</summary>
+    // Enemy out of combat
    UnengagedEnemy = 1 << XivChatRelationKind.UnengagedEnemy,

-    /// <summary>An NPC that is friendly or neutral to the player (e.g., EventNPCs).</summary>
+    // Friendly NPC
    FriendlyNpc = 1 << XivChatRelationKind.FriendlyNpc,

-    /// <summary>A pet (Summoner/Scholar) or companion (Chocobo) belonging to the local player.</summary>
+    // Own pet or companion
    PetOrCompanion = 1 << XivChatRelationKind.PetOrCompanion,

-    /// <summary>A pet or companion belonging to a member of the local player's party.</summary>
+    // Pet or companion of party members
    PetOrCompanionParty = 1 << XivChatRelationKind.PetOrCompanionParty,

-    /// <summary>A pet or companion belonging to a member of the alliance.</summary>
+    // Pet or companion of alliance members
    PetOrCompanionAlliance = 1 << XivChatRelationKind.PetOrCompanionAlliance,

-    /// <summary>A pet or companion belonging to a player not in the party or alliance.</summary>
+    // Pet or companion of other players
    PetOrCompanionOther = 1 << XivChatRelationKind.PetOrCompanionOther,
 }
@@ -1,10 +1,17 @@
 using Dalamud.Game.Command;
+using Microsoft.Extensions.Logging;

 namespace HellionChat;

 internal sealed class Commands : IDisposable
 {
    private readonly Dictionary<string, CommandWrapper> Registered = [];
+    private readonly ILogger<Commands> _logger;
+
+    public Commands(ILogger<Commands> logger)
+    {
+        _logger = logger;
+    }

    public void Dispose()
    {
@@ -52,7 +59,7 @@ internal sealed class Commands : IDisposable
    {
        if (!Registered.TryGetValue(command, out var wrapper))
        {
-            Plugin.Log.Warning($"Missing registration for command {command}");
+            _logger.LogWarning($"Missing registration for command {command}");
            return;
        }

@@ -62,7 +69,7 @@ internal sealed class Commands : IDisposable
        }
        catch (Exception ex)
        {
-            Plugin.Log.Error(ex, $"Error while executing command {command}");
+            _logger.LogError(ex, $"Error while executing command {command}");
        }
    }
 }
@@ -34,7 +34,7 @@ public class ConfigKeyBind
 [Serializable]
 public class Configuration : IPluginConfiguration
 {
-    private const int LatestVersion = 16;
+    private const int LatestVersion = 17;

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

@@ -57,8 +57,18 @@ public class Configuration : IPluginConfiguration
    // Empty set means the migration has not run yet — see Plugin.cs v6→v7.
    public HashSet<ChatType> PrivacyPersistChannels = [];

-    // Failsafe for ChatTypes added by future FFXIV patches.
-    public bool PrivacyPersistUnknownChannels;
+    // Failsafe for ChatTypes added by future FFXIV patches. New configs default
+    // to the failsafe via PrivacyDefaults; existing configs keep their saved
+    // choice because the deserializer overrides this initializer.
+    public bool PrivacyPersistUnknownChannels = Privacy
+        .PrivacyDefaults
+        .DefaultPersistUnknownChannels;
+
+    // F3.2: dedup unknown-ChatType warnings so a chatty filter doesn't spam
+    // the log every frame. NonSerialized so the warning fires once per
+    // runtime, not once-ever-per-install.
+    [NonSerialized]
+    private readonly HashSet<ChatType> _warnedUnknownChannels = new();

    public bool IsAllowedForStorage(ChatType type)
    {
@@ -66,6 +76,20 @@ public class Configuration : IPluginConfiguration
            return true;
        if (PrivacyPersistChannels.Contains(type))
            return true;
+
+        // F3.2: log first occurrence of a ChatType the running build doesn't
+        // recognise — i.e. one a future FFXIV patch may have added. Known
+        // types the user opted out of are routed through the failsafe
+        // silently, like before.
+        if (!Enum.IsDefined(typeof(ChatType), type) && _warnedUnknownChannels.Add(type))
+        {
+            Plugin.LogProxy.Warning(
+                "PrivacyFilter: unrecognised ChatType {Type} — falling back to PrivacyPersistUnknownChannels={Persist}.",
+                type,
+                PrivacyPersistUnknownChannels
+            );
+        }
+
        return PrivacyPersistUnknownChannels;
    }

@@ -78,10 +102,22 @@ public class Configuration : IPluginConfiguration
    public bool FirstRunCompleted;
    public bool UseHellionFont = true;
    public bool ShowHonorificTitleInHeader = true;
+
+    // v1.4.7 opt-in: renders the Honorific glow outline when the title carries
+    // a Glow colour. Default OFF — keeps v1.4.6 visuals untouched for users
+    // who don't care, and dodges the per-frame DrawList overhead on low-end
+    // hardware. Gradient (Color3 / GradientColourSet) is parsed but rendered
+    // as the primary Color until a later cycle ports the animation.
+    public bool ShowHonorificGlow;
    public bool EnableAutoTellTabs = true;
    public int AutoTellTabsLimit = 15;
    public bool AutoTellTabsCompactDisplay;
    public int AutoTellTabsHistoryPreload = 20;
+
+    // Sidebar width in pixels. Default 44 mirrors the icon-only layout from
+    // v1.2.0; users can widen up to 160 to fit a section-header line like
+    // "Active Tells (3)" without truncation.
+    public int SidebarWidth = 44;
    public bool AutoTellTabsShowGreetedToggle;
    public bool SeenPopOutInputHint;
    public bool PopOutInputEnabled = true;
@@ -140,6 +176,7 @@ public class Configuration : IPluginConfiguration
    public bool SortAutoTranslate;
    public bool CollapseDuplicateMessages;
    public bool CollapseKeepUniqueLinks;
+    public bool SymbolPickerEnabled = true;
    public bool PlaySounds = true;
    public bool KeepInputFocus = true;
    public int MaxLinesToRender = 2_500; // 1-10000
@@ -234,6 +271,7 @@ public class Configuration : IPluginConfiguration
        SortAutoTranslate = other.SortAutoTranslate;
        CollapseDuplicateMessages = other.CollapseDuplicateMessages;
        CollapseKeepUniqueLinks = other.CollapseKeepUniqueLinks;
+        SymbolPickerEnabled = other.SymbolPickerEnabled;
        PlaySounds = other.PlaySounds;
        KeepInputFocus = other.KeepInputFocus;
        MaxLinesToRender = other.MaxLinesToRender;
@@ -254,16 +292,20 @@ public class Configuration : IPluginConfiguration
        ColorSelectedInputChannelButton = other.ColorSelectedInputChannelButton;

        // Keep live temp tabs alive across UpdateFrom — a settings save must
-        // not destroy open tell conversations. For persistent tabs, capture
-        // the live MessageList and LastSendUnread by Identifier before the
-        // replace and restore them onto the freshly cloned tabs; new tabs
-        // get an empty MessageList, deleted tabs lose their history (intended).
-        var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList();
-        var livePersistentSession = Tabs.Where(t => !t.IsTempTab)
-            .ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread));
+        // not destroy open tell conversations. Pinned TempTabs are persistent
+        // and come through `other` like regular tabs; unpinned TempTabs are
+        // session-only and held from the local state. For persistent tabs
+        // (incl. pinned), capture live runtime state by Identifier and restore
+        // it onto the freshly cloned tabs — CurrentChannel is critical because
+        // the user may have switched channel in-game between settings-open
+        // and settings-save, and we'd otherwise overwrite that with the
+        // settings-time snapshot.
+        var liveUnpinnedTempTabs = Tabs.Where(TabLifecycleHelpers.IsInUnpinnedPool).ToList();
+        var livePersistentSession = Tabs.Where(t => !TabLifecycleHelpers.IsInUnpinnedPool(t))
+            .ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread, t.CurrentChannel));

        Tabs = other
-            .Tabs.Where(t => !t.IsTempTab)
+            .Tabs.Where(t => !t.IsTempTab || t.IsPinned)
            .Select(t =>
            {
                var clone = t.Clone();
@@ -271,11 +313,12 @@ public class Configuration : IPluginConfiguration
                {
                    clone.Messages = live.Messages;
                    clone.LastSendUnread = live.LastSendUnread;
+                    clone.CurrentChannel = live.CurrentChannel;
                }
                return clone;
            })
            .ToList();
-        Tabs.AddRange(liveTempTabs);
+        Tabs.AddRange(liveUnpinnedTempTabs);

        ChatTabForward = other.ChatTabForward;
        ChatTabBackward = other.ChatTabBackward;
@@ -295,6 +338,7 @@ public class Configuration : IPluginConfiguration
        FirstRunCompleted = other.FirstRunCompleted;
        UseHellionFont = other.UseHellionFont;
        ShowHonorificTitleInHeader = other.ShowHonorificTitleInHeader;
+        ShowHonorificGlow = other.ShowHonorificGlow;

        // v1.1.0 theme engine fields
        Theme = other.Theme;
@@ -306,6 +350,7 @@ public class Configuration : IPluginConfiguration
        AutoTellTabsLimit = other.AutoTellTabsLimit;
        AutoTellTabsCompactDisplay = other.AutoTellTabsCompactDisplay;
        AutoTellTabsHistoryPreload = other.AutoTellTabsHistoryPreload;
+        SidebarWidth = other.SidebarWidth;
        AutoTellTabsShowGreetedToggle = other.AutoTellTabsShowGreetedToggle;

        SeenPopOutInputHint = other.SeenPopOutInputHint;
@@ -380,6 +425,11 @@ public class Tab
    public bool HideWhenInactive;

    public bool IsTempTab;
+
+    // Pinned TempTabs survive plugin reload and logout — tester feedback from
+    // Jin (v1.4.7). Pinned tabs live in their own pool (MaxPinnedTempTabs)
+    // separate from the AutoTellTabsLimit bucket.
+    public bool IsPinned;
    public bool AllSenderMessages;
    public TellTarget TellTarget = TellTarget.Empty();

@@ -476,7 +526,7 @@ public class Tab
            Opacity = Opacity,
            Identifier = Identifier,
            InputDisabled = InputDisabled,
-            CurrentChannel = CurrentChannel,
+            CurrentChannel = CurrentChannel.Clone(),
            CanMove = CanMove,
            CanResize = CanResize,
            IndependentHide = IndependentHide,
@@ -487,8 +537,9 @@ public class Tab
            HideInBattle = HideInBattle,
            HideWhenInactive = HideWhenInactive,
            IsTempTab = IsTempTab,
+            IsPinned = IsPinned,
            AllSenderMessages = AllSenderMessages,
-            TellTarget = TellTarget.From(TellTarget),
+            TellTarget = TellTarget.Clone(),
            IsGreeted = IsGreeted,
        };
    }
@@ -666,6 +717,29 @@ public class UsedChannel
    {
        Channel = channel;
    }
+
+    // ---------------------------------------------------------------
+    // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
+    // - Deep-clone the UsedChannel so Tab.Clone() no longer shares
+    //   channel state (incl. TellTarget) with its origin Tab. Previously
+    //   a reference copy: PopOut and Temp tabs mutated each other.
+    // - Name is intentionally a reference copy (matches upstream); it
+    //   gets reassigned on every channel switch anyway.
+    // TEST-MIRROR: ../../Hellion Build test/_Helpers/UsedChannelCloneTests.cs
+    // ---------------------------------------------------------------
+    public UsedChannel Clone()
+    {
+        return new UsedChannel
+        {
+            Channel = Channel,
+            Name = Name,
+            TellTarget = TellTarget?.Clone(),
+
+            UseTempChannel = UseTempChannel,
+            TempChannel = TempChannel,
+            TempTellTarget = TempTellTarget?.Clone(),
+        };
+    }
 }

 [Serializable]
@@ -101,7 +101,10 @@ public static class EmoteCache
                t =>
                {
                    if (t.IsFaulted)
-                        Plugin.Log.Error(t.Exception!, $"EmoteCache load failed for {emoteCode}");
+                        Plugin.LogProxy.Error(
+                            t.Exception!,
+                            $"EmoteCache load failed for {emoteCode}"
+                        );
                },
                TaskScheduler.Default
            )
@@ -158,7 +161,7 @@ public static class EmoteCache
        {
            // Reset to Unloaded so a later trigger can retry without a plugin reload.
            State = LoadingState.Unloaded;
-            Plugin.Log.Error(ex, "BetterTTV cache wasn't initialized");
+            Plugin.LogProxy.Error(ex, "BetterTTV cache wasn't initialized");
        }
    }

@@ -214,7 +217,7 @@ public static class EmoteCache
        }
        catch
        {
-            Plugin.Log.Error("Failed to convert");
+            Plugin.LogProxy.Error("Failed to convert");
            return null;
        }
    }
@@ -304,7 +307,7 @@ public static class EmoteCache
            catch (Exception ex)
            {
                Failed = true;
-                Plugin.Log.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
+                Plugin.LogProxy.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
            }
        }

@@ -408,7 +411,7 @@ public static class EmoteCache
            catch (Exception ex)
            {
                Failed = true;
-                Plugin.Log.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
+                Plugin.LogProxy.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
            }
        }
    }
@@ -32,12 +32,8 @@ internal static class ExportFormatExt
        };
 }

-/// <summary>
-/// Serializes message snapshots into Markdown, JSON, or CSV. The caller is
-/// expected to filter the input enumerable; this class only handles
-/// formatting and writes to the supplied path. Sender substring filtering
-/// happens here because it requires deserialized SeString.TextValue.
-/// </summary>
+// Serializes message snapshots to Markdown, JSON, or CSV.
+// Caller handles pre-filtering except sender substring, which requires deserialized SeString.TextValue.
 internal static class MessageExporter
 {
    internal record FilterDescription(
@@ -100,6 +96,7 @@ internal static class MessageExporter
            var chatType = (ChatType)(ushort)m.Code.Type;
            var sender = m.SenderSource.TextValue.Trim().Trim('<', '>', '[', ']', ':').Trim();
            var content = m.ContentSource.TextValue;
+
            if (string.IsNullOrEmpty(sender))
                w.WriteLine($"**[{localDate:HH:mm}] {chatType}:** {content}");
            else
@@ -132,8 +129,7 @@ internal static class MessageExporter
        FilterDescription filter
    )
    {
-        // Manual JSON to avoid pulling in System.Text.Json policy choices.
-        // Output is a single object with metadata and an array of messages.
+        // Manual JSON to avoid System.Text.Json policy coupling.
        w.Write("{\n  \"exported_at\": \"");
        w.Write(DateTimeOffset.UtcNow.ToString("O", CultureInfo.InvariantCulture));
        w.Write("\",\n  \"plugin\": \"Hellion Chat\",\n");
@@ -194,7 +190,7 @@ internal static class MessageExporter
        FilterDescription filter
    )
    {
-        // Header line always written so empty exports are still importable.
+        // Header always written so empty exports remain importable.
        w.WriteLine("Date,ChatType,ChatTypeName,Sender,Content,Receiver,ContentId");
        var count = 0;
        foreach (var m in messages)
@@ -8,6 +8,9 @@ using Dalamud.Interface.Utility;

 namespace HellionChat;

+// Two LogProxy sites live in static methods (TryGetHellionFontBytes,
+// AddFontWithFallback); a ctor-injected ILogger would not be reachable
+// from those scopes, so the class stays on Plugin.LogProxy.
 public class FontManager
 {
    internal IFontHandle Axis = null!;
@@ -44,16 +47,26 @@ public class FontManager
    // Hellion font bytes (Exo 2, OFL-1.1); lazily loaded from manifest resources
    private static byte[]? HellionFontBytes;

-    private static byte[] GetHellionFontBytes()
+    // Returns null when the embedded font resource is missing. Should never
+    // happen on a signed release build, but a broken csproj or hand-rolled
+    // dev build can land here. Caller falls back to the system font path so
+    // the plugin still loads instead of crashing the whole UiBuilder.
+    private static byte[]? TryGetHellionFontBytes()
    {
        if (HellionFontBytes is not null)
            return HellionFontBytes;

-        using var stream =
-            typeof(FontManager).Assembly.GetManifestResourceStream("HellionFont.ttf")
-            ?? throw new FileNotFoundException(
-                "Hellion font resource not embedded in the assembly"
+        using var stream = typeof(FontManager).Assembly.GetManifestResourceStream(
+            "HellionFont.ttf"
+        );
+        if (stream is null)
+        {
+            Plugin.LogProxy.Warning(
+                "Hellion font resource missing — falling back to system default font."
            );
+            return null;
+        }
+
        using var ms = new MemoryStream();
        stream.CopyTo(ms);
        HellionFontBytes = ms.ToArray();
@@ -146,8 +159,11 @@ public class FontManager
                    ? 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")
+                // F10.2: if the embedded font is missing, drop to the system font
+                // path rather than letting the UiBuilder throw.
+                var hellionBytes = Plugin.Config.UseHellionFont ? TryGetHellionFontBytes() : null;
+                config.MergeFont = hellionBytes is not null
+                    ? tk.AddFontFromMemory(hellionBytes, config, "Hellion-Exo2")
                    : AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");

                config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
@@ -213,11 +229,21 @@ public class FontManager
            return fontId.AddToBuildToolkit(tk, config);
        }
        catch (Exception e)
-            when (e is FileNotFoundException or DirectoryNotFoundException or IOException)
+            when (e
+                    is FileNotFoundException
+                        or DirectoryNotFoundException
+                        or IOException
+                        or InvalidOperationException
+                        or ArgumentException
+            )
        {
-            Plugin.Log.Warning(
+            // Atlas-toolkit throws span IO and validation failures; routing
+            // the wider set through the fallback keeps a corrupt font config
+            // from taking down the whole atlas build.
+            Plugin.LogProxy.Warning(
                e,
-                $"Configured {slot} font unavailable, falling back to NotoSansCjkRegular"
+                $"Configured {slot} font failed to load ({e.GetType().Name}), "
+                    + "falling back to NotoSansCjkRegular"
            );
            var fallback = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular);
            return fallback.AddToBuildToolkit(tk, config);
@@ -19,6 +19,7 @@ using HellionChat.Resources;
 using HellionChat.Util;
 using InteropGenerator.Runtime;
 using Lumina.Text.ReadOnly;
+using Microsoft.Extensions.Logging;
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;

 namespace HellionChat.GameFunctions;
@@ -98,9 +99,12 @@ internal sealed unsafe class Chat : IDisposable
    private long LastPlayerNameDisplayTypeRefresh;
    private PlayerNameDisplayType CurrentPlayerNameDisplayType = PlayerNameDisplayType.FullName;

-    public Chat(Plugin plugin)
+    private readonly ILogger<Chat> _logger;
+
+    public Chat(Plugin plugin, ILogger<Chat> logger)
    {
        Plugin = plugin;
+        _logger = logger;
        Plugin.GameInteropProvider.InitializeFromAttributes(this);

        ChatLogRefreshHook?.Enable();
@@ -174,8 +178,7 @@ internal sealed unsafe class Chat : IDisposable
    internal static void RotateCrossLinkshellHistory(RotateMode mode) =>
        UIModule.Instance()->RotateCrossLinkshellHistory(GetRotateIdx(mode));

-    // This function looks up a channel's user-defined color.
-    // If this function ever returns 0, it returns null instead.
+    // Look up a channel's user-defined color, returns null if 0
    internal uint? GetChannelColor(ChatType type)
    {
        var parent = type.Parent();
@@ -215,8 +218,7 @@ internal sealed unsafe class Chat : IDisposable

        if (Plugin.Functions.KeybindManager.DirectChat && LastTypedCharacter != null)
        {
-            // FIXME: this whole system sucks
-            // FIXME v2: I hate everything about this, but it works
+            // Capture the just-typed character input
            Plugin.Framework.RunOnTick(() =>
            {
                string? input = null;
@@ -238,7 +240,7 @@ internal sealed unsafe class Chat : IDisposable
                }
                catch (Exception ex)
                {
-                    Plugin.Log.Error(ex, "Error in chat Activated event");
+                    _logger.LogError(ex, "Error in chat Activated event");
                }
            });
        }
@@ -255,13 +257,9 @@ internal sealed unsafe class Chat : IDisposable

        try
        {
-            // We already called this function once, so we skip the duplicated call
-            // Also return the original value here so that vanilla chat receives all information
+            // Prevent duplicate calls
            if (Plugin.ChatLogWindow.TellSpecial)
-            {
-                Plugin.Log.Information("Return early to prevent duplicated call...");
                return ChatLogRefreshHook!.Original(log, eventId, value);
-            }

            Plugin.ChatLogWindow.Activated(
                new ChatActivatedArgs(new ChannelSwitchInfo(null))
@@ -272,11 +270,10 @@ internal sealed unsafe class Chat : IDisposable
        }
        catch (Exception ex)
        {
-            Plugin.Log.Error(ex, "Error in chat Activated event");
+            _logger.LogError(ex, "Error in chat Activated event");
        }

-        // prevent the game from focusing the chat log
-        return 1;
+        return 1; // Prevent vanilla chat log from gaining focus
    }

    private CStringPointer ChangeChannelNameDetour(AgentChatLog* agent)
@@ -306,7 +303,7 @@ internal sealed unsafe class Chat : IDisposable
        {
            playerName = SeString.Parse(agent->TellPlayerName).TextValue;
            worldId = agent->TellWorldId;
-            Plugin.Log.Debug($"Detected tell target '[redacted]'@{worldId}");
+            _logger.LogDebug($"Detected tell target '[redacted]'@{worldId}");
        }

        Plugin.CurrentTab.CurrentChannel = new UsedChannel
@@ -365,7 +362,7 @@ internal sealed unsafe class Chat : IDisposable
            }
            catch (Exception ex)
            {
-                Plugin.Log.Error(ex, "Error in chat Activated event");
+                _logger.LogError(ex, "Error in chat Activated event");
            }
        }

@@ -415,7 +412,7 @@ internal sealed unsafe class Chat : IDisposable
            }
            catch (Exception ex)
            {
-                Plugin.Log.Error(ex, "Error in chat Activated event");
+                _logger.LogError(ex, "Error in chat Activated event");
            }
        }

@@ -430,19 +427,24 @@ internal sealed unsafe class Chat : IDisposable
        );
    }

-    /// <summary>
-    /// Returns true if the channel is any non-linkshell channel, or if the
-    /// linkshell actually exists.
-    /// </summary>
-    internal static bool ValidAnyLinkshell(InputChannel channel)
+    // ---------------------------------------------------------------
+    // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
+    // - Renamed ValidAnyLinkshell -> IsChannelOrExistingLinkshell. The
+    //   name now states intent: returns true for any non-linkshell
+    //   channel, or a linkshell index that actually exists.
+    // ---------------------------------------------------------------
+    internal static bool IsChannelOrExistingLinkshell(InputChannel channel)
    {
        var idx = channel.LinkshellIndex();
        if (idx == uint.MaxValue || channel.IsExtraChatLinkshell())
            return true;
-        if (channel.IsLinkshell() && ValidLinkshell(idx))
-            return true;
-        if (channel.IsCrossLinkshell() && ValidCrossLinkshell(idx))
-            return true;
+
+        if (channel.IsLinkshell())
+            return ValidLinkshell(idx);
+
+        if (channel.IsCrossLinkshell())
+            return ValidCrossLinkshell(idx);
+
        return false;
    }

@@ -477,8 +479,7 @@ internal sealed unsafe class Chat : IDisposable
            _ => 1,
        };

-        // Iterate up to 8 times to find a valid linkshell.
-        for (var i = 0; i < 8; i++)
+        for (var i = 0; i < 8; i++) // Find valid linkshell within 8 iterations
        {
            currentIndex = (uint)((8 + currentIndex + delta) % 8);
            if (validFn(currentIndex))
@@ -524,7 +525,7 @@ internal sealed unsafe class Chat : IDisposable
                );
                // 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;
+                return idx is null ? null : channel + idx.Value; // null if not found, otherwise new channel
            }
            default:
                return channel;
@@ -533,11 +534,7 @@ internal sealed unsafe class Chat : IDisposable

    internal void SetChannel(InputChannel channel, TellTarget? tellTarget = null)
    {
-        // ExtraChat linkshells aren't supported in game so we never want to
-        // call the ChangeChatChannel function with them.
-        //
-        // Callers should call ChatLogWindow.SetChannel() which handles
-        // ExtraChat channels
+        // Ignore ExtraChat linkshells (use ChatLogWindow.SetChannel() instead)
        if (channel.IsExtraChatLinkshell())
            return;

@@ -546,12 +543,17 @@ internal sealed unsafe class Chat : IDisposable
        if (idx == uint.MaxValue)
            idx = 0;

-        if (!ValidAnyLinkshell(channel))
-            return;
+        // ---------------------------------------------------------------
+        // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
+        // - Wrap ChangeChatChannel in the validity check instead of
+        //   early-returning. The previous early return skipped Dtor and
+        //   leaked the native Utf8String allocated a few lines above.
+        // ---------------------------------------------------------------
+        if (IsChannelOrExistingLinkshell(channel))
+            RaptureShellModule
+                .Instance()
+                ->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true);

-        RaptureShellModule
-            .Instance()
-            ->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true);
        target->Dtor(true);
    }

@@ -565,9 +567,6 @@ internal sealed unsafe class Chat : IDisposable
        bool setChatType
    )
    {
-        // param6 is 0 for contentId and 1 for objectId
-        // param7 is always 0 ?
-
        if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel)
            Plugin.CurrentTab.CurrentChannel.UseTempChannel = true;

@@ -629,7 +628,7 @@ internal sealed unsafe class Chat : IDisposable
        if (contentId == 0)
        {
            Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);
-            Plugin.Log.Warning(
+            _logger.LogWarning(
                "Tried to send a tell with ContentId being 0, sorry this is an internal error."
            );
            return;
@@ -742,10 +741,7 @@ internal sealed unsafe class Chat : IDisposable

    internal bool CheckHideFlags()
    {
-        // Only hide the chat in a cutscene when the vanilla chat would've
-        // also been hidden. This prevents Chat 2 from hiding for a split
-        // second before the cutscene actually starts, because the game sets
-        // the cutscene conditions before processing the skip.
+        // Only hide chat in cutscene when vanilla chat would also be hidden
        var raptureAtkUnitManager = RaptureAtkUnitManager.Instance();
        return raptureAtkUnitManager == null
            || raptureAtkUnitManager->UiFlags.HasFlag(UiFlags.Chat);
@@ -15,17 +15,10 @@ public unsafe class ChatBox
        mes->Dtor(true);
    }

-    public static void SendMessage(string message)
-    {
-        var bytes = ValidateMessage(message);
-        SendMessageUnsafe(bytes);
-    }
+    public static void SendMessage(string message) => SendMessageUnsafe(ValidateMessage(message));

-    // 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.
+    // sanitiserOverride allows xUnit to bypass Utf8String->SanitizeString (game memory only).
+    // Returns encoded bytes so SendMessage avoids a second GetBytes call.
    // TEST-MIRROR: ../../../Hellion Build test/GameFunctions/ChatBoxTests.cs
    internal static byte[] ValidateMessage(
        string message,
@@ -49,11 +42,9 @@ public unsafe class ChatBox
    private static string SanitiseText(string text)
    {
        var uText = Utf8String.FromString(text);
-
        uText->SanitizeString((AllowedEntities)0x27F);
        var sanitised = uText->ToString();
        uText->Dtor(true);
-
        return sanitised;
    }
 }
@@ -14,6 +14,7 @@ using FFXIVClientStructs.FFXIV.Client.UI.Info;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using Lumina.Excel;
 using Lumina.Excel.Sheets;
+using Microsoft.Extensions.Logging;
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;

 namespace HellionChat.GameFunctions;
@@ -37,17 +38,22 @@ internal unsafe class GameFunctions : IDisposable
    #endregion

    private Plugin Plugin { get; }
+    private readonly ILogger<GameFunctions> _logger;
    internal KeybindManager KeybindManager { get; }
    internal Chat Chat { get; }

-    internal GameFunctions(Plugin plugin)
+    internal GameFunctions(
+        Plugin plugin,
+        ILogger<GameFunctions> logger,
+        ILoggerFactory loggerFactory
+    )
    {
        Plugin = plugin;
-        KeybindManager = new KeybindManager(plugin);
-        Chat = new Chat(Plugin);
+        _logger = logger;
+        KeybindManager = new KeybindManager(plugin, loggerFactory.CreateLogger<KeybindManager>());
+        Chat = new Chat(Plugin, loggerFactory.CreateLogger<Chat>());

        Plugin.GameInteropProvider.InitializeFromAttributes(this);
-
        ResolveTextCommandPlaceholderHook?.Enable();
    }

@@ -55,36 +61,24 @@ internal unsafe class GameFunctions : IDisposable
    {
        Chat.Dispose();
        KeybindManager.Dispose();
-
        ResolveTextCommandPlaceholderHook?.Dispose();
-
        Marshal.FreeHGlobal(PlaceholderNamePtr);
    }

-    internal void SendFriendRequest(string name, ushort world)
-    {
+    internal void SendFriendRequest(string name, ushort world) =>
        ListCommand(name, world, "friendlist");
-    }

-    internal void AddToBlacklist(string name, ushort world)
-    {
-        ListCommand(name, world, "blist");
-    }
+    internal void AddToBlacklist(string name, ushort world) => ListCommand(name, world, "blist");

-    internal void AddToMuteList(ulong accountId, ulong contentId, string name, short worldId)
-    {
+    internal void AddToMuteList(ulong accountId, ulong contentId, string name, short worldId) =>
        AgentMutelist.Instance()->Add(accountId, contentId, name, worldId);
-    }

-    internal void AddToTermsList(SeString content)
-    {
+    internal void AddToTermsList(SeString content) =>
        AgentTermFilter.Instance()->OpenNewFilterWindow(content.EncodeWithNullTerminator());
-    }

    private void ListCommand(string name, ushort world, string commandName)
    {
        var worldRow = Sheets.WorldSheet.GetRow(world);
-
        ReplacementName = $"{name}@{worldRow.Name.ToString()}";
        ChatBox.SendMessage($"/{commandName} add {Placeholder}");
    }
@@ -108,7 +102,6 @@ internal unsafe class GameFunctions : IDisposable
    {
        for (var i = 0; i < 4; i++)
            SetAddonInteractable($"ChatLogPanel_{i}", interactable);
-
        SetAddonInteractable("ChatLog", interactable);
    }

@@ -124,7 +117,6 @@ internal unsafe class GameFunctions : IDisposable
        var agent = AgentItemDetail.Instance();
        var addon = GetAddon<AtkUnitBase>("ItemDetail");

-        // atkStage ain't gonna be null or we have bigger problems
        if (agent == null || addon == null)
            return;

@@ -133,23 +125,19 @@ internal unsafe class GameFunctions : IDisposable
        agent->Index = 0;
        agent->Flag1 &= 0xEF;
        agent->ItemId = id;
-        // agent->Flag2 = 1;
-        // agent->Flag3 = 0;
-        // TODO: Revert whenever CS is merged
+
+        // TODO: Revert when CS offset lands in a release build.
        *(byte*)((nint)agent + 0x21A) = 1;
        *(byte*)((nint)agent + 0x21E) = 0;

-        // This just probably needs to be set
        agent->AddonId = addon->Id;
-
-        // Skips early return
        atkStage->TooltipManager.TooltipType |= 2;
        addon->Show(false, 15);
    }

    internal static void CloseItemTooltip()
    {
-        // hide addon first to prevent the "addon close" sound
+        // Hide addon first to suppress the "addon close" sound.
        var addon = GetAddon<AtkUnitBase>("ItemDetail");
        if (addon != null)
            addon->Hide(true, false, 0);
@@ -167,7 +155,7 @@ internal unsafe class GameFunctions : IDisposable

    internal static void OpenPartyFinder()
    {
-        // this whole method: 6.05: 84433A (FF 97 ?? ?? ?? ?? 41 B4 01)
+        // 6.05: 84433A (FF 97 ?? ?? ?? ?? 41 B4 01)
        var lfg = AgentLookingForGroup.Instance();
        if (lfg->IsAgentActive())
        {
@@ -188,15 +176,10 @@ internal unsafe class GameFunctions : IDisposable
        }
    }

-    internal static bool IsMentor()
-    {
-        return PlayerState.Instance()->IsMentor();
-    }
+    internal static bool IsMentor() => PlayerState.Instance()->IsMentor();

-    internal static InfoProxyCommonList.CharacterData[] GetFriends()
-    {
-        return InfoProxyFriendList.Instance()->CharDataSpan.ToArray();
-    }
+    internal static InfoProxyCommonList.CharacterData[] GetFriends() =>
+        InfoProxyFriendList.Instance()->CharDataSpan.ToArray();

    internal static void OpenQuestLog(RowRef<Quest> quest)
    {
@@ -223,20 +206,12 @@ internal unsafe class GameFunctions : IDisposable
        AgentQuestJournal.Instance()->OpenForQuest(questId, 1);
    }

-    internal static void OpenPartyFinder(uint id)
-    {
+    internal static void OpenPartyFinder(uint id) =>
        AgentLookingForGroup.Instance()->OpenListing(id);
-    }

-    internal static void OpenAchievement(uint id)
-    {
-        AgentAchievement.Instance()->OpenById(id);
-    }
+    internal static void OpenAchievement(uint id) => AgentAchievement.Instance()->OpenById(id);

-    internal static bool IsInInstance()
-    {
-        return Plugin.Condition[ConditionFlag.BoundByDuty56];
-    }
+    internal static bool IsInInstance() => Plugin.Condition[ConditionFlag.BoundByDuty56];

    internal static bool TryOpenAdventurerPlate(ulong playerId)
    {
@@ -247,7 +222,8 @@ internal unsafe class GameFunctions : IDisposable
        }
        catch (Exception e)
        {
-            Plugin.Log.Warning(e, "Unable to open adventurer plate");
+            // Static method, no instance _logger reachable here.
+            Plugin.LogProxy.Warning(e, "Unable to open adventurer plate");
            return false;
        }
    }
@@ -255,8 +231,7 @@ internal unsafe class GameFunctions : IDisposable
    internal static void ClickNoviceNetworkButton()
    {
        var agent = AgentChatLog.Instance();
-        // case 3
-        var value = new AtkValue { Type = ValueType.Int, Int = 3 };
+        var value = new AtkValue { Type = ValueType.Int, Int = 3 }; // case 3
        var result = 0;
        var vf0 = *(delegate* unmanaged<AgentChatLog*, int*, AtkValue*, ulong, ulong, int*>*)
            agent->VirtualTable;
@@ -275,9 +250,8 @@ internal unsafe class GameFunctions : IDisposable
        byte a4
    )
    {
-        // The detour is only invoked through the hook, so the hook should
-        // never be null here, but the nullable field declaration forces us
-        // to handle the theoretical race during teardown.
+        // Hook field is nullable due to the Signature attribute, but will never
+        // be null during normal execution; guard covers the teardown race only.
        if (ResolveTextCommandPlaceholderHook is null)
            return nint.Zero;

@@ -285,13 +259,11 @@ 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.
+        // Guard against a malformed ReplacementName overflowing the 128-byte buffer.
        var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
        if (byteCount >= PlaceholderBufferSize)
        {
-            Plugin.Log.Warning(
+            _logger.LogWarning(
                $"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original."
            );
            ReplacementName = null;
@@ -300,7 +272,6 @@ internal unsafe class GameFunctions : IDisposable

        MemoryHelper.WriteString(PlaceholderNamePtr, ReplacementName);
        ReplacementName = null;
-
        return PlaceholderNamePtr;
    }
 }
@@ -8,6 +8,7 @@ using FFXIVClientStructs.FFXIV.Client.UI;
 using HellionChat.Code;
 using HellionChat.GameFunctions.Types;
 using HellionChat.Util;
+using Microsoft.Extensions.Logging;
 using ModifierFlag = HellionChat.GameFunctions.Types.ModifierFlag;

 namespace HellionChat.GameFunctions;
@@ -306,9 +307,12 @@ internal unsafe class KeybindManager : IDisposable
        // VirtualKey.OEM_CLEAR,
    };

-    internal KeybindManager(Plugin plugin)
+    private readonly ILogger<KeybindManager> _logger;
+
+    internal KeybindManager(Plugin plugin, ILogger<KeybindManager> logger)
    {
        Plugin = plugin;
+        _logger = logger;
        Plugin.GameInteropProvider.InitializeFromAttributes(this);

        // Handle keybinds from the game on every tick.
@@ -507,7 +511,7 @@ internal unsafe class KeybindManager : IDisposable
        }
        catch (Exception ex)
        {
-            Plugin.Log.Error(ex, "Error in chat Activated event");
+            _logger.LogError(ex, "Error in chat Activated event");
        }
    }

@@ -40,5 +40,11 @@ public class TellTarget

    public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct);

-    public static TellTarget From(TellTarget t) => new(t.Name, t.World, t.ContentId, t.Reason);
+    // ---------------------------------------------------------------
+    // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
+    // - Replaced static From(t) with an instance-style Clone() so call
+    //   sites read like a copy operation, not a factory.
+    // TEST-MIRROR: ../../../Hellion Build test/_Helpers/TellTargetCloneTests.cs
+    // ---------------------------------------------------------------
+    public TellTarget Clone() => new(Name, World, ContentId, Reason);
 }
@@ -1,7 +1,7 @@
 <Project Sdk="Dalamud.NET.Sdk/15.0.0">
    <PropertyGroup>
        <!-- Independent versioning; see yaml changelog for upstream Chat 2 base -->
-        <Version>1.4.3</Version>
+        <Version>1.5.0</Version>
        <ImplicitUsings>enable</ImplicitUsings>
        <Nullable>enable</Nullable>
        <!-- Use lock file to pin exact versions -->
@@ -15,6 +15,14 @@
        <!-- Closed ranges prevent surprise major bumps during lock file regeneration -->
        <PackageReference Include="MessagePack" Version="[3.1.4, 4.0.0)" />
        <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
+        <!-- v1.5.0 DI-container foundation; matches Lightless pin (Hosting 10.0.7) -->
+        <PackageReference
+            Include="Microsoft.Extensions.DependencyInjection"
+            Version="[10.0.7, 11.0.0)"
+        />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="[10.0.7, 11.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="[10.0.7, 11.0.0)" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="[10.0.7, 11.0.0)" />
        <!-- SQLitePCLRaw override for CVE-2025-6965, CVE-2025-7709 (SQLite >= 3.50.3) -->
        <PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="3.50.3" />
        <PackageReference Include="morelinq" Version="4.4.0" />
@@ -1,57 +1,26 @@
 name: Hellion Chat
-author: JonKazama-Hellion
-punchline: Chat replacement with privacy controls aligned to EU, US and JP rules — based on Chat 2 (EUPL-1.2)
+author: Jon Kazama (Hellion Forge)
+punchline: A Hellion Forge plugin — privacy-focused chat replacement for FFXIV, built for EU, US and JP data rules.
 description: |-
-    Hellion Chat is a privacy-focused chat replacement for FINAL FANTASY XIV
-    based on the Chat 2 codebase (EUPL-1.2). One feature is intentionally
-    removed (the optional webinterface) and a stack of privacy controls is
-    added on top. Tabs, channel filters, RGB colours, emotes, screenshot
-    mode, IPC integration and the chat replacement window itself work the
-    same. The webinterface is intentionally not part of Hellion Chat because
-    it serves a different use case from the smaller default footprint this
-    plugin is built around.
+    Chat replacement for FINAL FANTASY XIV with privacy controls built around
+    EU, US and JP data-protection rules.

-    On top of that, Hellion Chat adds privacy and data-handling controls
-    designed to align with the modern data protection rules that apply
-    across the EU, the United States and Japan. By default only your own
-    conversations are stored; messages from strangers, NPCs and system
-    spam stay out of the database. Retention windows are configurable per
-    channel, history can be wiped retroactively, and stored data can be
-    exported on demand.
-
-    Key privacy and data-handling features:
+    By default only your own conversations are stored. Public chat, NPC
+    dialogue and system messages stay out of the database unless you opt in.
+    Retention windows are configurable per channel, history can be wiped
+    retroactively, and everything can be exported on demand.

+    Features:
    - Channel whitelist with a Privacy-First default
    - Per-channel retention with a daily background sweep
-    - Retroactive cleanup with a Ctrl+Shift confirm
+    - Retroactive cleanup (Ctrl+Shift confirm)
    - Export to Markdown, JSON or CSV
-    - First-run wizard with three preset profiles (Privacy-First, Casual,
-      Full History)
-    - Bilingual UI (English and German) with live language switching
-    - Independent plugin state — own config file and database directory,
-      so Hellion Chat does not share state with upstream Chat 2
+    - First-run wizard with three preset profiles
+    - Bilingual UI (EN/DE) with live language switching
+    - Own config and database — no shared state with other plugins

-    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.
+    Based on Chat 2 by Infi and Anna (EUPL-1.2).
+    Support: https://discord.gg/X9V7Kcv5gR
 repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat
 accepts_feedback: true
 icon_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png
@@ -66,104 +35,168 @@ tags:
    - Replacement
    - Privacy
 changelog: |-
-    **Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover (2026-05-08)**
+    **v1.5.0 — DI Foundation and Service Refactor (2026-05-17)**

-    Plugin lifecycle migrated to Dalamud's `IAsyncDalamudPlugin`
-    API. The constructor now does only the bootstrap-essentials
-    (config load, language init, conflict detection); migrations,
-    service allocations, window construction and hook subscription
-    move to LoadAsync. Dalamud can keep its UI responsive while the
-    heavy work runs.
+    Major architecture cycle. The plugin bootstrap moves to a
+    generic-host DI container (Microsoft.Extensions.Hosting +
+    IServiceCollection) modelled on Lightless Sync. Service logging
+    moves from a static Plugin.LogProxy locator to typed
+    Microsoft.Extensions.Logging.ILogger<T> via constructor injection,
+    bridged over Dalamud's IPluginLog by a custom DalamudLogger trio.

-    - IAsyncDalamudPlugin two-phase load with per-line CaptureFailure
-      in DisposeAsync (mirrors LightlessSync's pattern); idempotency
-      guard protects against reload races
-    - Schema-gate replaces the v9 → v16 migration chain. Configs
-      on schema v16+ load directly; older configs trigger an
-      "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
+    What changes under the hood:

-    Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
+    - 18 instance-class services migrate to ILogger<T> via constructor
+      injection across four slices: data layer (MessageStore,
+      MessageManager, AutoTellTabsService), IPC and integrations
+      (HonorificService, IpcManager, TypingIpc, ExtraChat, the three
+      GameFunctions classes), UI window layer (ChatLogWindow,
+      DbViewer, Popout, three settings tabs), and root (Commands,
+      ThemeRegistry, PayloadHandler).
+    - Plugin.LogProxy stays in place for the eight buckets ctor
+      injection cannot reach: static helpers (EmoteCache,
+      AutoTranslate, MemoryUtil, WrapperUtil), Dalamud-reflected
+      types (Configuration), the Message data class, and instance
+      classes that only log from static methods (FontManager, one
+      GameFunctions site).
+    - Plugin.cs finishes at 1012 lines — virtually identical to the
+      pre-cycle 1013. The new Phase-1 host build and Plugin.X bridge
+      wiring trade out exactly the service and window allocations
+      that previously lived in LoadAsync.
+    - Cross-plugin baseline confirms no performance penalty against
+      Chat 2: HellionChat first-frame HITCH 77 ms median, Chat 2
+      74 ms median. Lightless and XIVInstantMessenger sit around
+      7 ms by deferring their font-atlas build past Finished
+      loading — that pattern is the v1.5.1 follow-up.

-    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+    User-visible:

-    **Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
+    - Slash-command insert fix: pasting a slash command into the
+      chat input (Friend List "/tell" action, plugin-driven inserts
+      from Artisan, AllaganTools etc.) now replaces the existing
+      input instead of concatenating. Cherry-picked from ChatTwo
+      upstream ee7768ac with namespace adaptation.

-    Third sub-patch of the v1.4.x Polish Sweep series. Per-frame
-    allocations from the chat-log render path eliminated.
-
-    - DrawMessages card-mode hoists theme/drawList/winLeft/winRight/
-      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
-
-    Realistic frame-time recovery: 2-5% in typical scenes, more
-    on pop-out-heavy setups because the card-border hoist scales
-    per window.
-
-    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.4.1 — Theme Engine Performance**
-
-    Second sub-patch of the v1.4.x Polish Sweep series. Heap
-    pressure from the theme engine's per-frame render path
-    removed, plus a tenth built-in theme and hardening for
-    the custom-theme hot-reload.
-
-    - 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
-
-    No schema bump, no user-visible behaviour change other
-    than smoother frames on GC-sensitive setups and one
-    additional colour option.
-
-    Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
+    Migration v17 stays (no schema bump).

    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).

    ---

-    Earlier history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
+    **v1.4.10 — Symbol-Picker and Tell-History Fix (2026-05-16)**
+
+    Eleventh and final sub-patch of the v1.4.x polish-sweep series.
+    Symbol picker for the chat input, a tell-history reload fix for
+    users with many active partners, and a closing cleanup sweep
+    before v1.5.0 picks up the DI-container adoption.
+
+    - Symbol picker: a small smile-icon button left of the channel
+      indicator opens a popup with two tabs. The first lists all 161
+      FFXIV PUA glyphs (Dalamud's SeIconChar enum); the second
+      carries 97 server-verified BMP symbols (latin marks, currency,
+      the full Greek alphabet, geometric shapes, suits, notes) —
+      every one of them round-tripped through /echo and /say in a
+      four-round probe so the in-channel render matches what the
+      picker shows. Click drops the glyph at the caret, multi-insert
+      keeps the popup open, and a recent-used strip floats the last
+      sixteen picks across both tabs. Toggle in Settings → Chat →
+      Message behaviour, default on.
+    - Pinned auto-tell tabs reload their full history again: a
+      hidden 500-row scan cap in PreloadHistory used to override the
+      user-configurable AutoTellTabsHistoryPreload setting, so
+      less-frequent pinned partners (rare /tell sessions in an
+      otherwise busy week) lost their backlog. The cap is removed;
+      the (Receiver, Date) index keeps SQL fast, the client-side
+      loop still respects your setting as the upper bound.
+    - Slash-command teardown: /hellion, /hellionView,
+      /hellionDebugger (and #if DEBUG /hellionSeString) wrappers are
+      now cached as private fields. Plugin teardown detaches the
+      live registration instead of re-Register'ing with identical
+      args — closes a latent maintenance hazard from v1.4.9.
+    - v1.4.x polish-sweep wraps up here. The ImGuiListClipper render
+      refactor that was on the v1.4.10 reserve list got dropped
+      after cross-platform smoke showed the scroll rubber-band is a
+      Wine / Linux render-pipeline quirk, not universal — Windows
+      users never saw it. It will get its own platform-targeted
+      spike in a later patch. Next major cycle is v1.5.0 with the
+      DI-container adoption (Microsoft.Extensions.Hosting +
+      ILogger<T>) modelled on Lightless.
+    - Migration v17 stays (no schema bump).
+
+    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+    ---
+
+    **v1.4.9 — Plugin-Load Render Polish (2026-05-15)**
+
+    Tenth sub-patch of the v1.4.x polish-sweep series. First-frame
+    render cost drops from ~127 ms median to ~76 ms median,
+    comfortably under Dalamud's 100 ms HITCH warning threshold.
+
+    - First-frame defer: six non-essential rendering sections inside
+      ChatLogWindow skip their first Draw and run one frame later
+      (bottom status bar, channel-name SeString chunks, window bounds
+      check, v0.6.1 hint banner, autocomplete, input-preview
+      calculation). User-visible delay is ~17 ms at 60 fps, hidden
+      inside the post-reload font-atlas build window.
+    - Slash-command centralisation: /hellion, /hellionView,
+      /hellionSeString and /hellionDebugger are registered in
+      LoadAsync instead of inside the corresponding window
+      constructors. The plugin-manager Open and configuration buttons
+      hang on the same path.
+    - Plugin-load profiling logs stay on at Information level
+      (MessageStore connect/migrate, FilterAllTabs, auto-translate
+      warmup) as a regression tripwire — a future load past 100 ms
+      will show up in /xllog without a Debug filter.
+    - ChatTwo IPC compatibility layer: HellionChat now mirrors
+      ChatTwo's full IPC surface (GetChatInputState,
+      ChatInputStateChanged, Register, Unregister, Available,
+      Invoke) under the ChatTwo.* namespace in addition to our
+      existing HellionChat.* provider gates. Third-party
+      integrations that historically only subscribe to ChatTwo's
+      IPC — for example Artisan's and AllaganTools' context-menu
+      hooks — keep working without requiring a code change on their
+      side. Conflict detection prevents ChatTwo from loading in
+      parallel with HellionChat, so there is no slot-collision risk
+      at runtime.
+    - Migration v17 stays (no schema bump).
+
+    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+    ---
+
+    **v1.4.8 — Hook-Layer and Polish Quick-Wins (2026-05-14)**
+
+    Ninth sub-patch of the v1.4.x polish-sweep series. Hook-layer
+    cluster (DbViewer FTS5 full-text search, ad-block foundation
+    investigation) plus three polish quick-wins.
+
+    - DbViewer full-text search: optional FTS5 index across the full
+      chat history. Built asynchronously on first load after the
+      update with a progress toast. The local page-filter remains
+      available as the default mode. Queries match as exact phrases
+      -- multi-word terms must appear together in order; advanced
+      users can opt into raw FTS5 MATCH syntax by wrapping their own
+      double-quotes.
+    - Custom theme files now auto-reload when edited while the theme
+      is active -- no need to re-click the theme in the picker.
+    - Retention sweep no longer blocks the framework thread, removing
+      the ~194ms mini-hitch per sweep.
+    - Status bar renders correctly at Windows display scaling > 100%.
+    - Receive-suppressed-tells routing investigated this cycle and
+      postponed to v1.5.x: when other plugins suppress tells via
+      CheckMessageHandled, the FFXIV chat pipeline skips the
+      RaptureLogModule.AddMsgSourceEntry path so HellionChat's
+      ContentIdResolverHook does not fire and tell-partner
+      identification breaks. The fix belongs next to the planned
+      ad-block hook layer where the same patch surface comes up.
+    - Internal: messages.Id is declared BLOB but stored as TEXT
+      (Microsoft.Data.Sqlite Guid binding). FTS bulk insert and
+      LoadByGuids match the TEXT storage form on both sides.
+      Migration v17 stays (no schema bump).
+
+    Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+    ---
+
+    Full history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
@@ -0,0 +1,98 @@
+using Dalamud.Plugin;
+using HellionChat.Ipc;
+using HellionChat.Themes;
+using Microsoft.Extensions.Hosting;
+
+namespace HellionChat.Infrastructure.Hosting;
+
+// Adapter shells around IHostedService so the host triggers each service's
+// existing init method without touching the service class itself. Empty
+// adapters still earn their place: registering them forces an eager resolve
+// at Build, which runs the service ctor (IPC subscribe etc.) right then
+// instead of lazily on first GetRequiredService.
+
+internal sealed class FontManagerInitHostedService(FontManager fontManager) : IHostedService
+{
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        fontManager.BuildFonts();
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
+
+internal sealed class ThemeRegistryInitHostedService(ThemeRegistry registry) : IHostedService
+{
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        // Materialise the lazy AllCustom enumerable so the slug lookup hits a
+        // warm cache; otherwise the first Switch falls through to the built-in
+        // default when Config.Theme points at a custom slug.
+        foreach (var _ in registry.AllCustom()) { }
+        registry.Switch(Plugin.Config.Theme);
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
+
+// IPC subscribers do their wiring in the ctor, so StartAsync stays empty —
+// the registration alone forces an eager resolve which runs that wiring.
+
+internal sealed class IpcManagerInitHostedService(IpcManager ipc) : IHostedService
+{
+    private readonly IpcManager _ipc = ipc;
+
+    public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
+
+internal sealed class TypingIpcInitHostedService(TypingIpc typingIpc) : IHostedService
+{
+    private readonly TypingIpc _typingIpc = typingIpc;
+
+    public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
+
+internal sealed class ExtraChatInitHostedService(ExtraChat extraChat) : IHostedService
+{
+    private readonly ExtraChat _extraChat = extraChat;
+
+    public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
+
+internal sealed class MessageManagerInitHostedService(
+    IDalamudPluginInterface pluginInterface,
+    MessageManager manager
+) : IHostedService
+{
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        // FilterAllTabsAsync rebuilds the per-tab view from the message store;
+        // on Boot, tabs come up empty and the first chat events fill them, so
+        // we skip the rebuild to avoid a pointless full-history scan.
+        if (pluginInterface.Reason is not PluginLoadReason.Boot)
+            manager.FilterAllTabsAsync();
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
+
+internal sealed class AutoTellTabsServiceInitHostedService(AutoTellTabsService service)
+    : IHostedService
+{
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        service.Initialize();
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
@@ -0,0 +1,64 @@
+using System.Text;
+using Dalamud.Plugin.Services;
+using Microsoft.Extensions.Logging;
+
+namespace HellionChat.Infrastructure.Logging;
+
+internal sealed class DalamudLogger : ILogger
+{
+    private readonly string _name;
+    private readonly IPluginLog _pluginLog;
+
+    public DalamudLogger(string name, IPluginLog pluginLog)
+    {
+        _name = name;
+        _pluginLog = pluginLog;
+    }
+
+    IDisposable? ILogger.BeginScope<TState>(TState state) => default!;
+
+    // Filtering happens in Dalamud's /xllog. Letting every level through keeps
+    // the HellionChat side stateless; if we ever want a per-plugin floor we add
+    // a Config.LogLevel and tighten this method.
+    public bool IsEnabled(LogLevel logLevel) => true;
+
+    public void Log<TState>(
+        LogLevel logLevel,
+        EventId eventId,
+        TState state,
+        Exception? exception,
+        Func<TState, Exception?, string> formatter
+    )
+    {
+        if (!IsEnabled(logLevel))
+            return;
+
+        // U+200B between the bracket and the level is a quiet provenance
+        // marker; byte-distinguishable from any 1:1 port of this format.
+        if ((int)logLevel <= (int)LogLevel.Information)
+        {
+            _pluginLog.Information($"[{_name}]{{{(int)logLevel}}} {state}");
+            return;
+        }
+
+        var sb = new StringBuilder();
+        sb.Append($"[{_name}]{{{(int)logLevel}}} {state} {exception?.Message}");
+        if (!string.IsNullOrWhiteSpace(exception?.StackTrace))
+            sb.AppendLine(exception.StackTrace);
+
+        var inner = exception?.InnerException;
+        while (inner != null)
+        {
+            sb.AppendLine($"InnerException {inner}: {inner.Message}");
+            sb.AppendLine(inner.StackTrace);
+            inner = inner.InnerException;
+        }
+
+        if (logLevel == LogLevel.Warning)
+            _pluginLog.Warning(sb.ToString());
+        else if (logLevel == LogLevel.Error)
+            _pluginLog.Error(sb.ToString());
+        else
+            _pluginLog.Fatal(sb.ToString());
+    }
+}
@@ -0,0 +1,73 @@
+using System.Collections.Concurrent;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Text;
+using Dalamud.Plugin.Services;
+using Microsoft.Extensions.Logging;
+
+namespace HellionChat.Infrastructure.Logging;
+
+[ProviderAlias("Dalamud")]
+public sealed class DalamudLoggingProvider : ILoggerProvider
+{
+    // Hellion Forge Bronze (#C2410C). Mixed into the bootstrap fingerprint.
+    private const string HellionMarker = "HellionForgeBronzeC2410C";
+
+    private readonly ConcurrentDictionary<string, DalamudLogger> _loggers = new(
+        StringComparer.OrdinalIgnoreCase
+    );
+
+    private readonly IPluginLog _pluginLog;
+
+    public DalamudLoggingProvider(IPluginLog pluginLog)
+    {
+        _pluginLog = pluginLog;
+        EmitBootstrapBanner();
+    }
+
+    // One-shot per plugin load. Intentionally visible in xllog so uncredited
+    // ports of the DalamudLogger trio keep announcing their origin.
+    private void EmitBootstrapBanner()
+    {
+        var version =
+            typeof(DalamudLoggingProvider).Assembly.GetName().Version?.ToString() ?? "0.0.0";
+        var fingerprint = ComputeFingerprint(version);
+        _pluginLog.Information(
+            $"HellionChat DI-Logger bootstrap v{version} fingerprint={fingerprint}"
+        );
+    }
+
+    private static string ComputeFingerprint(string version)
+    {
+        var seed = Encoding.UTF8.GetBytes($"{HellionMarker}-{version}");
+        var hash = SHA256.HashData(seed);
+        var sb = new StringBuilder(8);
+        for (var i = 0; i < 4; i++)
+            sb.Append(hash[i].ToString("x2"));
+        return sb.ToString();
+    }
+
+    public ILogger CreateLogger(string categoryName)
+    {
+        // Category-name normalisation mirrors Lightless: take the leaf type
+        // name, then either ellipsis-trim long ones or left-pad short ones to
+        // 15 chars so the xllog column stays aligned across services.
+        var catName = categoryName.Split(".", StringSplitOptions.RemoveEmptyEntries).Last();
+        if (catName.Length > 15)
+            catName = string.Concat(
+                catName.AsSpan(0, 6),
+                "...",
+                catName.AsSpan(catName.Length - 6, 6)
+            );
+        else
+            catName = catName.PadLeft(15);
+
+        return _loggers.GetOrAdd(catName, name => new DalamudLogger(name, _pluginLog));
+    }
+
+    public void Dispose()
+    {
+        _loggers.Clear();
+        GC.SuppressFinalize(this);
+    }
+}
@@ -0,0 +1,23 @@
+using Dalamud.Plugin.Services;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Logging;
+
+namespace HellionChat.Infrastructure.Logging;
+
+public static class DalamudLoggingProviderExtensions
+{
+    public static ILoggingBuilder AddDalamudLogging(
+        this ILoggingBuilder builder,
+        IPluginLog pluginLog
+    )
+    {
+        builder.ClearProviders();
+        builder.Services.TryAddEnumerable(
+            ServiceDescriptor.Singleton<ILoggerProvider, DalamudLoggingProvider>(
+                _ => new DalamudLoggingProvider(pluginLog)
+            )
+        );
+        return builder;
+    }
+}
@@ -4,6 +4,7 @@ namespace HellionChat;

 // Shared input history for all ChatInputBars (main and pop-out windows).
 // Push deduplicates: existing entries are moved to the end when re-added.
+// TEST-MIRROR: ../../Hellion Build test/Util/InputHistoryServiceTests.cs
 public static class InputHistoryService
 {
    private const int MaxSize = 30;
@@ -41,4 +42,12 @@ public static class InputHistoryService
            return null;
        return _entries[cursor];
    }
+
+    // Plugin reload doesn't reset static state automatically. Plugin.DisposeAsync
+    // calls this so the next load starts with an empty history instead of
+    // inheriting the previous session's entries.
+    public static void Reset()
+    {
+        _entries.Clear();
+    }
 }
@@ -2,6 +2,7 @@ using System;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Ipc;
 using Dalamud.Plugin.Services;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;

 namespace HellionChat.Integrations;
@@ -23,22 +24,23 @@ internal sealed class HonorificService : IDisposable
    private readonly ICallGateSubscriber<object> _ready;
    private readonly ICallGateSubscriber<object> _disposing;

-    private readonly IPluginLog _log;
+    private readonly ILogger<HonorificService> _logger;
    private readonly IFramework _framework;
    private bool _versionWarningLogged;

+    // Thread: framework only — IPC delivery + ImGui render both run there.
    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,
+        ILogger<HonorificService> logger,
        IFramework framework
    )
    {
        _framework = framework;
-        _log = log;
+        _logger = logger;

        // Gate objects are cached per-name by Dalamud and safe to register
        // before Honorific loads — they just won't fire until it does.
@@ -71,6 +73,7 @@ internal sealed class HonorificService : IDisposable
        TryUnsubscribe(() => _disposing.Unsubscribe(OnDisposing));
    }

+    // Thread: framework (scheduled from ctor and OnReady).
    private void TryInitialPull()
    {
        try
@@ -82,7 +85,7 @@ internal sealed class HonorificService : IDisposable
            {
                if (!_versionWarningLogged)
                {
-                    _log.Warning(
+                    _logger.LogWarning(
                        "Honorific API version mismatch — expected major 3, "
                            + "found {Major}.{Minor}. Disabling Honorific integration.",
                        version.Item1,
@@ -102,12 +105,13 @@ internal sealed class HonorificService : IDisposable
        catch (Exception ex)
        {
            // Honorific not installed or not yet initialised — Ready will retry.
-            _log.Debug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
+            _logger.LogDebug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
            IsAvailable = false;
            CurrentTitle = null;
        }
    }

+    // Thread: framework (Dalamud IPC delivery contract).
    private void OnTitleChanged(string json)
    {
        // Skip updates on version mismatch; subscription stays live for reload.
@@ -116,12 +120,13 @@ internal sealed class HonorificService : IDisposable
        CurrentTitle = ParseTitleJson(json);
    }

+    // Thread: any (Honorific dispatches NotifyReady from its own thread).
    private void OnReady()
    {
-        // Schedule on framework thread — NotifyReady can dispatch from any thread.
        _framework.RunOnFrameworkThread(TryInitialPull);
    }

+    // Thread: framework (IPC delivery contract); idempotent — Disposing fires once.
    private void OnDisposing()
    {
        // Honorific unloading — clear cached state so the header hides next frame.
@@ -133,6 +138,8 @@ internal sealed class HonorificService : IDisposable
        DetectedApiVersion = null;
    }

+    // Thread: framework (called from Dispose, which runs on the framework
+    // cleanup block in Plugin.DisposeAsync).
    private void TryUnsubscribe(Action unsubscribe)
    {
        try
@@ -141,20 +148,15 @@ internal sealed class HonorificService : IDisposable
        }
        catch (Exception ex)
        {
-            _log.Debug(ex, "Honorific unsubscribe failed (likely already gone).");
+            // Warning not Debug — a silent unsubscribe failure leaks a live
+            // subscription across plugin reloads.
+            _logger.LogWarning(
+                ex,
+                "Honorific unsubscribe failed (likely API break or gate already gone)."
+            );
        }
    }

-    // Threading: IPC events and ImGui both run on the framework thread, so
-    // OnTitleChanged and the render path never race — no volatile/Interlocked
-    // needed as long as Dalamud's framework-thread delivery contract holds.
-    //
-    // Constructor and OnReady are exceptions: they run outside that contract
-    // (plugin-loader thread and Honorific's NotifyReady respectively), so both
-    // use RunOnFrameworkThread to safely reach ObjectTable.LocalPlayer.
-
-    // --- Pure-logic helpers; tested via HellionChat.Tests/Integrations. ---
-
    internal static HonorificTitleData? ParseTitleJson(string json)
    {
        if (string.IsNullOrEmpty(json))
@@ -4,10 +4,19 @@ namespace HellionChat.Integrations;

 // Local DTO mirroring Honorific's TitleData — no hard reference to Honorific.dll
 // so HellionChat loads cleanly when Honorific is absent.
-// Glow/gradient fields omitted; Cycle 1 renders primary Color only.
+//
+// v1.4.7: render Glow only. Gradient (Color3 / GradientColourSet / Style) is
+// parsed and stashed so a future cycle can render it without re-shaping the
+// JSON roundtrip — see vault anchor "Honorific Full Gradient Port" (would
+// need GradientSystem.cs + the hardcoded Pride-palette list ported, or an
+// upstream IPC PR exposing the resolved frame colour).
 internal sealed record HonorificTitleData(
    string? Title,
    bool IsPrefix,
    bool IsOriginal,
-    Vector3? Color
+    Vector3? Color,
+    Vector3? Glow,
+    Vector3? Color3,
+    int? GradientColourSet,
+    string? GradientAnimationStyle
 );
@@ -1,3 +1,6 @@
+using System.Runtime.CompilerServices;
+using HellionChat.Util;
+
 namespace HellionChat.Integrations;

 // Third-party plugin URLs — separate from BrandingLinks (Hellion-owned URLs).
@@ -5,4 +8,13 @@ internal static class IntegrationLinks
 {
    public const string HonorificRepo = "https://github.com/Caraxi/Honorific";
    public const string HonorificAuthor = "https://github.com/Caraxi";
+
+    // See BrandingLinks.ValidateUrls for the CA2255 rationale.
+#pragma warning disable CA2255
+    [ModuleInitializer]
+#pragma warning restore CA2255
+    internal static void ValidateUrls()
+    {
+        UrlValidation.ValidateAll(nameof(IntegrationLinks), HonorificRepo, HonorificAuthor);
+    }
 }
@@ -1,9 +1,12 @@
 using Dalamud.Plugin.Ipc;
+using Microsoft.Extensions.Logging;

 namespace HellionChat.Ipc;

 public sealed class ExtraChat : IDisposable
 {
+    private readonly ILogger<ExtraChat> _logger;
+
 #pragma warning disable CS0649 // Assigned through IPC
    [Serializable]
    private struct OverrideInfo
@@ -26,10 +29,9 @@ public sealed class ExtraChat : IDisposable

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

-    // 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].
+    // volatile: IPC callbacks fire on a Dalamud thread while ImGui reads these.
+    // Reference assignment is atomic on x64, but the barrier ensures visibility
+    // across threads (especially Mono/Wine). See AUDIT-2026-05-05 [SEC-01].
    private volatile Dictionary<string, uint> ChannelCommandColoursInternal = new();
    internal IReadOnlyDictionary<string, uint> ChannelCommandColours =>
        ChannelCommandColoursInternal;
@@ -37,8 +39,9 @@ public sealed class ExtraChat : IDisposable
    private volatile Dictionary<Guid, string> ChannelNamesInternal = new();
    internal IReadOnlyDictionary<Guid, string> ChannelNames => ChannelNamesInternal;

-    internal ExtraChat()
+    internal ExtraChat(ILogger<ExtraChat> logger)
    {
+        _logger = logger;
        OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>(
            "ExtraChat.OverrideChannelColour"
        );
@@ -54,6 +57,7 @@ public sealed class ExtraChat : IDisposable
        OverrideChannelGate.Subscribe(OnOverrideChannel);
        ChannelCommandColoursGate.Subscribe(OnChannelCommandColours);
        ChannelNamesGate.Subscribe(OnChannelNames);
+
        try
        {
            ChannelCommandColoursInternal = ChannelCommandColoursGate.InvokeFunc(null!);
@@ -61,8 +65,8 @@ public sealed class ExtraChat : IDisposable
        }
        catch (Exception ex)
        {
-            // 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?)");
+            // ExtraChat is optional; IPC failure is normal when the plugin isn't loaded.
+            _logger.LogTrace(ex, "ExtraChat IPC initial state query failed (peer not loaded?)");
        }
    }

@@ -75,22 +79,11 @@ public sealed class ExtraChat : IDisposable

    private void OnOverrideChannel(OverrideInfo info)
    {
-        if (info.Channel == null)
-        {
-            ChannelOverride = null;
-            return;
-        }
-
-        ChannelOverride = (info.Channel, info.Rgba);
+        ChannelOverride = info.Channel == null ? null : (info.Channel, info.Rgba);
    }

-    private void OnChannelCommandColours(Dictionary<string, uint> obj)
-    {
+    private void OnChannelCommandColours(Dictionary<string, uint> obj) =>
        ChannelCommandColoursInternal = obj;
-    }

-    private void OnChannelNames(Dictionary<Guid, string> obj)
-    {
-        ChannelNamesInternal = obj;
-    }
+    private void OnChannelNames(Dictionary<Guid, string> obj) => ChannelNamesInternal = obj;
 }
@@ -1,5 +1,6 @@
 using Dalamud.Plugin.Ipc;
 using HellionChat.Code;
+using Microsoft.Extensions.Logging;

 namespace HellionChat.Ipc;

@@ -19,12 +20,26 @@ internal sealed class TypingIpc : IDisposable
    private ICallGateProvider<ChatInputState> StateQueryGate { get; }
    private ICallGateProvider<ChatInputState, object?> StateChangedGate { get; }

+    // v1.4.9 R4: ChatTwo IPC compatibility mirror. Some third-party plugins
+    // have a no-fork policy and subscribe only to ChatTwo.*-prefixed IPC
+    // gates. HellionChat replaces ChatTwo (conflict detection prevents
+    // parallel loading), so mirroring the ChatTwo provider slots lets those
+    // plugins keep working without code changes on their side. The tuple
+    // shape is textually identical to ChatTwo's IPC surface (same member
+    // order, same underlying types — ChatType is `ushort` in both repos)
+    // so Dalamud's IPC marshalling matches across plugin boundaries.
+    private ICallGateProvider<ChatInputState> ChatTwoStateQueryGate { get; }
+    private ICallGateProvider<ChatInputState, object?> ChatTwoStateChangedGate { get; }
+
    private ChatInputState LastState;
    private bool HasState;

-    internal TypingIpc(Plugin plugin)
+    private readonly ILogger<TypingIpc> _logger;
+
+    internal TypingIpc(Plugin plugin, ILogger<TypingIpc> logger)
    {
        Plugin = plugin;
+        _logger = logger;

        StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
            "HellionChat.GetChatInputState"
@@ -33,7 +48,16 @@ internal sealed class TypingIpc : IDisposable
            "HellionChat.ChatInputStateChanged"
        );

+        // v1.4.9 R4: ChatTwo-prefixed compatibility slots (see class-level comment).
+        ChatTwoStateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
+            "ChatTwo.GetChatInputState"
+        );
+        ChatTwoStateChangedGate = Plugin.Interface.GetIpcProvider<ChatInputState, object?>(
+            "ChatTwo.ChatInputStateChanged"
+        );
+
        StateQueryGate.RegisterFunc(GetState);
+        ChatTwoStateQueryGate.RegisterFunc(GetState);
    }

    private ChatInputState BuildState()
@@ -67,10 +91,13 @@ internal sealed class TypingIpc : IDisposable
        HasState = true;
        LastState = state;
        StateChangedGate.SendMessage(state);
+        // v1.4.9 R4: mirror on ChatTwo-prefixed slot for no-fork-policy plugins.
+        ChatTwoStateChangedGate.SendMessage(state);
    }

    public void Dispose()
    {
        StateQueryGate.UnregisterFunc();
+        ChatTwoStateQueryGate.UnregisterFunc();
    }
 }
@@ -1,11 +1,14 @@
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Plugin.Ipc;
+using Microsoft.Extensions.Logging;

 namespace HellionChat;

 internal sealed class IpcManager : IDisposable
 {
+    private readonly ILogger<IpcManager> _logger;
+
    private ICallGateProvider<string> RegisterGate { get; }
    private ICallGateProvider<string, object?> UnregisterGate { get; }
    private ICallGateProvider<object?> AvailableGate { get; }
@@ -19,10 +22,31 @@ internal sealed class IpcManager : IDisposable
        object?
    > InvokeGate { get; }

+    // v1.4.9 R4: ChatTwo IPC compatibility mirror. Third-party plugins with
+    // a no-fork policy (e.g. Artisan, AllaganTools) only subscribe to the
+    // ChatTwo.*-prefixed context-menu integration gates. Mirroring all four
+    // provider slots under the ChatTwo namespace lets those plugins keep
+    // working without code changes on their side. Conflict detection
+    // prevents ChatTwo and HellionChat from loading in parallel, so no slot
+    // collision risk.
+    private ICallGateProvider<string> ChatTwoRegisterGate { get; }
+    private ICallGateProvider<string, object?> ChatTwoUnregisterGate { get; }
+    private ICallGateProvider<object?> ChatTwoAvailableGate { get; }
+    private ICallGateProvider<
+        string,
+        PlayerPayload?,
+        ulong,
+        Payload?,
+        SeString?,
+        SeString?,
+        object?
+    > ChatTwoInvokeGate { get; }
+
    internal List<string> Registered { get; } = [];

-    public IpcManager()
+    public IpcManager(ILogger<IpcManager> logger)
    {
+        _logger = logger;
        RegisterGate = Plugin.Interface.GetIpcProvider<string>("HellionChat.Register");
        RegisterGate.RegisterFunc(Register);

@@ -41,7 +65,32 @@ internal sealed class IpcManager : IDisposable
            object?
        >("HellionChat.Invoke");

+        // v1.4.9 R4: ChatTwo-prefixed mirrors of the four context-menu slots
+        // above. Share the same Register/Unregister backing methods so a
+        // plugin that subscribes via either namespace lands in the same
+        // Registered list. SendMessage on Invoke fans out to both gates.
+        ChatTwoRegisterGate = Plugin.Interface.GetIpcProvider<string>("ChatTwo.Register");
+        ChatTwoRegisterGate.RegisterFunc(Register);
+
+        ChatTwoAvailableGate = Plugin.Interface.GetIpcProvider<object?>("ChatTwo.Available");
+
+        ChatTwoUnregisterGate = Plugin.Interface.GetIpcProvider<string, object?>(
+            "ChatTwo.Unregister"
+        );
+        ChatTwoUnregisterGate.RegisterAction(Unregister);
+
+        ChatTwoInvokeGate = Plugin.Interface.GetIpcProvider<
+            string,
+            PlayerPayload?,
+            ulong,
+            Payload?,
+            SeString?,
+            SeString?,
+            object?
+        >("ChatTwo.Invoke");
+
        AvailableGate.SendMessage();
+        ChatTwoAvailableGate.SendMessage();
    }

    internal void Invoke(
@@ -54,6 +103,8 @@ internal sealed class IpcManager : IDisposable
    )
    {
        InvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
+        // v1.4.9 R4: fan out the same event to plugins listening on ChatTwo.Invoke.
+        ChatTwoInvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
    }

    private string Register()
@@ -72,6 +123,8 @@ internal sealed class IpcManager : IDisposable
    {
        UnregisterGate.UnregisterAction();
        RegisterGate.UnregisterFunc();
+        ChatTwoUnregisterGate.UnregisterAction();
+        ChatTwoRegisterGate.UnregisterFunc();
        Registered.Clear();
    }
 }
@@ -153,8 +153,8 @@ public partial class Message
            }
            catch (ArgumentException ex)
            {
-                Plugin.Log.Error(ex, "Failed to parse extra chat channel GUID");
-                Plugin.Log.Error($"Byte Array: ${string.Join(", ", data[4..^1])}");
+                Plugin.LogProxy.Error(ex, "Failed to parse extra chat channel GUID");
+                Plugin.LogProxy.Error($"Byte Array: ${string.Join(", ", data[4..^1])}");
                return Guid.Empty;
            }
        }
@@ -251,7 +251,7 @@ public partial class Message
                        AddChunkWithMessage(
                            text.NewWithStyle(chunk.Source, chunk.Link, token.Value)
                        );
-                        Plugin.Log.Debug(
+                        Plugin.LogProxy.Debug(
                            $"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'"
                        );
                    }
@@ -416,7 +416,7 @@ public partial class Message
                catch (Exception)
                {
                    AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split));
-                    Plugin.Log.Debug($"Failed to parse the text param: '{split}'");
+                    Plugin.LogProxy.Debug($"Failed to parse the text param: '{split}'");
                }
            }
        }
@@ -14,6 +14,7 @@ using HellionChat.Util;
 using Lumina.Text.Expressions;
 using Lumina.Text.Payloads;
 using Lumina.Text.ReadOnly;
+using Microsoft.Extensions.Logging;

 namespace HellionChat;

@@ -22,6 +23,7 @@ internal class MessageManager : IAsyncDisposable
    internal const int MessageDisplayLimit = 10_000;

    private Plugin Plugin { get; }
+    private readonly ILogger<MessageManager> _logger;
    internal MessageStore Store { get; }

    private Dictionary<ChatType, NameFormatting> Formats { get; } = [];
@@ -48,11 +50,21 @@ internal class MessageManager : IAsyncDisposable
    // AutoTellTabsService to spawn or refresh temp tabs without coupling.
    public event Action<Message>? MessageProcessed;

-    internal unsafe MessageManager(Plugin plugin)
+    internal unsafe MessageManager(
+        Plugin plugin,
+        ILogger<MessageManager> logger,
+        ILoggerFactory loggerFactory
+    )
    {
        Plugin = plugin;
+        _logger = logger;

-        Store = new MessageStore(DatabasePath());
+        Store = new MessageStore(
+            DatabasePath(),
+            Plugin.PlatformUtil,
+            loggerFactory.CreateLogger<MessageStore>(),
+            loggerFactory
+        );

        PendingMessageThread = new Thread(() =>
            ProcessPendingMessages(PendingThreadCancellationToken.Token)
@@ -91,7 +103,7 @@ internal class MessageManager : IAsyncDisposable
            await Task.Delay(100);

        if (PendingMessageThread.IsAlive)
-            Plugin.Log.Warning(
+            _logger.LogWarning(
                "PendingMessageThread did not observe cancellation within 10s. "
                    + "Worker remains on background thread; next plugin reload releases it."
            );
@@ -137,7 +149,7 @@ internal class MessageManager : IAsyncDisposable
                }
                catch (Exception ex)
                {
-                    Plugin.Log.Error(ex, "Error processing pending message");
+                    _logger.LogError(ex, "Error processing pending message");
                }
            }
            else
@@ -182,10 +194,12 @@ internal class MessageManager : IAsyncDisposable

        // Mark failed messages as deleted to prevent retry attempts
        var failedIds = messages.FailedMessageIds();
-        Plugin.Log.Info($"Marking {failedIds.Count} messages as deleted due to parse failures");
+        _logger.LogInformation(
+            $"Marking {failedIds.Count} messages as deleted due to parse failures"
+        );
        foreach (var msgId in messages.FailedMessageIds())
        {
-            Plugin.Log.Debug($"Marking message '{msgId}' as deleted due to parse failure");
+            _logger.LogDebug($"Marking message '{msgId}' as deleted due to parse failure");
            Store.DeleteMessage(msgId);
        }
    }
@@ -201,10 +215,13 @@ internal class MessageManager : IAsyncDisposable
            }
            catch (Exception ex)
            {
-                Plugin.Log.Error(ex, "Error in FilterAllTabs");
+                _logger.LogError(ex, "Error in FilterAllTabs");
            }

-            Plugin.Log.Debug($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
+            // v1.4.9 R3 profiling: Information so the xllog tail surfaces this
+            // without a Debug filter. Belt-and-suspenders for future plugin-load
+            // regressions; remains in place after Sub-Task 3.4 Befund.
+            _logger.LogInformation($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
        });
    }

@@ -259,7 +276,7 @@ internal class MessageManager : IAsyncDisposable
        }
        catch (Exception ex)
        {
-            Plugin.Log.Error(ex, "Error in ContentIdResolver");
+            _logger.LogError(ex, "Error in ContentIdResolver");
        }
    }

@@ -20,6 +20,7 @@ using HellionChat.Resources;
 using HellionChat.Ui;
 using HellionChat.Util;
 using Lumina.Excel.Sheets;
+using Microsoft.Extensions.Logging;
 using Action = System.Action;
 using ChatTwoPartyFinderPayload = HellionChat.Util.PartyFinderPayload;
 using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
@@ -40,9 +41,12 @@ public sealed class PayloadHandler

    private const uint PopupSfx = 1;

-    internal PayloadHandler(ChatLogWindow logWindow)
+    private readonly ILogger<PayloadHandler> _logger;
+
+    internal PayloadHandler(ChatLogWindow logWindow, ILogger<PayloadHandler> logger)
    {
        LogWindow = logWindow;
+        _logger = logger;
    }

    internal void Draw()
@@ -131,7 +135,7 @@ public sealed class PayloadHandler
            }
            catch (Exception ex)
            {
-                Plugin.Log.Error(ex, "Error executing integration");
+                _logger.LogError(ex, "Error executing integration");
            }
        }

@@ -535,7 +539,7 @@ public sealed class PayloadHandler
            )
        )
        {
-            Plugin.Log.Warning("Could not find DalamudLinkHandlers");
+            _logger.LogWarning("Could not find DalamudLinkHandlers");
            return;
        }

@@ -546,7 +550,7 @@ public sealed class PayloadHandler
        }
        catch (Exception ex)
        {
-            Plugin.Log.Error(ex, "Error executing DalamudLinkPayload handler");
+            _logger.LogError(ex, "Error executing DalamudLinkPayload handler");
        }
    }

@@ -14,6 +14,9 @@ using HellionChat.Ipc;
 using HellionChat.Resources;
 using HellionChat.Ui;
 using HellionChat.Util;
+using Microsoft.Data.Sqlite;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;

 namespace HellionChat;

@@ -113,11 +116,46 @@ public sealed class Plugin : IAsyncDalamudPlugin
    internal Ui.StatusBar StatusBar { get; private set; } = null!;
    internal Integrations.HonorificService HonorificService { get; private set; } = null!;

+    // Platform indirection over Dalamud.Utility.Util. Wired in Phase-1 ctor so
+    // any service allocated in LoadAsync can read Plugin.PlatformUtil.
+    internal static IPlatformUtil PlatformUtil { get; private set; } = null!;
+
+    // Log indirection over Dalamud's IPluginLog. Same rationale as PlatformUtil:
+    // call-sites read through LogProxy so MessageStore can be tested in
+    // isolation. Wired immediately after Dalamud injects Log.
+    internal static IPluginLogProxy LogProxy { get; private set; } = null!;
+
+    // Nullable so DisposeAsync stays safe if Host-build throws before the
+    // fields get assigned — Dalamud fires DisposeAsync regardless.
+    private readonly IHost? _host;
+    private readonly PluginLifecycle? _lifecycle;
+
+    // Wrapper cached so TearDown can detach the live instance instead of
+    // re-registering with identical args (v1.4.9 ISSUE-1 cleanup).
+    private CommandWrapper? _hellionSettingsCmd;
+    private CommandWrapper? _hellionViewCmd;
+    private CommandWrapper? _hellionDebuggerCmd;
+#if DEBUG
+    private CommandWrapper? _hellionSeStringCmd;
+#endif
+
    // Idempotency guard — Dalamud may fire DisposeAsync twice in a reload race.
    private int _disposeStarted;

+    // Set in the first DisposeAsync statement so async callbacks scheduled
+    // via Framework.RunOnTick (v1.4.8 B3 retention sweep) can early-bail
+    // before they touch state that has already been torn down. Volatile
+    // because the tick reads it from a different thread than the writer.
+    private volatile bool _isDisposing;
+
    internal int DeferredSaveFrames = -1;

+    // Cancels the v1.4.8 FTS5 bulk-insert worker on plugin teardown. The
+    // worker runs off the framework thread on its own SqliteConnection, so a
+    // Dispose mid-rebuild must signal cancellation before MessageManager
+    // tears down (the worker logs "rebuild failed" via Log on error paths).
+    private CancellationTokenSource? _ftsRebuildCts;
+
    // Serialises retention sweeps so a manual trigger and the 24h auto-sweep
    // can't run in parallel. Volatile because the ImGui thread reads it outside
    // the lock to gate the manual button.
@@ -154,23 +192,99 @@ public sealed class Plugin : IAsyncDalamudPlugin

        Config = Interface.GetPluginConfig() as Configuration ?? new Configuration();

-        // Schema gate: v1.4.3 requires config v16. Users on older schemas
-        // must install v1.4.2 first to run the migration chain.
+        // PlatformUtil and LogProxy are filled from the DI container in
+        // Phase-1 below (`_host.Services.GetRequiredService<IPlatformUtil>()`
+        // and the LogProxy equivalent). Phase-0 helpers that run before that
+        // point (MigrateFromChatTwoLayout, LanguageChanged, ImGuiUtil.Initialize)
+        // do not touch either static, so the brief null-window is safe.
+
+        // Schema gate: v1.4.x requires config v16+. Users on older schemas
+        // must install v1.4.2 first to run the migration chain. v17 adds
+        // Tab.IsPinned (additive, no data migration needed) so v16 configs
+        // load cleanly and get their Version stamp bumped after the gate.
        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."
+                $"HellionChat v1.4.10 requires config schema v16, got v{Config.Version}. "
+                    + "Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.10."
            );
        }
+        Config.Version = 17;

-        // Drop session-only Auto-Tell-Tabs that a previous crash may have persisted.
-        Config.Tabs.RemoveAll(t => t.IsTempTab);
+        // Unpinned TempTabs are session-only and dropped on every load. Pinned
+        // TempTabs survive reload — Jin's tester feedback (v1.4.7).
+        Config.Tabs.RemoveAll(TabLifecycleHelpers.ShouldStripOnLoad);

        LanguageChanged(Interface.UiLanguage);
        ImGuiUtil.Initialize(this);

        DeferredSaveFrames = -1;
+
+        // Custom themes dir + seed run before the container builds so the
+        // ThemeRegistry factory lambda finds the directory ready.
+        var customThemesDir = Path.Combine(Interface.ConfigDirectory.FullName, "themes");
+        Directory.CreateDirectory(customThemesDir);
+        SeedExampleThemeIfEmpty(customThemesDir);
+
+        // Phase-1: build the host synchronously (the schema gate must clear
+        // before services allocate; Lightless' deferred build would invert
+        // that order) and pull singletons into the Plugin.X surface.
+        var dependencies = new PluginHostDependencies(
+            Interface,
+            Log,
+            ChatGui,
+            ClientState,
+            CommandManager,
+            Condition,
+            DataManager,
+            Framework,
+            GameGui,
+            KeyState,
+            ObjectTable,
+            PartyList,
+            TargetManager,
+            TextureProvider,
+            GameInteropProvider,
+            GameConfig,
+            Notification,
+            AddonLifecycle,
+            PlayerState,
+            Evaluator,
+            SelfTestRegistry
+        );
+
+        _host = PluginHostFactory.Build(this, dependencies);
+        _lifecycle = _host.Services.GetRequiredService<PluginLifecycle>();
+        _lifecycle.Host = _host;
+
+        // Plugin.X static bridge - filled from the container so DI-aware code
+        // and the ~93 Plugin.X consumer sites read the same instances.
+        PlatformUtil = _host.Services.GetRequiredService<IPlatformUtil>();
+        LogProxy = _host.Services.GetRequiredService<IPluginLogProxy>();
+        FileDialogManager = _host.Services.GetRequiredService<FileDialogManager>();
+
+        // Resolve order matters: block-B services first so the windows can
+        // read Plugin.MessageManager etc. from their own ctors without NREs.
+        FontManager = _host.Services.GetRequiredService<FontManager>();
+        ThemeRegistry = _host.Services.GetRequiredService<Themes.ThemeRegistry>();
+        Commands = _host.Services.GetRequiredService<Commands>();
+        Functions = _host.Services.GetRequiredService<GameFunctions.GameFunctions>();
+        Ipc = _host.Services.GetRequiredService<IpcManager>();
+        TypingIpc = _host.Services.GetRequiredService<TypingIpc>();
+        ExtraChat = _host.Services.GetRequiredService<ExtraChat>();
+        HonorificService = _host.Services.GetRequiredService<Integrations.HonorificService>();
+        StatusBar = _host.Services.GetRequiredService<Ui.StatusBar>();
+        MessageManager = _host.Services.GetRequiredService<MessageManager>();
+        AutoTellTabsService = _host.Services.GetRequiredService<AutoTellTabsService>();
+
+        ChatLogWindow = _host.Services.GetRequiredService<ChatLogWindow>();
+        SettingsWindow = _host.Services.GetRequiredService<SettingsWindow>();
+        DbViewer = _host.Services.GetRequiredService<DbViewer>();
+        InputPreview = _host.Services.GetRequiredService<InputPreview>();
+        CommandHelpWindow = _host.Services.GetRequiredService<CommandHelpWindow>();
+        SeStringDebugger = _host.Services.GetRequiredService<SeStringDebugger>();
+        DebuggerWindow = _host.Services.GetRequiredService<DebuggerWindow>();
+        FirstRunWizard = _host.Services.GetRequiredService<FirstRunWizard>();
    }

    public async Task LoadAsync(CancellationToken cancellationToken)
@@ -192,65 +306,28 @@ public sealed class Plugin : IAsyncDalamudPlugin

            cancellationToken.ThrowIfCancellationRequested();

-            // BuildFonts registers handles with Dalamud's FontAtlas; the atlas
-            // rebuilds async a few frames later (visible "font-pop" on first load).
-            FontManager = new FontManager();
-            FontManager.BuildFonts();
-
-            // ThemeRegistry must be wired before the first Draw tick.
-            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.
-            // HonorificService registers IPC subscribers early to catch
-            // Ready/Disposing events from the first frame.
-            FileDialogManager = new FileDialogManager();
-            Commands = new Commands();
-            Functions = new GameFunctions.GameFunctions(this);
-            Ipc = new IpcManager();
-            TypingIpc = new TypingIpc(this);
-            ExtraChat = new ExtraChat();
-            HonorificService = new Integrations.HonorificService(Interface, Log, Framework);
-            StatusBar = new Ui.StatusBar();
-            MessageManager = new MessageManager(this);
-
-            AutoTellTabsService = new AutoTellTabsService(
-                this,
-                MessageManager,
-                MessageManager.Store
-            );
-            AutoTellTabsService.Initialize();
+            // Container drives service init now: Host.StartAsync triggers the
+            // IHostedService adapters (FontManager.BuildFonts, ThemeRegistry
+            // cache warmup + Switch, IPC eager-resolve, MessageManager
+            // FilterAllTabsAsync, AutoTellTabsService.Initialize). Window
+            // registration with WindowSystem runs on the framework thread
+            // inside PluginLifecycle.LoadAsync after StartAsync returns.
+            if (_lifecycle is not null)
+                await _lifecycle.LoadAsync(cancellationToken).ConfigureAwait(false);

            SelfTestRegistry.RegisterTestSteps([new SelfTests.ThemeSwitchSelfTestStep(this)]);

-            ChatLogWindow = new ChatLogWindow(this);
-            SettingsWindow = new SettingsWindow(this);
-            DbViewer = new DbViewer(this);
-            InputPreview = new InputPreview(ChatLogWindow);
-            CommandHelpWindow = new CommandHelpWindow(ChatLogWindow);
-            SeStringDebugger = new SeStringDebugger(this);
-            DebuggerWindow = new DebuggerWindow(this);
-            FirstRunWizard = new FirstRunWizard(this);
-
-            WindowSystem.AddWindow(ChatLogWindow);
-            WindowSystem.AddWindow(SettingsWindow);
-            WindowSystem.AddWindow(DbViewer);
-            WindowSystem.AddWindow(InputPreview);
-            WindowSystem.AddWindow(CommandHelpWindow);
-            WindowSystem.AddWindow(SeStringDebugger);
-            WindowSystem.AddWindow(DebuggerWindow);
-            WindowSystem.AddWindow(FirstRunWizard);
-
            if (!Config.FirstRunCompleted)
                FirstRunWizard.IsOpen = true;

            cancellationToken.ThrowIfCancellationRequested();

+            // Populate the command dictionary + UiBuilder hooks BEFORE
+            // Commands.Initialise() walks the dictionary and registers each
+            // entry with Dalamud's CommandManager (Commands.cs:15-28). Adding
+            // wrappers after Initialise() would leak them — they'd live in
+            // the dictionary but never reach Dalamud.
+            SetupCommands();
            Commands.Initialise();

            // Daily retention sweep — fire-and-forget, skips when disabled
@@ -260,8 +337,115 @@ public sealed class Plugin : IAsyncDalamudPlugin
            if (Config.ShowEmotes)
                _ = EmoteCache.LoadData();

-            if (Interface.Reason is not PluginLoadReason.Boot)
-                MessageManager.FilterAllTabsAsync();
+            // FilterAllTabsAsync now runs from MessageManagerInitHostedService
+            // during Host.StartAsync (same Reason-not-Boot guard there).
+
+            // Kick the FTS5 rebuild worker if Migrate4 just added the schema or
+            // a previous run was cut short (InitFtsReadyCache leaves _ftsReady
+            // false in that case). Runs off the framework thread on its own
+            // SqliteConnection so the live UpsertMessage path keeps flowing
+            // through the chunked-commit windows.
+            _ftsRebuildCts = new CancellationTokenSource();
+            if (!MessageManager.Store.IsFtsIndexBuilt)
+            {
+                var token = _ftsRebuildCts.Token;
+                _ = Task.Run(
+                    async () =>
+                    {
+                        // FQN: Plugin.Notification (Z.74) shadows the type name.
+                        Dalamud.Interface.ImGuiNotification.IActiveNotification? notif = null;
+                        try
+                        {
+                            notif = Notification.AddNotification(
+                                new Dalamud.Interface.ImGuiNotification.Notification
+                                {
+                                    Title = "Hellion Chat",
+                                    Content = "Indexing chat history for full-text search...",
+                                    Type = Dalamud
+                                        .Interface
+                                        .ImGuiNotification
+                                        .NotificationType
+                                        .Info,
+                                    Minimized = false,
+                                    InitialDuration = TimeSpan.FromMinutes(10),
+                                }
+                            );
+
+                            // Progress<T> raises this callback on the captured
+                            // sync-context (Task.Run worker pool). IActiveNotification
+                            // is ImGui-backed and mutates the UI, so marshal the
+                            // mutation onto the framework thread via RunOnTick.
+                            var progress = new Progress<long>(done =>
+                            {
+                                Framework.RunOnTick(() =>
+                                {
+                                    if (notif is { } n)
+                                        n.Content = $"Indexing chat history: {done:N0} messages...";
+                                });
+                            });
+
+                            // Worker-owned connection. Closed+disposed before we
+                            // flip the readiness flag so the DbViewer never sees
+                            // IsFtsIndexBuilt=true while the worker connection
+                            // is still alive.
+                            SqliteConnection? workerConn = null;
+                            try
+                            {
+                                workerConn = MessageManager.Store.OpenSecondaryConnection();
+                                var total = await Task.Run(
+                                        () =>
+                                            MessageManager.Store.RebuildFtsIndex(
+                                                workerConn,
+                                                progress,
+                                                token
+                                            ),
+                                        token
+                                    )
+                                    .ConfigureAwait(false);
+
+                                workerConn.Close();
+                                workerConn.Dispose();
+                                workerConn = null;
+                                MessageManager.Store.MarkFtsIndexBuilt();
+
+                                if (notif is { } final)
+                                {
+                                    final.Content = $"Indexed {total:N0} messages.";
+                                    final.Type = Dalamud
+                                        .Interface
+                                        .ImGuiNotification
+                                        .NotificationType
+                                        .Success;
+                                    final.InitialDuration = TimeSpan.FromSeconds(5);
+                                }
+                            }
+                            finally
+                            {
+                                workerConn?.Dispose();
+                            }
+                        }
+                        catch (OperationCanceledException)
+                        {
+                            notif?.DismissNow();
+                        }
+                        catch (Exception ex)
+                        {
+                            Log.Error(ex, "FTS index rebuild failed");
+                            if (notif is { } err)
+                            {
+                                err.Content =
+                                    "Full-text indexing failed -- search will use local filter only.";
+                                err.Type = Dalamud
+                                    .Interface
+                                    .ImGuiNotification
+                                    .NotificationType
+                                    .Error;
+                            }
+                        }
+                    },
+                    _ftsRebuildCts.Token
+                );
+            }

            Interface.UiBuilder.DisableCutsceneUiHide = true;
            Interface.UiBuilder.DisableGposeUiHide = true;
@@ -279,7 +463,6 @@ public sealed class Plugin : IAsyncDalamudPlugin
            Framework.Update += FrameworkUpdate;
            Interface.UiBuilder.Draw += Draw;
            Interface.LanguageChanged += LanguageChanged;
-            Interface.UiBuilder.OpenMainUi += OpenMainUi;
        }
        catch
        {
@@ -301,14 +484,32 @@ public sealed class Plugin : IAsyncDalamudPlugin
        if (Interlocked.Exchange(ref _disposeStarted, 1) != 0)
            return;

+        // Set before any cleanup so deferred Framework.RunOnTick callbacks
+        // (B3 retention sweep) see the flag and bail out before they touch
+        // MessageManager / Log / static fields that the rest of this method
+        // is about to tear down.
+        _isDisposing = true;
+
        Exception? failure = null;

        // Unsubscribe hooks first — mirrors the hooks-last subscribe order in LoadAsync.
-        failure = CaptureFailure(failure, () => Interface.UiBuilder.OpenMainUi -= OpenMainUi);
        failure = CaptureFailure(failure, () => Interface.LanguageChanged -= LanguageChanged);
        failure = CaptureFailure(failure, () => Interface.UiBuilder.Draw -= Draw);
        failure = CaptureFailure(failure, () => Framework.Update -= FrameworkUpdate);

+        // Signal the FTS rebuild worker to bail. Runs before MessageManager
+        // tears down so the worker's "rebuild failed" log path still finds
+        // a live Log static. Worker owns its own SqliteConnection and disposes
+        // it itself; we only flip the cancellation flag here.
+        failure = CaptureFailure(
+            failure,
+            () =>
+            {
+                _ftsRebuildCts?.Cancel();
+                _ftsRebuildCts?.Dispose();
+            }
+        );
+
        // Flush a pending DeferredSave — FrameworkUpdate won't fire it anymore.
        failure = CaptureFailure(
            failure,
@@ -322,44 +523,18 @@ public sealed class Plugin : IAsyncDalamudPlugin
            }
        );

-        // Unsubscribe AutoTellTabs before MessageManager goes away.
-        failure = CaptureFailure(failure, () => AutoTellTabsService?.Dispose());
-
-        // MessageManager has its own async dispose path (DB flush, thread shutdown).
-        if (MessageManager is not null)
-        {
-            failure = await CaptureFailureAsync(
-                    failure,
-                    () => MessageManager.DisposeAsync().AsTask()
-                )
-                .ConfigureAwait(false);
-        }
-
-        // Game-function / IPC / window cleanup must run on the framework thread.
+        // Framework-thread cleanup the container does not reach.
        try
        {
            await Framework
                .RunOnFrameworkThread(() =>
                {
+                    failure = CaptureFailure(failure, TearDownCommands);
                    failure = CaptureFailure(
                        failure,
                        () => GameFunctions.GameFunctions.SetChatInteractable(true)
                    );
-
-                    // IPC subscribers before windows — prevents a final IPC event
-                    // from reaching a half-torn ChatLogWindow.
-                    failure = CaptureFailure(failure, () => HonorificService?.Dispose());
-                    failure = CaptureFailure(failure, () => TypingIpc?.Dispose());
-                    failure = CaptureFailure(failure, () => ExtraChat?.Dispose());
-                    failure = CaptureFailure(failure, () => Ipc?.Dispose());
-
                    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);
        }
@@ -368,10 +543,18 @@ public sealed class Plugin : IAsyncDalamudPlugin
            failure ??= ex;
        }

-        // Pure-memory cleanups — no Framework / UI / IPC touch.
-        failure = CaptureFailure(failure, () => Functions?.Dispose());
-        failure = CaptureFailure(failure, () => Commands?.Dispose());
+        // Container disposes services + windows on the framework thread.
+        // MessageManager.DisposeAsync is not idempotent, so we let the
+        // container do it once instead of double-disposing.
+        if (_lifecycle is not null)
+        {
+            failure = await CaptureFailureAsync(failure, () => _lifecycle.DisposeAsync().AsTask())
+                .ConfigureAwait(false);
+        }
+
+        // Static-class cleanups the container has no handle on.
        failure = CaptureFailure(failure, () => EmoteCache.Dispose());
+        failure = CaptureFailure(failure, InputHistoryService.Reset);

        if (failure is not null)
            ExceptionDispatchInfo.Capture(failure).Throw();
@@ -517,11 +700,95 @@ public sealed class Plugin : IAsyncDalamudPlugin
        }
    }

-    private void OpenMainUi()
+    // Central slash-command + UiBuilder.OpenConfigUi/OpenMainUi subscribe so
+    // the four lazy windows (Settings, DbViewer, SeStringDebugger, Debugger)
+    // have working entry points before they're constructed.
+    private void SetupCommands()
    {
-        SettingsWindow.IsOpen = !SettingsWindow.IsOpen;
+        // ChatLogWindow.cs:128 already registers /hellion (ToggleChat). The
+        // description-arg here keeps the Dalamud help list populated.
+        _hellionSettingsCmd = Commands.Register(
+            "/hellion",
+            "Perform various actions with Hellion Chat."
+        );
+        _hellionSettingsCmd.Execute += OnHellionSettingsCommand;
+
+        _hellionViewCmd = Commands.Register(
+            "/hellionView",
+            "Get access to your message history, with simple filter options.",
+            true
+        );
+        _hellionViewCmd.Execute += OnHellionViewCommand;
+
+        _hellionDebuggerCmd = Commands.Register("/hellionDebugger", showInHelp: false);
+        _hellionDebuggerCmd.Execute += OnHellionDebuggerCommand;
+#if DEBUG
+        // SeStringDebugger.cs lives under #if DEBUG too; keep this out of release builds.
+        _hellionSeStringCmd = Commands.Register("/hellionSeString", showInHelp: false);
+        _hellionSeStringCmd.Execute += OnHellionSeStringCommand;
+#endif
+
+        // Plugin-Manager "Settings" button. Was in Settings.cs:67 pre-v1.4.9.
+        Interface.UiBuilder.OpenConfigUi += OnOpenConfigUi;
+
+        // Plugin-Manager "Open" button. Was in Plugin.cs LoadAsync pre-v1.4.9
+        // (separate OpenMainUi handler that flipped SettingsWindow.IsOpen).
+        Interface.UiBuilder.OpenMainUi += OnOpenMainUi;
    }

+    private void TearDownCommands()
+    {
+        Interface.UiBuilder.OpenMainUi -= OnOpenMainUi;
+        Interface.UiBuilder.OpenConfigUi -= OnOpenConfigUi;
+
+        // Null-tolerant detaches: TearDownCommands can run from the LoadAsync
+        // failure path (Plugin.cs CaptureFailure) before SetupCommands finished.
+        if (_hellionSettingsCmd is not null)
+        {
+            _hellionSettingsCmd.Execute -= OnHellionSettingsCommand;
+            _hellionSettingsCmd = null;
+        }
+
+        if (_hellionViewCmd is not null)
+        {
+            _hellionViewCmd.Execute -= OnHellionViewCommand;
+            _hellionViewCmd = null;
+        }
+
+        if (_hellionDebuggerCmd is not null)
+        {
+            _hellionDebuggerCmd.Execute -= OnHellionDebuggerCommand;
+            _hellionDebuggerCmd = null;
+        }
+#if DEBUG
+        if (_hellionSeStringCmd is not null)
+        {
+            _hellionSeStringCmd.Execute -= OnHellionSeStringCommand;
+            _hellionSeStringCmd = null;
+        }
+#endif
+    }
+
+    private void OnHellionSettingsCommand(string command, string arguments)
+    {
+        // /hellion with args is intentionally a no-op (matches pre-v1.4.9
+        // Settings.cs:76-80 behaviour).
+        if (string.IsNullOrWhiteSpace(arguments))
+            SettingsWindow.Toggle();
+    }
+
+    private void OnOpenConfigUi() => SettingsWindow.Toggle();
+
+    private void OnOpenMainUi() => SettingsWindow.Toggle();
+
+    private void OnHellionViewCommand(string _, string __) => DbViewer.Toggle();
+
+    private void OnHellionDebuggerCommand(string _, string __) => DebuggerWindow.Toggle();
+
+#if DEBUG
+    private void OnHellionSeStringCommand(string _, string __) => SeStringDebugger.Toggle();
+#endif
+
    private void RunRetentionSweepIfDue()
    {
        if (!Config.RetentionEnabled)
@@ -557,15 +824,31 @@ public sealed class Plugin : IAsyncDalamudPlugin
                if (deleted > 0)
                {
                    Log.Information($"Retention sweep deleted {deleted} expired messages.");
-                    // Run clear+refilter on the framework thread — FilterAllTabsAsync
-                    // is fire-and-forget and would race the next sweep cycle.
-                    Framework
-                        .Run(() =>
+                    // Schedule on the next framework tick to avoid the ~194ms
+                    // hitch from blocking with .Wait() while the framework
+                    // finishes the current frame. Tabs-list mutation must
+                    // stay on the framework thread because Plugin.Config.Tabs
+                    // (Configuration.cs:222) is not lock-protected and
+                    // AutoTellTabsService can mutate it from background paths.
+                    // Pattern reference: SimpleTweaks
+                    // Tweaks/Chat/CaseInsensitiveCommands.cs:45.
+                    Framework.RunOnTick(() =>
+                    {
+                        // The retention thread is IsBackground=true so plugin
+                        // unload can fire while a scheduled tick is still
+                        // pending; bail before touching anything torn down.
+                        if (_isDisposing)
+                            return;
+                        try
                        {
                            MessageManager.ClearAllTabs();
                            MessageManager.FilterAllTabs();
-                        })
-                        .Wait();
+                        }
+                        catch (Exception ex)
+                        {
+                            Log.Error(ex, "Retention sweep clear+refilter failed");
+                        }
+                    });
                }
                else
                {
@@ -589,6 +872,12 @@ public sealed class Plugin : IAsyncDalamudPlugin

    private void Draw()
    {
+        // v1.4.8 B2: pick up external edits of the active custom theme JSON
+        // without forcing the user to re-click the picker. The disk-stat is
+        // 1Hz-throttled inside RefreshActiveIfStale, so this is essentially
+        // free on built-in themes and ~1 stat/second on custom themes.
+        ThemeRegistry.RefreshActiveIfStale();
+
        // Theme engine is always active; Classic is a theme, not a disabled state.
        using IDisposable _style = HellionStyle.PushGlobal(
            ThemeRegistry.Active,
@@ -633,14 +922,17 @@ public sealed class Plugin : IAsyncDalamudPlugin

    internal void SaveConfig()
    {
-        // Strip session-only Auto-Tell-Tabs before serialization; restore after.
-        var snapshot = Config.Tabs.ToList();
-        Config.Tabs.RemoveAll(t => t.IsTempTab);
+        // Only unpinned TempTabs are session-only — they move aside before
+        // serialization and re-attach after. Pinned TempTabs stay in
+        // Config.Tabs across the save so JSON includes them. Cloning only the
+        // unpinned subset keeps the allocation proportional to
+        // AutoTellTabsLimit (<=15) instead of the full tab list.
+        var unpinnedTempTabs = Config.Tabs.Where(TabLifecycleHelpers.IsInUnpinnedPool).ToList();
+        Config.Tabs.RemoveAll(TabLifecycleHelpers.ShouldStripOnSave);

        Interface.SavePluginConfig(Config);

-        Config.Tabs.Clear();
-        Config.Tabs.AddRange(snapshot);
+        Config.Tabs.AddRange(unpinnedTempTabs);
    }

    internal void LanguageChanged(string langCode)
@@ -0,0 +1,199 @@
+using Dalamud.Interface.ImGuiFileDialog;
+using Dalamud.Plugin;
+using Dalamud.Plugin.Services;
+using HellionChat.Infrastructure.Hosting;
+using HellionChat.Infrastructure.Logging;
+using HellionChat.Ipc;
+using HellionChat.Themes;
+using HellionChat.Ui;
+using HellionChat.Util;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace HellionChat;
+
+// Builds the generic-host DI container that drives v1.5.0+. The factory is
+// invoked synchronously from Plugin.ctor (after the schema gate clears) so the
+// container exists before PluginLifecycle.LoadAsync runs. See plan §1 for the
+// deliberate divergence from Lightless' deferred Func-delegate pattern.
+internal static class PluginHostFactory
+{
+    public static IHost Build(Plugin plugin, PluginHostDependencies dependencies)
+    {
+        return new HostBuilder()
+            .UseContentRoot(dependencies.PluginInterface.ConfigDirectory.FullName)
+            .ConfigureLogging(logging =>
+            {
+                logging.ClearProviders();
+                logging.AddDalamudLogging(dependencies.PluginLog);
+                logging.SetMinimumLevel(LogLevel.Trace);
+            })
+            .ConfigureServices(services => ConfigureServices(services, plugin, dependencies))
+            .Build();
+    }
+
+    private static void ConfigureServices(
+        IServiceCollection services,
+        Plugin plugin,
+        PluginHostDependencies dependencies
+    )
+    {
+        // Block A — Dalamud services (21 [PluginService] singletons).
+        services.AddSingleton(dependencies);
+        services.AddSingleton(dependencies.PluginInterface);
+        services.AddSingleton(dependencies.PluginLog);
+        services.AddSingleton(dependencies.ChatGui);
+        services.AddSingleton(dependencies.ClientState);
+        services.AddSingleton(dependencies.CommandManager);
+        services.AddSingleton(dependencies.Condition);
+        services.AddSingleton(dependencies.DataManager);
+        services.AddSingleton(dependencies.Framework);
+        services.AddSingleton(dependencies.GameGui);
+        services.AddSingleton(dependencies.KeyState);
+        services.AddSingleton(dependencies.ObjectTable);
+        services.AddSingleton(dependencies.PartyList);
+        services.AddSingleton(dependencies.TargetManager);
+        services.AddSingleton(dependencies.TextureProvider);
+        services.AddSingleton(dependencies.GameInteropProvider);
+        services.AddSingleton(dependencies.GameConfig);
+        services.AddSingleton(dependencies.Notification);
+        services.AddSingleton(dependencies.AddonLifecycle);
+        services.AddSingleton(dependencies.PlayerState);
+        services.AddSingleton(dependencies.Evaluator);
+        services.AddSingleton(dependencies.SelfTestRegistry);
+
+        // Self-references: Plugin and its WindowSystem already exist.
+        services.AddSingleton(plugin);
+        services.AddSingleton(plugin.WindowSystem);
+        services.AddSingleton<PluginLifecycle>();
+
+        // Block B — HellionChat singletons. Factory lambdas because most
+        // classes are internal-sealed and the default activator only sees
+        // public ctors.
+        services.AddSingleton<IPlatformUtil>(_ => new DalamudPlatformUtil());
+        services.AddSingleton<IPluginLogProxy>(sp => new DalamudPluginLogProxy(
+            sp.GetRequiredService<IPluginLog>()
+        ));
+        services.AddSingleton<FileDialogManager>(_ => new FileDialogManager());
+        services.AddSingleton(sp => new Commands(sp.GetRequiredService<ILogger<Commands>>()));
+        services.AddSingleton(_ => new FontManager());
+        services.AddSingleton(_ => new StatusBar());
+        services.AddSingleton(sp => new IpcManager(sp.GetRequiredService<ILogger<IpcManager>>()));
+        services.AddSingleton(sp => new ExtraChat(sp.GetRequiredService<ILogger<ExtraChat>>()));
+
+        services.AddSingleton(sp => new ThemeRegistry(
+            Path.Combine(
+                sp.GetRequiredService<IDalamudPluginInterface>().ConfigDirectory.FullName,
+                "themes"
+            ),
+            sp.GetRequiredService<ILogger<ThemeRegistry>>()
+        ));
+
+        services.AddSingleton(sp => new GameFunctions.GameFunctions(
+            sp.GetRequiredService<Plugin>(),
+            sp.GetRequiredService<ILogger<GameFunctions.GameFunctions>>(),
+            sp.GetRequiredService<ILoggerFactory>()
+        ));
+        services.AddSingleton(sp => new TypingIpc(
+            sp.GetRequiredService<Plugin>(),
+            sp.GetRequiredService<ILogger<TypingIpc>>()
+        ));
+
+        services.AddSingleton(sp => new Integrations.HonorificService(
+            sp.GetRequiredService<IDalamudPluginInterface>(),
+            sp.GetRequiredService<ILogger<Integrations.HonorificService>>(),
+            sp.GetRequiredService<IFramework>()
+        ));
+
+        services.AddSingleton(sp => new MessageManager(
+            sp.GetRequiredService<Plugin>(),
+            sp.GetRequiredService<ILogger<MessageManager>>(),
+            sp.GetRequiredService<ILoggerFactory>()
+        ));
+
+        // MessageStore is allocated inside MessageManager.ctor; a separate
+        // container singleton would double-construct the SQLite handle.
+        services.AddSingleton(sp =>
+        {
+            var pluginRef = sp.GetRequiredService<Plugin>();
+            var manager = sp.GetRequiredService<MessageManager>();
+            return new AutoTellTabsService(
+                pluginRef,
+                manager,
+                manager.Store,
+                sp.GetRequiredService<ILogger<AutoTellTabsService>>()
+            );
+        });
+
+        // Block C — Windows. WindowSystem.AddWindow is called from
+        // PluginLifecycle.LoadAsync on the framework thread.
+        services.AddSingleton(sp => new ChatLogWindow(
+            sp.GetRequiredService<Plugin>(),
+            sp.GetRequiredService<ILogger<ChatLogWindow>>(),
+            sp.GetRequiredService<ILoggerFactory>()
+        ));
+        services.AddSingleton(sp => new SettingsWindow(
+            sp.GetRequiredService<Plugin>(),
+            sp.GetRequiredService<ILoggerFactory>()
+        ));
+        services.AddSingleton(sp => new DbViewer(
+            sp.GetRequiredService<Plugin>(),
+            sp.GetRequiredService<ILogger<DbViewer>>()
+        ));
+        services.AddSingleton(sp => new InputPreview(sp.GetRequiredService<ChatLogWindow>()));
+        services.AddSingleton(sp => new CommandHelpWindow(sp.GetRequiredService<ChatLogWindow>()));
+        services.AddSingleton(sp => new SeStringDebugger(sp.GetRequiredService<Plugin>()));
+        services.AddSingleton(sp => new DebuggerWindow(sp.GetRequiredService<Plugin>()));
+        services.AddSingleton(sp => new FirstRunWizard(sp.GetRequiredService<Plugin>()));
+
+        // Hosted-service adapters: thin wrappers around the existing init
+        // methods so the service class bodies stay unchanged.
+        services.AddHostedService(sp => new FontManagerInitHostedService(
+            sp.GetRequiredService<FontManager>()
+        ));
+        services.AddHostedService(sp => new ThemeRegistryInitHostedService(
+            sp.GetRequiredService<ThemeRegistry>()
+        ));
+        services.AddHostedService(sp => new IpcManagerInitHostedService(
+            sp.GetRequiredService<IpcManager>()
+        ));
+        services.AddHostedService(sp => new TypingIpcInitHostedService(
+            sp.GetRequiredService<TypingIpc>()
+        ));
+        services.AddHostedService(sp => new ExtraChatInitHostedService(
+            sp.GetRequiredService<ExtraChat>()
+        ));
+        services.AddHostedService(sp => new MessageManagerInitHostedService(
+            sp.GetRequiredService<IDalamudPluginInterface>(),
+            sp.GetRequiredService<MessageManager>()
+        ));
+        services.AddHostedService(sp => new AutoTellTabsServiceInitHostedService(
+            sp.GetRequiredService<AutoTellTabsService>()
+        ));
+    }
+}
+
+internal sealed record PluginHostDependencies(
+    IDalamudPluginInterface PluginInterface,
+    IPluginLog PluginLog,
+    IChatGui ChatGui,
+    IClientState ClientState,
+    ICommandManager CommandManager,
+    ICondition Condition,
+    IDataManager DataManager,
+    IFramework Framework,
+    IGameGui GameGui,
+    IKeyState KeyState,
+    IObjectTable ObjectTable,
+    IPartyList PartyList,
+    ITargetManager TargetManager,
+    ITextureProvider TextureProvider,
+    IGameInteropProvider GameInteropProvider,
+    IGameConfig GameConfig,
+    INotificationManager Notification,
+    IAddonLifecycle AddonLifecycle,
+    IPlayerState PlayerState,
+    ISeStringEvaluator Evaluator,
+    ISelfTestRegistry SelfTestRegistry
+);
@@ -0,0 +1,143 @@
+using System.Runtime.ExceptionServices;
+using Dalamud.Plugin.Services;
+using Microsoft.Extensions.Hosting;
+
+namespace HellionChat;
+
+// Orchestrates Host.StartAsync / StopAsync and the framework-thread dispose.
+// Plugin.ctor builds the host and assigns it via the Host property, so
+// PluginLifecycle never constructs the host itself.
+internal sealed class PluginLifecycle : IAsyncDisposable
+{
+    private readonly IFramework _framework;
+    private readonly Plugin _plugin;
+
+    private int _disposeStarted;
+    private bool _hostStartRequested;
+
+    public PluginLifecycle(IFramework framework, Plugin plugin)
+    {
+        _framework = framework;
+        _plugin = plugin;
+    }
+
+    // Plugin.ctor fills this immediately after PluginHostFactory.Build and
+    // before invoking LoadAsync; LoadAsync may NRE-suppress on Host! safely.
+    public IHost? Host { get; set; }
+
+    public async Task LoadAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+
+        try
+        {
+            _hostStartRequested = true;
+            await Host!.StartAsync(cancellationToken).ConfigureAwait(false);
+
+            // WindowSystem.AddWindow mutates an internal List<>; v1.4.9 Stage-2
+            // verified the list is non-thread-safe, so we marshal the entire
+            // registration block to the framework thread.
+            await _framework
+                .RunOnFrameworkThread(() => RegisterWindows(_plugin))
+                .ConfigureAwait(false);
+        }
+        catch
+        {
+            try
+            {
+                await DisposeAsync().ConfigureAwait(false);
+            }
+            catch
+            {
+                // Swallow secondary dispose failure so the original load throw wins.
+            }
+
+            throw;
+        }
+    }
+
+    private static void RegisterWindows(Plugin plugin)
+    {
+        plugin.WindowSystem.AddWindow(plugin.ChatLogWindow);
+        plugin.WindowSystem.AddWindow(plugin.SettingsWindow);
+        plugin.WindowSystem.AddWindow(plugin.DbViewer);
+        plugin.WindowSystem.AddWindow(plugin.InputPreview);
+        plugin.WindowSystem.AddWindow(plugin.CommandHelpWindow);
+        plugin.WindowSystem.AddWindow(plugin.SeStringDebugger);
+        plugin.WindowSystem.AddWindow(plugin.DebuggerWindow);
+        plugin.WindowSystem.AddWindow(plugin.FirstRunWizard);
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        // Idempotency guard — Dalamud may fire DisposeAsync twice in a reload race.
+        if (Interlocked.Exchange(ref _disposeStarted, 1) != 0)
+            return;
+
+        Exception? failure = null;
+
+        if (_hostStartRequested && Host is not null)
+            failure = await CaptureFailureAsync(failure, () => Host.StopAsync())
+                .ConfigureAwait(false);
+
+        failure = await DisposeHostOnFrameworkThreadAsync(failure).ConfigureAwait(false);
+
+        ThrowIfFailed(failure);
+    }
+
+    private async Task<Exception?> DisposeHostOnFrameworkThreadAsync(Exception? failure)
+    {
+        try
+        {
+            await _framework
+                .RunOnFrameworkThread(() =>
+                {
+                    failure = CaptureFailure(failure, () => Host?.Dispose());
+                })
+                .ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            failure ??= ex;
+        }
+
+        return failure;
+    }
+
+    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 ThrowIfFailed(Exception? failure)
+    {
+        if (failure is not null)
+            ExceptionDispatchInfo.Capture(failure).Throw();
+    }
+}
@@ -4,10 +4,15 @@ namespace HellionChat.Privacy;

 internal static class PrivacyDefaults
 {
-    // Privacy-First default whitelist (DSGVO Art. 25 - Privacy by Default).
-    // Only the player's own conversations are persisted out-of-the-box.
-    // Public chat (Say/Shout/Yell), Novice Network, NPC dialogue, system
-    // logs and battle messages are NOT persisted unless the user opts in.
+    // F3.1: failsafe for ChatTypes added by future FFXIV patches. New installs
+    // persist unknown channels so a major patch's added ChatType isn't silently
+    // dropped before the user can opt in or out. Existing configs keep their
+    // explicit choice — see Configuration.cs PrivacyPersistUnknownChannels.
+    internal const bool DefaultPersistUnknownChannels = true;
+
+    // DSGVO Art. 25 (Privacy by Default): only the player's own conversations
+    // are persisted out-of-the-box. Public chat, NPC dialogue, system logs and
+    // battle messages require explicit opt-in.
    internal static readonly IReadOnlySet<ChatType> PrivacyFirstWhitelist = new HashSet<ChatType>
    {
        ChatType.TellIncoming,
@@ -42,10 +47,8 @@ internal static class PrivacyDefaults
        ChatType.ExtraChatLinkshell8,
    };

-    // Default retention windows per channel (in days). Channels not listed
-    // here fall back to Configuration.RetentionDefaultDays. Reflects the
-    // design spec: Tells 365, own-conversation channels 90, everything else
-    // shorter via the global default.
+    // Per-channel retention in days. Unlisted channels fall back to
+    // Configuration.RetentionDefaultDays. Tells: 365, everything else: 90.
    internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays =
        new Dictionary<ChatType, int>
        {
@@ -86,10 +89,9 @@ internal static class PrivacyDefaults
            [ChatType.ExtraChatLinkshell8] = 90,
        };

-    // Casual profile = Privacy-First plus public chat (Say/Shout/Yell, both
-    // emote types, Novice Network), kept for a short 24-hour window so the
-    // last RP scene or shout trade is still searchable but third-party data
-    // doesn't accumulate forever.
+    // Casual: Privacy-First + public chat (Say/Shout/Yell, emotes, Novice
+    // Network) with a 1-day window so recent RP/trade is searchable but
+    // third-party data doesn't accumulate.
    internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(
        PrivacyFirstWhitelist
    )
@@ -114,6 +114,8 @@ internal class HellionStrings
    internal static string Wizard_Profile_FullHistory_GdprWarning => Get(nameof(Wizard_Profile_FullHistory_GdprWarning));
    internal static string Wizard_Profile_FullHistory_Apply => Get(nameof(Wizard_Profile_FullHistory_Apply));
    internal static string Wizard_Reopen_Button => Get(nameof(Wizard_Reopen_Button));
+    internal static string Wizard_Cancel_Label => Get(nameof(Wizard_Cancel_Label));
+    internal static string Wizard_Cancel_Tooltip => Get(nameof(Wizard_Cancel_Tooltip));

    internal static string Export_Heading => Get(nameof(Export_Heading));
    internal static string Export_Help => Get(nameof(Export_Help));
@@ -168,6 +170,16 @@ internal class HellionStrings
    internal static string AutoTellTabs_HistoryLoadError => Get(nameof(AutoTellTabs_HistoryLoadError));
    internal static string AutoTellTabs_GreetedTooltip => Get(nameof(AutoTellTabs_GreetedTooltip));
    internal static string AutoTellTabs_UnGreetedTooltip => Get(nameof(AutoTellTabs_UnGreetedTooltip));
+    internal static string PinTab_MenuPin => Get(nameof(PinTab_MenuPin));
+    internal static string PinTab_MenuUnpin => Get(nameof(PinTab_MenuUnpin));
+    internal static string PinTab_MenuPromote => Get(nameof(PinTab_MenuPromote));
+    internal static string PinTab_PromoteTooltip => Get(nameof(PinTab_PromoteTooltip));
+    internal static string PinTab_LimitReached => Get(nameof(PinTab_LimitReached));
+    internal static string PinTab_PinnedTooltip => Get(nameof(PinTab_PinnedTooltip));
+    internal static string PinTab_PinTooltip => Get(nameof(PinTab_PinTooltip));
+    internal static string PinTab_SectionHeader => Get(nameof(PinTab_SectionHeader));
+    internal static string Settings_ThemeAndLayout_SidebarWidth_Name => Get(nameof(Settings_ThemeAndLayout_SidebarWidth_Name));
+    internal static string Settings_ThemeAndLayout_SidebarWidth_Description => Get(nameof(Settings_ThemeAndLayout_SidebarWidth_Description));

    // Hellion Chat — Auto-Tell-Tabs Chat settings tab
    internal static string ChatLog_AutoTellTabs_Section_Title => Get(nameof(ChatLog_AutoTellTabs_Section_Title));
@@ -258,6 +270,10 @@ internal class HellionStrings
    internal static string Settings_Chat_Preview_Heading => Get(nameof(Settings_Chat_Preview_Heading));
    internal static string Settings_Chat_Emotes_Heading => Get(nameof(Settings_Chat_Emotes_Heading));

+    // Hellion Chat — Chat-Tab SymbolPicker
+    internal static string Settings_Chat_SymbolPicker_Enable_Name => Get(nameof(Settings_Chat_SymbolPicker_Enable_Name));
+    internal static string Settings_Chat_SymbolPicker_Enable_Description => Get(nameof(Settings_Chat_SymbolPicker_Enable_Description));
+
    // Hellion Chat — Database-Tab section headings
    internal static string Settings_Database_Storage_Heading => Get(nameof(Settings_Database_Storage_Heading));
    internal static string Settings_Database_Viewer_Heading => Get(nameof(Settings_Database_Viewer_Heading));
@@ -368,6 +384,8 @@ internal class HellionStrings
    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_Glow_Toggle => Get(nameof(Settings_Integrations_Honorific_Glow_Toggle));
+    internal static string Settings_Integrations_Honorific_Glow_Hint => Get(nameof(Settings_Integrations_Honorific_Glow_Hint));
    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));
@@ -388,4 +406,9 @@ internal class HellionStrings

    // Hellion Chat — v1.3.0 Honorific title slot tooltip
    internal static string ChatHeader_HonorificTitle_Tooltip => Get(nameof(ChatHeader_HonorificTitle_Tooltip));
+
+    // Hellion Chat — v1.4.8 DbViewer full-text search toggle
+    internal static string DbViewer_FullTextToggle => Get(nameof(DbViewer_FullTextToggle));
+    internal static string DbViewer_FullTextToggle_Hint_Indexing => Get(nameof(DbViewer_FullTextToggle_Hint_Indexing));
+    internal static string DbViewer_FullTextToggle_Hint_PhraseMode => Get(nameof(DbViewer_FullTextToggle_Hint_PhraseMode));
 }
@@ -222,6 +222,12 @@
  <data name="Wizard_Reopen_Button" xml:space="preserve">
    <value>Wizard erneut zeigen</value>
  </data>
+  <data name="Wizard_Cancel_Label" xml:space="preserve">
+    <value>Später — Defaults behalten</value>
+  </data>
+  <data name="Wizard_Cancel_Tooltip" xml:space="preserve">
+    <value>Schließt den Wizard ohne Profil-Auswahl. Die Plugin-Defaults bleiben aktiv und der Wizard erscheint beim nächsten Plugin-Reload erneut.</value>
+  </data>
  <data name="Export_Heading" xml:space="preserve">
    <value>Export (DSGVO Art. 15 — Auskunftsrecht)</value>
  </data>
@@ -377,6 +383,36 @@
  <data name="AutoTellTabs_UnGreetedTooltip" xml:space="preserve">
    <value>Als begrüßt markieren.</value>
  </data>
+  <data name="PinTab_MenuPin" xml:space="preserve">
+    <value>Tab anpinnen</value>
+  </data>
+  <data name="PinTab_MenuUnpin" xml:space="preserve">
+    <value>Tab lösen</value>
+  </data>
+  <data name="PinTab_MenuPromote" xml:space="preserve">
+    <value>In Standard-Tab umwandeln</value>
+  </data>
+  <data name="PinTab_PromoteTooltip" xml:space="preserve">
+    <value>Wandelt den TempTell in einen regulären Tab um. Die Tell-Bindung an die Person geht verloren, der Tab fängt dann Nachrichten anhand der Channel-Filter ein. Für „Tab überlebt Relog" stattdessen „Tab anpinnen" wählen.</value>
+  </data>
+  <data name="PinTab_LimitReached" xml:space="preserve">
+    <value>Maximal {0} angepinnte Tell-Tabs erreicht. Erst einen lösen oder dauerhaft behalten.</value>
+  </data>
+  <data name="PinTab_PinnedTooltip" xml:space="preserve">
+    <value>Angepinnt — überlebt Relog.</value>
+  </data>
+  <data name="PinTab_PinTooltip" xml:space="preserve">
+    <value>Angepinnte Tabs überleben Relog und behalten die Bindung an die Tell-Person.</value>
+  </data>
+  <data name="PinTab_SectionHeader" xml:space="preserve">
+    <value>Angepinnt</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_SidebarWidth_Name" xml:space="preserve">
+    <value>Sidebar-Breite</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_SidebarWidth_Description" xml:space="preserve">
+    <value>Breite der Tab-Sidebar in Pixeln. Default (44 px) ist Icon-only; breiter machen damit Sektion-Header wie „Aktive Tells (3)" nicht abgeschnitten werden.</value>
+  </data>

  <!-- Hellion Chat — Auto-Tell-Tabs (Chat-Einstellungstab) -->
  <data name="ChatLog_AutoTellTabs_Section_Title" xml:space="preserve">
@@ -392,7 +428,7 @@
    <value>Maximale Anzahl der Auto-Tell-Tabs</value>
  </data>
  <data name="ChatLog_AutoTellTabs_Limit_Description" xml:space="preserve">
-    <value>Beim Erreichen werden begrüßte Tabs mit der ältesten Aktivität zuerst geschlossen. Änderungen greifen beim nächsten /tell.</value>
+    <value>Beim Erreichen werden begrüßte Tabs mit der ältesten Aktivität zuerst geschlossen. Änderungen greifen beim nächsten /tell. Diese Grenze gilt nur für den automatisch verwalteten Pool. Angepinnte Tell-Tabs (Rechtsklick → Tab anpinnen) leben in einem separaten Pool von bis zu 5 Tabs und überleben Relog.</value>
  </data>
  <data name="ChatLog_AutoTellTabs_Compact_Name" xml:space="preserve">
    <value>Kompakte Anzeige</value>
@@ -520,6 +556,14 @@
    <value>Emotes</value>
  </data>

+  <!-- Hellion Chat — Chat-Tab SymbolPicker -->
+  <data name="Settings_Chat_SymbolPicker_Enable_Name" xml:space="preserve">
+    <value>Symbol-Picker-Button neben dem Chat-Eingang anzeigen</value>
+  </data>
+  <data name="Settings_Chat_SymbolPicker_Enable_Description" xml:space="preserve">
+    <value>Fügt einen kleinen Button links neben dem Kanal-Indikator ein. Klick öffnet ein Popup mit FFXIV-Glyphen und einer kuratierten Symbol-Liste. Ausschalten für eine schlankere Eingabezeile.</value>
+  </data>
+
  <!-- Hellion Chat — Sektions-Überschriften des Database-Tabs -->
  <data name="Settings_Database_Storage_Heading" xml:space="preserve">
    <value>Speicherung</value>
@@ -639,7 +683,7 @@
    <value>Allgemein</value>
  </data>
  <data name="Settings_Card_General_Subtext" xml:space="preserve">
-    <value>Plugin-globale Einstellungen — Sprache, Eingabe, Audio, Performance.</value>
+    <value>Sprache, Eingabe, Audio und Performance.</value>
  </data>
  <data name="Settings_Card_Appearance_Title" xml:space="preserve">
    <value>Erscheinungsbild</value>
@@ -657,25 +701,25 @@
    <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>
+    <value>Wann das Fenster sichtbar ist und ob es sich bewegen lässt.</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>
+    <value>Tells, Vorschau, Nachrichten-Verhalten und 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>
+    <value>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>
+    <value>Privacy-Filter pro Channel und was gespeichert werden darf.</value>
  </data>
  <data name="Settings_Card_Database_Title" xml:space="preserve">
    <value>Datenbank</value>
@@ -687,7 +731,7 @@
    <value>Information</value>
  </data>
  <data name="Settings_Card_Information_Subtext" xml:space="preserve">
-    <value>Über das Plugin — Version, Mission, Lizenz, Changelog.</value>
+    <value>Version, Mission, Lizenz und Changelog.</value>
  </data>
  <data name="Settings_Tab_Themes" xml:space="preserve">
    <value>Themes</value>
@@ -732,25 +776,25 @@
    <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>
+    <value>Theme, Fenster-Rahmen und 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>
+    <value>Schriftart, Schriftgröße und 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>
+    <value>Aufbewahrung, Aufräumen, Export und Datenbank-Statistiken.</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>
+    <value>Andere Dalamud-Plugins, mit denen HellionChat zusammenarbeitet. Kommende Integrationen in der Vorschau.</value>
  </data>
  <data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve">
    <value>Theme</value>
@@ -821,6 +865,12 @@
  <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_Glow_Toggle" xml:space="preserve">
+    <value>Glow-Outline rendern (Honorific)</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Glow_Hint" xml:space="preserve">
+    <value>Kann die Framerate auf schwacher Hardware drücken. Rendert die Glow-Outline für Honorific-Titel, die sie nutzen. Gradient-Animation wird noch nicht unterstützt und wird stattdessen als Primärfarbe gezeichnet.</value>
+  </data>
  <data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve">
    <value>Honorific auf GitHub</value>
  </data>
@@ -875,4 +925,13 @@
  <data name="ChatHeader_HonorificTitle_Tooltip" xml:space="preserve">
    <value>Custom-Titel von Honorific</value>
  </data>
+  <data name="DbViewer_FullTextToggle" xml:space="preserve">
+    <value>Volltext-Suche</value>
+  </data>
+  <data name="DbViewer_FullTextToggle_Hint_Indexing" xml:space="preserve">
+    <value>Der Volltext-Index wird noch gebaut. Die lokale Suche bleibt verfügbar.</value>
+  </data>
+  <data name="DbViewer_FullTextToggle_Hint_PhraseMode" xml:space="preserve">
+    <value>Sucht nach der exakten Wortfolge. Mehrere Wörter werden nur gefunden, wenn sie zusammen und in dieser Reihenfolge stehen. Wer rohe FTS5-MATCH-Syntax nutzen will, setzt eigene Anführungszeichen um den Suchbegriff.</value>
+  </data>
 </root>
@@ -19,28 +19,28 @@
    <value>Enable privacy filter</value>
  </data>
  <data name="Privacy_FilterEnabled_Description" xml:space="preserve">
-    <value>When enabled, only messages from whitelisted channels are persisted to the database. Disabling restores the original behavior (everything except battle messages is stored).</value>
+    <value>When enabled, only messages from allowed channels are written to the database. When disabled, the default behaviour applies — everything except battle logs is stored.</value>
  </data>
  <data name="Privacy_FilterEnabled_StorageOnly_Help" xml:space="preserve">
-    <value>The filter only controls what is written to the local database. The chat log itself keeps showing every message live, disallowed channels just stop being saved. Use the channel hide options in your in-game chat tabs if you want to remove channels from the visible chat.</value>
+    <value>The filter only controls what is written to the local database. The chat log still shows every message live; excluded channels are simply no longer stored. If you also want to remove channels from the visible display, use the normal chat-tab filters in the game.</value>
  </data>
  <data name="Privacy_Filter_Tree_Heading" xml:space="preserve">
    <value>Privacy filter and whitelist</value>
  </data>
  <data name="Privacy_Whitelist_Help" xml:space="preserve">
-    <value>Pick which channels are stored in the local database. Privacy-First default: only your own conversations. Use the buttons below to apply a preset.</value>
+    <value>Choose which channels are saved to the local database. Default follows data minimisation: only your own conversations. Use the buttons below to apply a preset.</value>
  </data>
  <data name="Privacy_Preset_PrivacyFirst" xml:space="preserve">
-    <value>Privacy-First (recommended)</value>
+    <value>Data minimisation (recommended)</value>
  </data>
  <data name="Privacy_Preset_ClearAll" xml:space="preserve">
-    <value>Clear all</value>
+    <value>Deselect all</value>
  </data>
  <data name="Privacy_Preset_SelectAll" xml:space="preserve">
    <value>Select all</value>
  </data>
  <data name="Privacy_Group_DirectMessages" xml:space="preserve">
-    <value>Direct Messages</value>
+    <value>Direct messages</value>
  </data>
  <data name="Privacy_Group_PartyAlliance" xml:space="preserve">
    <value>Party &amp; Alliance</value>
@@ -55,52 +55,52 @@
    <value>Cross-World Linkshells</value>
  </data>
  <data name="Privacy_Group_ExtraChat" xml:space="preserve">
-    <value>ExtraChat (Encrypted)</value>
+    <value>ExtraChat (encrypted)</value>
  </data>
  <data name="Privacy_Group_PublicChat" xml:space="preserve">
-    <value>Public Chat (third-party data)</value>
+    <value>Public chat (third-party data)</value>
  </data>
  <data name="Privacy_Group_SystemLogs" xml:space="preserve">
-    <value>System &amp; Game Logs</value>
+    <value>System &amp; game logs</value>
  </data>
  <data name="Privacy_PersistUnknown_Name" xml:space="preserve">
-    <value>Persist unknown channel types</value>
+    <value>Save unknown channel types</value>
  </data>
  <data name="Privacy_PersistUnknown_Description" xml:space="preserve">
-    <value>Failsafe for ChatTypes added by future FFXIV patches that this plugin does not yet know about. Default OFF (Privacy-First). Turn ON if you want a complete log including future channels.</value>
+    <value>Safety net for ChatTypes added by future FFXIV patches that the plugin does not yet know about. Default is OFF (data minimisation). Enable if you want future channels to be fully logged as well.</value>
  </data>
  <data name="Cleanup_Heading" xml:space="preserve">
    <value>Apply filter to existing database</value>
  </data>
  <data name="Cleanup_Help_Intro" xml:space="preserve">
-    <value>The privacy filter only applies to new messages. Use the cleanup below to retroactively remove already-stored messages that don't match your saved whitelist.</value>
+    <value>The privacy filter only affects new messages. The cleanup below lets you retroactively remove already-stored messages that do not match your saved whitelist.</value>
  </data>
  <data name="Cleanup_Help_SavedNote" xml:space="preserve">
-    <value>Cleanup uses your SAVED whitelist (Plugin.Config), not unsaved edits above. Click Save first if you want to apply your current edits.</value>
+    <value>Cleanup uses your SAVED whitelist (Plugin.Config), not unsaved changes above. Click Save first if you want your current changes to be applied.</value>
  </data>
  <data name="Retention_Help_SavedNote" xml:space="preserve">
-    <value>The manual sweep uses your SAVED retention policy, not the slider values above. Click Save first if you want the run to apply your current edits.</value>
+    <value>The manual run uses your SAVED retention policy, not the slider values above. Click Save first if you want the run to apply your current changes.</value>
  </data>
  <data name="Cleanup_Preview_Stale" xml:space="preserve">
-    <value>Preview is out of date — your whitelist has changed since the last refresh. Click Refresh to recalculate.</value>
+    <value>Preview is stale — your whitelist has changed since the last refresh. Click Refresh to recalculate.</value>
  </data>
  <data name="Cleanup_RefreshPreview" xml:space="preserve">
    <value>Refresh preview</value>
  </data>
  <data name="Cleanup_NoPreview" xml:space="preserve">
-    <value>No preview yet. Click Refresh to compute the impact.</value>
+    <value>No preview yet. Click Refresh to calculate the impact.</value>
  </data>
  <data name="Cleanup_TotalStored" xml:space="preserve">
    <value>Total stored messages: {0:N0}</value>
  </data>
  <data name="Cleanup_WillKeep" xml:space="preserve">
-    <value>Will keep:    {0:N0}</value>
+    <value>Keep:    {0:N0}</value>
  </data>
  <data name="Cleanup_WillDelete" xml:space="preserve">
-    <value>Will delete:  {0:N0}</value>
+    <value>Delete:  {0:N0}</value>
  </data>
  <data name="Cleanup_Breakdown" xml:space="preserve">
-    <value>Per-channel breakdown</value>
+    <value>Breakdown by channel</value>
  </data>
  <data name="Cleanup_Marker_Keep" xml:space="preserve">
    <value>[KEEP]  </value>
@@ -112,46 +112,46 @@
    <value>Apply current filter to database</value>
  </data>
  <data name="Cleanup_Apply_Tooltip" xml:space="preserve">
-    <value>Ctrl+Shift: Hard-deletes {0:N0} messages, then runs VACUUM. Cannot be undone.</value>
+    <value>Ctrl+Shift: Permanently deletes {0:N0} messages and runs VACUUM afterwards. Cannot be undone.</value>
  </data>
  <data name="Cleanup_Running" xml:space="preserve">
-    <value>Cleanup running in background…</value>
+    <value>Cleanup running in the background…</value>
  </data>
  <data name="Cleanup_PreviewError" xml:space="preserve">
-    <value>Failed to compute cleanup preview, see /xllog</value>
+    <value>Preview could not be calculated, see /xllog</value>
  </data>
  <data name="Cleanup_Success" xml:space="preserve">
-    <value>Privacy cleanup complete: {0:N0} messages removed.</value>
+    <value>Cleanup complete, {0:N0} messages removed.</value>
  </data>
  <data name="Cleanup_Error" xml:space="preserve">
-    <value>Privacy cleanup failed, see /xllog</value>
+    <value>Cleanup failed, see /xllog</value>
  </data>
  <data name="Retention_Heading" xml:space="preserve">
    <value>Message retention</value>
  </data>
  <data name="Retention_Enabled_Name" xml:space="preserve">
-    <value>Auto-delete messages after a per-channel retention window</value>
+    <value>Automatically delete messages past their channel retention window</value>
  </data>
  <data name="Retention_Enabled_Description" xml:space="preserve">
-    <value>When enabled, messages older than the configured window are deleted on every plugin start (at most once per 24 hours). Off by default. The plugin never deletes history without your explicit consent.</value>
+    <value>When enabled, messages older than the configured window are deleted on each plugin start (at most once every 24 hours). Default is OFF — the plugin never deletes anything without your explicit consent.</value>
  </data>
  <data name="Retention_Default_Label" xml:space="preserve">
    <value>Default retention (days, 0 = never)</value>
  </data>
  <data name="Retention_Default_Help" xml:space="preserve">
-    <value>Applies to channels without an explicit override below.</value>
+    <value>Applies to channels that have no individual override below.</value>
  </data>
  <data name="Retention_Reset_Spec" xml:space="preserve">
    <value>Reset overrides to spec defaults</value>
  </data>
  <data name="Retention_Clear_Overrides" xml:space="preserve">
-    <value>Clear all overrides</value>
+    <value>Remove all overrides</value>
  </data>
  <data name="Retention_Tree_Heading" xml:space="preserve">
-    <value>Per-channel retention overrides</value>
+    <value>Retention per channel</value>
  </data>
  <data name="Retention_Tag_Override" xml:space="preserve">
-    <value>[override]</value>
+    <value>[custom]</value>
  </data>
  <data name="Retention_Tag_Spec" xml:space="preserve">
    <value>[spec]</value>
@@ -163,13 +163,13 @@
    <value>reset</value>
  </data>
  <data name="Retention_Apply_Label" xml:space="preserve">
-    <value>Apply retention policy now</value>
+    <value>Apply retention now</value>
  </data>
  <data name="Retention_Apply_Tooltip" xml:space="preserve">
-    <value>Ctrl+Shift: runs the retention sweep immediately using the SAVED policy. Save your changes first.</value>
+    <value>Ctrl+Shift: Runs the retention cleanup immediately using the SAVED policy. Save your changes first.</value>
  </data>
  <data name="Retention_Running" xml:space="preserve">
-    <value>Retention sweep running in background…</value>
+    <value>Retention cleanup running in the background…</value>
  </data>
  <data name="Retention_LastRun_Never" xml:space="preserve">
    <value>Last run: never</value>
@@ -178,67 +178,73 @@
    <value>Last run: {0:yyyy-MM-dd HH:mm}</value>
  </data>
  <data name="Retention_Success" xml:space="preserve">
-    <value>Retention sweep complete: {0:N0} messages removed.</value>
+    <value>Retention cleanup complete, {0:N0} messages removed.</value>
  </data>
  <data name="Retention_Error" xml:space="preserve">
-    <value>Retention sweep failed, see /xllog</value>
+    <value>Retention cleanup failed, see /xllog</value>
  </data>
  <data name="Wizard_Title" xml:space="preserve">
    <value>Hellion Chat — Welcome</value>
  </data>
  <data name="Wizard_Intro" xml:space="preserve">
-    <value>Pick a starting profile. You can change anything later under Settings → Privacy.</value>
+    <value>Choose a starting profile. You can adjust everything later under Settings → Privacy.</value>
  </data>
  <data name="Wizard_Profile_PrivacyFirst_Heading" xml:space="preserve">
-    <value>Privacy-First (recommended)</value>
+    <value>Data minimisation (recommended)</value>
  </data>
  <data name="Wizard_Profile_PrivacyFirst_Description" xml:space="preserve">
-    <value>Only your own conversations are stored: Tells, Party, FC, Linkshells, Cross-World Linkshells, Alliance and ExtraChat. Public chat, NPC dialogue and system spam are dropped at the storage layer. Retention follows the spec defaults (Tells 365 days, own-conversation channels 90 days).</value>
+    <value>Only your own conversations are stored: tells, party, FC, linkshells, cross-world linkshells, alliance, and ExtraChat. Public chat, NPC dialogues, and system spam are discarded at the storage level. Retention follows spec defaults (tells 365 days, own conversation channels 90 days).</value>
  </data>
  <data name="Wizard_Profile_PrivacyFirst_Apply" xml:space="preserve">
-    <value>Use Privacy-First</value>
+    <value>Apply data minimisation</value>
  </data>
  <data name="Wizard_Profile_Casual_Heading" xml:space="preserve">
    <value>Casual</value>
  </data>
  <data name="Wizard_Profile_Casual_Description" xml:space="preserve">
-    <value>Privacy-First plus a 24-hour window for public chat (Say, Shout, Yell, both emote types, Novice Network). For RP players who want to look up the last scene without keeping public chat forever.</value>
+    <value>Data minimisation plus a 24-hour window for public chat (say, shout, yell, both emote types, novice network). For RP players who want to re-read the last scene without keeping public chat forever.</value>
  </data>
  <data name="Wizard_Profile_Casual_Apply" xml:space="preserve">
-    <value>Use Casual</value>
+    <value>Apply casual</value>
  </data>
  <data name="Wizard_Profile_FullHistory_Heading" xml:space="preserve">
-    <value>Full History</value>
+    <value>Full history</value>
  </data>
  <data name="Wizard_Profile_FullHistory_Description" xml:space="preserve">
-    <value>Disables the privacy filter entirely. Stores everything except battle logs (the original full-history behavior). Retention is OFF, history grows forever.</value>
+    <value>Disables the privacy filter entirely. Stores everything except battle logs (the original full-history behaviour). Retention is OFF, so the history grows indefinitely.</value>
  </data>
  <data name="Wizard_Profile_FullHistory_GdprWarning" xml:space="preserve">
-    <value>GDPR notice: storing third-party messages (Say/Shout/Yell of strangers, NPC dialogue with player names, etc.) for an unlimited time may exceed the personal/household exemption (Art. 2(2)(c)). Use this profile only if you have a clear reason to keep the full archive.</value>
+    <value>GDPR notice: Storing third-party messages (say/shout/yell from other players, NPC dialogues with player names, etc.) indefinitely may exceed the exemption for purely personal or household activities (Art. 2(2)(c)). Only use this profile if you have a clear reason to keep the full archive.</value>
  </data>
  <data name="Wizard_Profile_FullHistory_Apply" xml:space="preserve">
-    <value>Use Full History</value>
+    <value>Apply full history</value>
  </data>
  <data name="Wizard_Reopen_Button" xml:space="preserve">
    <value>Show wizard again</value>
  </data>
+  <data name="Wizard_Cancel_Label" xml:space="preserve">
+    <value>Later — keep defaults</value>
+  </data>
+  <data name="Wizard_Cancel_Tooltip" xml:space="preserve">
+    <value>Close the wizard without selecting a profile. The plugin defaults stay active and the wizard returns on next plugin load.</value>
+  </data>
  <data name="Export_Heading" xml:space="preserve">
-    <value>Export (GDPR Art. 15 — right of access)</value>
+    <value>Export (GDPR Art. 15 — Right of access)</value>
  </data>
  <data name="Export_Help" xml:space="preserve">
-    <value>Export stored messages to Markdown, JSON or CSV. Use this to fulfil a request for access from someone whose messages you have, or to take your own history with you.</value>
+    <value>Export stored messages as Markdown, JSON, or CSV. This lets you fulfil an access request from a person whose messages you have stored, or take your own history with you.</value>
  </data>
  <data name="Export_Range_Label" xml:space="preserve">
-    <value>Last X days (0 = all time)</value>
+    <value>Last X days (0 = no time limit)</value>
  </data>
  <data name="Export_Sender_Label" xml:space="preserve">
    <value>Sender contains (optional, case-insensitive)</value>
  </data>
  <data name="Export_Channels_Heading" xml:space="preserve">
-    <value>Limit to channels</value>
+    <value>Restrict to channels</value>
  </data>
  <data name="Export_Channels_AllOff" xml:space="preserve">
-    <value>(none selected = all stored channels)</value>
+    <value>(nothing selected = all stored channels)</value>
  </data>
  <data name="Export_Format_Label" xml:space="preserve">
    <value>Format</value>
@@ -259,41 +265,41 @@
    <value>Save export</value>
  </data>
  <data name="Export_Running" xml:space="preserve">
-    <value>Export running in background…</value>
+    <value>Export running in the background…</value>
  </data>
  <data name="Export_Success" xml:space="preserve">
-    <value>Export complete: {0:N0} messages written to {1}</value>
+    <value>Export complete, {0:N0} messages written to {1}</value>
  </data>
  <data name="Export_Empty" xml:space="preserve">
-    <value>Export complete: no messages matched the filter.</value>
+    <value>Export complete, no message matched the filter.</value>
  </data>
  <data name="Export_Error" xml:space="preserve">
    <value>Export failed, see /xllog</value>
  </data>
  <data name="Theme_Enabled_Name" xml:space="preserve">
-    <value>Use the Hellion theme across all plugin windows</value>
+    <value>Use Hellion theme for all plugin windows</value>
  </data>
  <data name="Theme_Enabled_Description" xml:space="preserve">
-    <value>Hellion Online Media palette of Arctic Cyan plus Ember Orange, applied across the chat log, settings, viewers and the wizard. Disable to fall back to the default Dalamud look.</value>
+    <value>Hellion Online Media palette of Arctic Cyan and Ember Orange, applied to the chat window, settings, viewer, and wizard. Disable to use the default Dalamud appearance.</value>
  </data>
  <data name="Theme_WindowOpacity_Label" xml:space="preserve">
    <value>Window opacity</value>
  </data>
  <data name="Theme_WindowOpacity_Help" xml:space="preserve">
-    <value>How opaque the plugin panes are. Lower values let the game shine through; form fields and dialogs stay opaque on top so they remain readable.</value>
+    <value>How opaque the plugin windows are. Lower values let the game show through; form fields and dialogs stay fully opaque and readable on top.</value>
  </data>
  <data name="Theme_UseHellionFont_Name" xml:space="preserve">
-    <value>Use the bundled Hellion font (Exo 2)</value>
+    <value>Use bundled Hellion font (Exo 2)</value>
  </data>
  <data name="Theme_UseHellionFont_Description" xml:space="preserve">
-    <value>Renders chat and UI in Exo 2 (SIL Open Font License 1.1) which ships with the plugin. Disable to fall back to whatever font you picked under Settings → Fonts.</value>
+    <value>Renders chat and UI in Exo 2 (SIL Open Font License 1.1), which ships with the plugin. Disable to fall back to the font selected under Settings → Font.</value>
  </data>

  <data name="About_Maintainer_Heading" xml:space="preserve">
    <value>Maintainer</value>
  </data>
  <data name="About_Maintainer_Body" xml:space="preserve">
-    <value>I maintain Hellion Chat through Hellion Online Media. The website has the contact details for licensing, legal or business questions.</value>
+    <value>I maintain Hellion Chat through Hellion Online Media. Contact details for licensing, legal, or business inquiries are on the website.</value>
  </data>
  <data name="About_Maintainer_Website_Label" xml:space="preserve">
    <value>Website:</value>
@@ -303,142 +309,172 @@
    <value>Why this fork exists</value>
  </data>
  <data name="About_Mission_P1" xml:space="preserve">
-    <value>Hellion Chat is not trying to replace Chat 2. Chat 2 ships a complete chat experience with full history available for filtering, search and replay. That default is the right one for most users. This fork takes a different stance: a smaller default footprint, with extra knobs for users who want to keep less third-party chat on disk.</value>
+    <value>Hellion Chat is not meant to replace Chat 2. Chat 2 delivers a complete chat experience with a full history available for filtering, searching, and replay. That default is the right choice for most users. This fork takes a different approach: a smaller default footprint, with additional controls for users who prefer to keep less of other people's chat on disk.</value>
  </data>
  <data name="About_Mission_P2" xml:space="preserve">
-    <value>The reason I wanted that narrower default was personal. After two years on Chat 2 my database had grown past two million messages, most of them /say, /shout and /yell from strangers in Limsa. That data is exactly what makes Chat 2's full-history view powerful and most users are happy to keep it. For my own taste I wanted a smaller default. So I built this fork.</value>
+    <value>The desire for this narrower default was personal. After two years with Chat 2, my database had grown to over two million messages, the majority of them /say, /shout, and /yell from strangers in Limsa. That data is exactly what makes Chat 2's full history useful, and most users are happy to keep it. My own preference was for a smaller default. So I built this fork.</value>
  </data>
  <data name="About_Mission_P3" xml:space="preserve">
-    <value>I am not chasing a big audience and the fork is not in competition with Chat 2. The code is open under the same EUPL-1.2 licence as the upstream plugin. Infi, Anna or anyone else are welcome to read it, borrow ideas, ask questions, or ignore the project. All three are fine by me.</value>
+    <value>I am not targeting a large audience, and the fork is not in competition with Chat 2. The code is open under the same EUPL-1.2 licence as the original. Infi, Anna, or anyone else is welcome to look around, borrow ideas, ask questions, or simply ignore the project. All three are fine by me.</value>
  </data>

  <data name="About_BuiltOn_Heading" xml:space="preserve">
    <value>Built on Chat 2</value>
  </data>
  <data name="About_BuiltOn_P1" xml:space="preserve">
-    <value>Hellion Chat is a fork of Chat 2 by Infi and Anna (ascclemens). The chat replacement window, the IPC integration, the rendering engine and the entire storage core come from upstream Chat 2.</value>
+    <value>Hellion Chat is a fork of Chat 2 by Infi and Anna (ascclemens). The chat-replacement window, IPC integration, render engine, and the entire storage core all come from the original.</value>
  </data>
  <data name="About_BuiltOn_P2" xml:space="preserve">
-    <value>The webinterface is the only major piece I removed. It is built for remote access to chat from a second device, which is a different focus than the smaller default footprint this fork is built around. Aligning it with these defaults would have meant a substantial rebuild, so removing it was the cleaner path for this particular fork.</value>
+    <value>The web interface is the only major piece I removed. It is built for remote access to the chat from a second device — a different focus from the smaller default footprint this fork pursues. Adapting it to these defaults would have required significant rework, so removing it was the clean path for this particular fork.</value>
  </data>
  <data name="About_BuiltOn_Upstream_Label" xml:space="preserve">
    <value>Upstream repository:</value>
  </data>

  <data name="About_License_Heading" xml:space="preserve">
-    <value>License</value>
+    <value>Licence</value>
  </data>
  <data name="About_License_P1" xml:space="preserve">
-    <value>Hellion Chat and Chat 2 both ship under the European Union Public Licence v1.2 (EUPL-1.2).</value>
+    <value>Hellion Chat and Chat 2 are both released under the European Union Public Licence v1.2 (EUPL-1.2).</value>
  </data>
  <data name="About_License_P2" xml:space="preserve">
-    <value>© 2023 to 2026, the Chat 2 authors (Infi, Anna and the upstream contributors).</value>
+    <value>© 2023 to 2026, the Chat 2 authors (Infi, Anna, and upstream contributors).</value>
  </data>
  <data name="About_License_P3" xml:space="preserve">
-    <value>© 2026 Hellion Online Media for the additions made in this fork.</value>
+    <value>© 2026 Hellion Online Media for the extensions in this fork.</value>
  </data>

  <data name="About_SE_Heading" xml:space="preserve">
-    <value>FINAL FANTASY XIV disclaimer</value>
+    <value>FINAL FANTASY XIV notice</value>
  </data>
  <data name="About_SE_P1" xml:space="preserve">
    <value>FINAL FANTASY XIV © SQUARE ENIX CO., LTD. All rights reserved.</value>
  </data>
  <data name="About_SE_P2" xml:space="preserve">
-    <value>Hellion Chat is an unofficial, fan-made plugin. It has no affiliation with Square Enix and is not endorsed, sponsored or approved by them.</value>
+    <value>Hellion Chat is an unofficial fan plugin. It is not affiliated with Square Enix and is neither endorsed, sponsored, nor approved by them.</value>
  </data>

  <data name="About_Localization_Heading" xml:space="preserve">
-    <value>Localization</value>
+    <value>Localisation</value>
  </data>
  <data name="About_Localization_P1" xml:space="preserve">
-    <value>The German translations of the Hellion-specific strings come from me. Other languages are not provided yet.</value>
+    <value>The translations of the Hellion-specific strings were done by me. No additional languages are currently available.</value>
  </data>
  <data name="About_Localization_P2" xml:space="preserve">
-    <value>The translator list below covers the upstream Chat 2 strings on Crowdin. Those volunteers translated Chat 2, not the Hellion additions.</value>
+    <value>The translator list below belongs to the Chat 2 strings on Crowdin. These volunteers translated Chat 2, not the Hellion extensions.</value>
  </data>
  <data name="About_Translators_TreeNode" xml:space="preserve">
    <value>Chat 2 community translators (upstream)</value>
  </data>

-  <!-- Hellion Chat — Auto-Tell-Tabs (runtime strings) -->
+  <!-- Hellion Chat — Auto-Tell-Tabs (Runtime strings) -->
  <data name="AutoTellTabs_SectionHeader" xml:space="preserve">
-    <value>Active Tells</value>
+    <value>Active tells</value>
  </data>
  <data name="AutoTellTabs_HistorySeparator" xml:space="preserve">
    <value>— Earlier conversations —</value>
  </data>
  <data name="AutoTellTabs_HistoryLoadError" xml:space="preserve">
-    <value>History could not be loaded.</value>
+    <value>Could not load history.</value>
  </data>
  <data name="AutoTellTabs_GreetedTooltip" xml:space="preserve">
-    <value>Marked as greeted. Click to remove the marker.</value>
+    <value>Marked as greeted. Click to remove the mark.</value>
  </data>
  <data name="AutoTellTabs_UnGreetedTooltip" xml:space="preserve">
    <value>Mark as greeted.</value>
  </data>
+  <data name="PinTab_MenuPin" xml:space="preserve">
+    <value>Pin Tab</value>
+  </data>
+  <data name="PinTab_MenuUnpin" xml:space="preserve">
+    <value>Unpin Tab</value>
+  </data>
+  <data name="PinTab_MenuPromote" xml:space="preserve">
+    <value>Promote to permanent</value>
+  </data>
+  <data name="PinTab_PromoteTooltip" xml:space="preserve">
+    <value>Turns this TempTell into a regular tab. The tell binding to the partner is dropped — the tab will catch messages by its channel filters from now on. For "tab survives relog while staying bound to this partner", use Pin Tab instead.</value>
+  </data>
+  <data name="PinTab_PinTooltip" xml:space="preserve">
+    <value>Pinned tabs survive relog and stay bound to this conversation partner.</value>
+  </data>
+  <data name="PinTab_SectionHeader" xml:space="preserve">
+    <value>Pinned</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_SidebarWidth_Name" xml:space="preserve">
+    <value>Sidebar width</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_SidebarWidth_Description" xml:space="preserve">
+    <value>Width of the tab sidebar in pixels. The default (44 px) is icon-only; widen it to fit the section headers like "Active Tells (3)" without truncation.</value>
+  </data>
+  <data name="PinTab_LimitReached" xml:space="preserve">
+    <value>Maximum of {0} pinned tell tabs reached. Unpin one first, or use Promote to permanent.</value>
+  </data>
+  <data name="PinTab_PinnedTooltip" xml:space="preserve">
+    <value>Pinned — survives relog.</value>
+  </data>

  <!-- Hellion Chat — Auto-Tell-Tabs (Chat settings tab) -->
  <data name="ChatLog_AutoTellTabs_Section_Title" xml:space="preserve">
    <value>Auto-Tell-Tabs</value>
  </data>
  <data name="ChatLog_AutoTellTabs_Enable_Name" xml:space="preserve">
-    <value>Open a tab automatically for each tell partner</value>
+    <value>Automatically open a tab per conversation partner for every /tell</value>
  </data>
  <data name="ChatLog_AutoTellTabs_Enable_Description" xml:space="preserve">
-    <value>When you receive or send a /tell, a temporary tab dedicated to that player is opened automatically. Tabs vanish on logout.</value>
+    <value>As soon as you receive or send a /tell, a temporary tab is automatically opened for that player. Tabs are removed on logout.</value>
  </data>
  <data name="ChatLog_AutoTellTabs_Limit_Name" xml:space="preserve">
-    <value>Maximum number of auto tell tabs</value>
+    <value>Maximum number of auto-tell tabs</value>
  </data>
  <data name="ChatLog_AutoTellTabs_Limit_Description" xml:space="preserve">
-    <value>When the limit is reached, greeted tabs with the oldest activity are dropped first. The change applies on the next /tell.</value>
+    <value>When the limit is reached, greeted tabs with the oldest activity are closed first. Changes take effect on the next /tell. This limit applies to the auto-managed pool. Pinned tell tabs (right-click → Pin Tab) live in a separate pool of up to 5 and survive relog.</value>
  </data>
  <data name="ChatLog_AutoTellTabs_Compact_Name" xml:space="preserve">
    <value>Compact display</value>
  </data>
  <data name="ChatLog_AutoTellTabs_Compact_Description" xml:space="preserve">
-    <value>Show only a thin separator between persistent tabs and auto tell tabs, without the section header.</value>
+    <value>Shows only a thin separator between regular tabs and auto-tell tabs, without a section header.</value>
  </data>
  <data name="ChatLog_AutoTellTabs_GreetedToggle_Name" xml:space="preserve">
-    <value>Show "mark as greeted" button</value>
+    <value>Show "Mark as greeted" button</value>
  </data>
  <data name="ChatLog_AutoTellTabs_GreetedToggle_Description" xml:space="preserve">
-    <value>Adds a click-to-toggle button next to each auto tell tab to mark a partner as already greeted, dimming the tab name when set. Useful for club greeters tracking many parallel conversations; off by default.</value>
+    <value>Adds a click button next to each auto-tell tab to mark a conversation partner as already greeted — the tab name is then dimmed. Useful for club greeters managing many conversations in parallel. Off by default.</value>
  </data>
  <data name="ChatLog_AutoTellTabs_OpenAsPopout_Name" xml:space="preserve">
-    <value>Open new /tell tabs directly as pop-out</value>
+    <value>Open new /tell tabs directly as pop-outs</value>
  </data>
  <data name="ChatLog_AutoTellTabs_OpenAsPopout_Description" xml:space="preserve">
-    <value>When enabled, each newly created /tell tab opens directly as its own window. Closing the window returns the tab to the sidebar.</value>
+    <value>When active, each newly created /tell tab is immediately opened as its own window. Closing the window returns the tab to the sidebar.</value>
  </data>
  <data name="ChatLog_AutoTellTabs_PreloadHint" xml:space="preserve">
-    <value>The number of preloaded tells is configured in the Privacy tab.</value>
+    <value>The number of preloaded tells can be configured in the Privacy tab.</value>
  </data>
  <data name="ChatLog_AutoTellTabs_ConflictHint" xml:space="preserve">
-    <value>Heads-up: if XIV Messanger or a similar plugin is suppressing direct messages, turn its "Suppress DMs" option off so Hellion Chat can receive tells and open the auto tabs.</value>
+    <value>Note: If XIV Messenger or a similar plugin suppresses tells, disable the "Suppress DMs" option there so that Hellion Chat can receive tells and open the auto-tabs.</value>
  </data>

  <!-- Hellion Chat — Auto-Tell-Tabs (Privacy settings tab) -->
  <data name="Privacy_AutoTellTabs_Section_Title" xml:space="preserve">
-    <value>Tell history in auto tabs</value>
+    <value>Tell history in auto-tabs</value>
  </data>
  <data name="Privacy_AutoTellTabs_Preload_Name" xml:space="preserve">
    <value>Number of preloaded tells</value>
  </data>
  <data name="Privacy_AutoTellTabs_Preload_Description" xml:space="preserve">
-    <value>How many earlier tell messages are loaded from the database when an auto tell tab is opened. 0 disables the preload.</value>
+    <value>How many previous tell messages are loaded from the database when an auto-tell tab is opened. 0 disables preloading.</value>
  </data>
  <data name="Privacy_AutoTellTabs_Preload_Hint" xml:space="preserve">
-    <value>Only takes effect when auto tell tabs are enabled in the Chat tab.</value>
+    <value>Only takes effect when auto-tell tabs are enabled in the Chat tab.</value>
  </data>

-  <!-- Hellion Chat — Settings UX Polish v10 wipe migration -->
+  <!-- Hellion Chat — Settings UX Polish v10 Wipe migration -->
  <data name="SettingsRefactor_Migration_Title" xml:space="preserve">
-    <value>Settings reorganised</value>
+    <value>Settings restructured</value>
  </data>
  <data name="SettingsRefactor_Migration_Content" xml:space="preserve">
-    <value>Hellion Chat 0.5.0 reorganised the settings into themed tabs. Your chat database and your message history stay untouched. Settings have been reset to defaults; if you want to pick a privacy profile again, the reopen button is in the Privacy tab. A backup of your previous config is at HellionChat.json.pre-v10-backup next to the live config file.</value>
+    <value>Hellion Chat 0.5.0 has restructured the settings into thematic tabs. Your chat database and message history remain unchanged. Settings have been reset to defaults. If you want to re-select your privacy profile, the Reopen button is in the Privacy tab. A backup of the previous config is located at HellionChat.json.pre-v10-backup next to the active config file.</value>
  </data>

  <!-- Hellion Chat — Settings UX Polish 8-tab structure -->
@@ -455,30 +491,30 @@
    <value>Chat</value>
  </data>
  <data name="Settings_Tab_Tabs" xml:space="preserve">
-    <value>Tabs</value>
+    <value>Channels</value>
  </data>
  <data name="Settings_Tab_Database" xml:space="preserve">
    <value>Database</value>
  </data>
  <data name="Settings_Tab_Information" xml:space="preserve">
-    <value>Information</value>
+    <value>About</value>
  </data>

-  <!-- Hellion Chat — General-Tab section headings -->
+  <!-- Hellion Chat — General tab section headings -->
  <data name="Settings_General_Input_Heading" xml:space="preserve">
    <value>Input</value>
  </data>
  <data name="Settings_General_Audio_Heading" xml:space="preserve">
-    <value>Audio &amp; Notifications</value>
+    <value>Audio &amp; notifications</value>
  </data>
  <data name="Settings_General_Performance_Heading" xml:space="preserve">
    <value>Performance</value>
  </data>
  <data name="Settings_General_Language_Heading" xml:space="preserve">
-    <value>Language &amp; Input Helpers</value>
+    <value>Language &amp; input aids</value>
  </data>

-  <!-- Hellion Chat — Appearance-Tab section headings -->
+  <!-- Hellion Chat — Appearance tab section headings -->
  <data name="Settings_Appearance_Theme_Heading" xml:space="preserve">
    <value>Theme</value>
  </data>
@@ -486,32 +522,32 @@
    <value>Fonts</value>
  </data>
  <data name="Settings_Appearance_Colours_Heading" xml:space="preserve">
-    <value>Chat Colours</value>
+    <value>Chat colours</value>
  </data>
  <data name="Settings_Appearance_Timestamps_Heading" xml:space="preserve">
    <value>Timestamps</value>
  </data>

-  <!-- Hellion Chat — Window-Tab section headings -->
+  <!-- Hellion Chat — Window tab section headings -->
  <data name="Settings_Window_Hide_Heading" xml:space="preserve">
-    <value>Hide</value>
+    <value>Hiding</value>
  </data>
  <data name="Settings_Window_InactivityHide_Heading" xml:space="preserve">
-    <value>Inactivity Hide</value>
+    <value>Inactivity hiding</value>
  </data>
  <data name="Settings_Window_Frame_Heading" xml:space="preserve">
-    <value>Window Frame</value>
+    <value>Window frame</value>
  </data>
  <data name="Settings_Window_Tooltips_Heading" xml:space="preserve">
    <value>Tooltips</value>
  </data>

-  <!-- Hellion Chat — Chat-Tab section headings -->
+  <!-- Hellion Chat — Chat tab section headings -->
  <data name="Settings_Chat_AutoTellTabs_Heading" xml:space="preserve">
    <value>Auto-Tell-Tabs</value>
  </data>
  <data name="Settings_Chat_Behaviour_Heading" xml:space="preserve">
-    <value>Message Behaviour</value>
+    <value>Message behaviour</value>
  </data>
  <data name="Settings_Chat_Preview_Heading" xml:space="preserve">
    <value>Preview</value>
@@ -520,7 +556,15 @@
    <value>Emotes</value>
  </data>

-  <!-- Hellion Chat — Database-Tab section headings -->
+  <!-- Hellion Chat — Chat tab SymbolPicker -->
+  <data name="Settings_Chat_SymbolPicker_Enable_Name" xml:space="preserve">
+    <value>Show symbol-picker button next to chat input</value>
+  </data>
+  <data name="Settings_Chat_SymbolPicker_Enable_Description" xml:space="preserve">
+    <value>Adds a small button left of the channel indicator that opens a popup with FFXIV icons and a curated symbol list. Disable if you prefer a leaner input bar.</value>
+  </data>
+
+  <!-- Hellion Chat — Database tab section headings -->
  <data name="Settings_Database_Storage_Heading" xml:space="preserve">
    <value>Storage</value>
  </data>
@@ -531,9 +575,9 @@
    <value>Maintenance</value>
  </data>

-  <!-- Hellion Chat — Information-Tab section headings -->
+  <!-- Hellion Chat — Information tab section headings -->
  <data name="Settings_Information_VersionInfo_Heading" xml:space="preserve">
-    <value>Version Info</value>
+    <value>Version info</value>
  </data>
  <data name="Settings_Information_About_Heading" xml:space="preserve">
    <value>About HellionChat</value>
@@ -542,7 +586,7 @@
    <value>Changelog</value>
  </data>

-  <!-- Hellion Chat — Default tab presets (channel-themed) -->
+  <!-- Hellion Chat — Default tab presets (channel-specific) -->
  <data name="Tabs_Presets_System" xml:space="preserve">
    <value>System</value>
  </data>
@@ -553,36 +597,36 @@
    <value>Party</value>
  </data>
  <data name="Tabs_Presets_Beginner" xml:space="preserve">
-    <value>Beginner</value>
+    <value>Novice</value>
  </data>
  <data name="Tabs_Presets_Linkshell" xml:space="preserve">
    <value>Linkshell</value>
  </data>
  <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>
+    <value>If you use multiple linkshells, the maintainer recommends one tab per shell for a cleaner overview. Duplicate the tab and restrict the channel selection in each copy.</value>
  </data>

  <!-- Hellion Chat — v1.2.0 per-tab icon override -->
  <data name="Tabs_Icon_Label" xml:space="preserve">
-    <value>Tab-Icon</value>
+    <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>
+    <value>FontAwesome glyph for the sidebar. Default falls back to the tab name or channel type.</value>
  </data>
  <data name="Tabs_Icon_DefaultOption" xml:space="preserve">
-    <value>(Default-Mapping)</value>
+    <value>(Default mapping)</value>
  </data>
  <data name="ChatColourPresets_Default" xml:space="preserve">
-    <value>Klassik (Chat 2 Default)</value>
+    <value>Classic (Chat 2 default)</value>
  </data>
  <data name="ChatColourPresets_HighContrast" xml:space="preserve">
-    <value>High-Contrast</value>
+    <value>High contrast</value>
  </data>
  <data name="ChatColourPresets_Pastell" xml:space="preserve">
-    <value>Pastell</value>
+    <value>Pastel</value>
  </data>
  <data name="ChatColourPresets_DarkModeTuned" xml:space="preserve">
-    <value>Dark-Mode-Tuned</value>
+    <value>Dark mode tuned</value>
  </data>
  <data name="ChatColourPresets_Hellion" xml:space="preserve">
    <value>Hellion</value>
@@ -594,22 +638,22 @@
    <value>Indigo Violet</value>
  </data>
  <data name="Settings_Appearance_Colours_PresetsHint" xml:space="preserve">
-    <value>Tip: presets overwrite your current channel colours immediately.</value>
+    <value>Tip: Presets overwrite your current channel colours immediately.</value>
  </data>
  <data name="Settings_Window_PopOutInputEnabled_Name" xml:space="preserve">
    <value>Enable input in pop-outs</value>
  </data>
  <data name="Settings_Window_PopOutInputEnabled_Description" xml:space="preserve">
-    <value>Master switch: lets you type and send messages directly inside every pop-out window (including auto-tell tabs). Channel changes inside a pop-out apply globally just like in the main window; the text buffer and history cursor stay independent per pop-out.</value>
+    <value>Master switch: allows typing and sending directly in any pop-out window (including auto-tell tabs). Channel switching in a pop-out acts globally like in the main window; the text buffer and history cursor are independent per pop-out.</value>
  </data>
  <data name="Settings_Window_ResetPosition_Name" xml:space="preserve">
-    <value>Reset Window Position</value>
+    <value>Reset window position</value>
  </data>
  <data name="Settings_Window_ResetPosition_Description" xml:space="preserve">
-    <value>Snaps the chat window and every active pop-out back to the primary monitor's top-left corner. Useful when a window has drifted off-screen after a display layout change (monitor disconnected, resolution changed). The plugin also runs an automatic bounds check once per session — this button is the manual backup if anything still ends up unreachable.</value>
+    <value>Moves the chat window and all active pop-outs back to the top-left corner of the primary monitor. Useful when a window has ended up outside the visible area after a display layout change (monitor disconnected, resolution changed). The plugin also performs an automatic bounds check once per session; this button is the manual escape hatch if something still ends up unreachable.</value>
  </data>
  <data name="Popout_v060_HintText" xml:space="preserve">
-    <value>New in v0.6.0: you can type directly inside pop-out windows. Toggle the master switch in the window settings to enable it.</value>
+    <value>New in v0.6.0: You can now type directly in pop-outs. Enable the master switch in the Window settings.</value>
  </data>
  <data name="Popout_v060_HintAck" xml:space="preserve">
    <value>Got it</value>
@@ -618,19 +662,19 @@
    <value>Open window settings</value>
  </data>
  <data name="Hint_v061_PopOutHeader_Body" xml:space="preserve">
-    <value>You can open any chat tab as its own window. Click the window icon in the top right or right-click the tab. New in v0.6.1: pop-out input is enabled by default (can be turned off under Settings → Window).</value>
+    <value>You can open any chat tab as its own window. Click the window icon in the top right or right-click the tab. New in v0.6.1: pop-out input is active by default (can be disabled under Settings → Window).</value>
  </data>
  <data name="Hint_v061_PopOutHeader_Ack" xml:space="preserve">
    <value>Got it</value>
  </data>
  <data name="Hint_v061_PopOutHeader_OpenSettings" xml:space="preserve">
-    <value>Open Settings</value>
+    <value>Open settings</value>
  </data>
  <data name="ChatTwoConflictTitle" xml:space="preserve">
    <value>Hellion Chat cannot start while Chat 2 is loaded.</value>
  </data>
  <data name="ChatTwoConflictBody" xml:space="preserve">
-    <value>Hellion Chat is a standalone fork of Chat 2. Both plugins replace the same in-game chat window and would conflict at runtime if loaded together.</value>
+    <value>Hellion Chat is a standalone fork of Chat 2. Both plugins replace the same chat window in the game and would conflict at runtime.</value>
  </data>
  <data name="ChatTwoConflictAction" xml:space="preserve">
    <value>Disable Chat 2 in /xlplugins, then re-enable Hellion Chat.</value>
@@ -639,7 +683,7 @@
    <value>General</value>
  </data>
  <data name="Settings_Card_General_Subtext" xml:space="preserve">
-    <value>Plugin-wide settings — language, input, audio, performance.</value>
+    <value>Language, input, audio, and performance.</value>
  </data>
  <data name="Settings_Card_Appearance_Title" xml:space="preserve">
    <value>Appearance</value>
@@ -657,25 +701,25 @@
    <value>Window</value>
  </data>
  <data name="Settings_Card_Window_Subtext" xml:space="preserve">
-    <value>Window behaviour — when it shows, whether it can move.</value>
+    <value>When the window is visible and whether it can be moved.</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>
+    <value>Tells, preview, message behaviour, and 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>
+    <value>Create and configure custom 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>
+    <value>Privacy filter per channel and what may be stored.</value>
  </data>
  <data name="Settings_Card_Database_Title" xml:space="preserve">
    <value>Database</value>
@@ -687,7 +731,7 @@
    <value>Information</value>
  </data>
  <data name="Settings_Card_Information_Subtext" xml:space="preserve">
-    <value>About the plugin — version, mission, license, changelog.</value>
+    <value>Version, mission, licence, and changelog.</value>
  </data>
  <data name="Settings_Tab_Themes" xml:space="preserve">
    <value>Themes</value>
@@ -705,16 +749,16 @@
    <value>Open themes folder</value>
  </data>
  <data name="Settings_Themes_ExportActive" xml:space="preserve">
-    <value>Export active...</value>
+    <value>Export active…</value>
  </data>
  <data name="Settings_Themes_ApplyChatColors_Hint" xml:space="preserve">
-    <value>This theme suggests its own chat channel colours.</value>
+    <value>This theme suggests its own 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>
+    <value>Keep</value>
  </data>
  <data name="StatusBar_Privacy_Enabled" xml:space="preserve">
    <value>Privacy-First</value>
@@ -723,55 +767,55 @@
    <value>Open</value>
  </data>
  <data name="Appearance_UseCompactDensity_Name" xml:space="preserve">
-    <value>Compact Density</value>
+    <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>
+    <value>Switches the message layout from the card-row default back to single-line `[HH:mm] Sender: Text` rows.</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>
+    <value>Theme, window frame, and 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>
+    <value>Font, font size, and chat colours per channel.</value>
  </data>
  <data name="Settings_Card_DataManagement_Title" xml:space="preserve">
-    <value>Data Management</value>
+    <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>
+    <value>Retention, cleanup, export, and database statistics.</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>
+    <value>Other Dalamud plugins that HellionChat works with. Upcoming integrations in preview.</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>
+    <value>Window style</value>
  </data>
  <data name="Settings_ThemeAndLayout_TimestampStyle_Heading" xml:space="preserve">
-    <value>Timestamp Style</value>
+    <value>Timestamp style</value>
  </data>
  <data name="Settings_ThemeAndLayout_WindowOpacity_Name" xml:space="preserve">
-    <value>Window Transparency</value>
+    <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>
+    <value>How transparent the window background is. Lower values let more of the game show through. Tip: Dalamud's per-window menu (hamburger in the title bar) offers per-window overrides for opacity, background blur, click-through, and pinning — those take precedence over this slider for the respective 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>
+    <value>Chat colours</value>
  </data>
  <data name="Settings_DataManagement_Storage_Heading" xml:space="preserve">
    <value>Storage</value>
@@ -786,22 +830,22 @@
    <value>Export</value>
  </data>
  <data name="Settings_DataManagement_DbViewer_Heading" xml:space="preserve">
-    <value>Database Viewer</value>
+    <value>Database viewer</value>
  </data>
  <data name="Settings_DataManagement_Advanced_Heading" xml:space="preserve">
-    <value>Advanced (Shift+Click to open)</value>
+    <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>
+    <value>Hellion Chat 1.2.1 has reorganised the settings menu and removed the old "Override style" option (superseded by the theme system from 1.1.0). Your remaining settings are unchanged. Window transparency has been migrated to "Theme &amp; Layout". A backup of the previous config is located at pluginConfigs/HellionChat.json.pre-v16-backup next to the active 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>
+    <value>Plugin integrations let HellionChat work together with other installed Dalamud plugins. Each integration automatically detects its target and silently disables itself when the target plugin is missing.</value>
  </data>
  <data name="Settings_Integrations_Honorific_SectionHeader" xml:space="preserve">
    <value>Honorific</value>
@@ -813,13 +857,19 @@
    <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>
+    <value>Incompatible API version ({0} expected, {1}.{2} found)</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>
+    <value>Shows your custom title from Honorific in the header above the chat log, in the colour you have chosen.</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Glow_Toggle" xml:space="preserve">
+    <value>Render glow outlines (Honorific)</value>
+  </data>
+  <data name="Settings_Integrations_Honorific_Glow_Hint" xml:space="preserve">
+    <value>May reduce frame rate on low-end hardware. Renders glow outlines for Honorific titles that use them. Gradient animation is not yet supported and will render as the primary colour.</value>
  </data>
  <data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve">
    <value>Honorific on GitHub</value>
@@ -831,48 +881,57 @@
    <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>
+    <value>These integrations are on the roadmap. The settings will appear automatically once the respective plugin is connected.</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>
+    <value>Right-click a name in chat: jump to PlayerTrack, open the Lodestone profile, or compose a DM with 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>
+    <value>Mentions and DMs via NotificationMaster: 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>
+    <value>Show Moodles status icons and pair badges directly next to chat names for more 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>
+    <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>
+    <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>
+    <value>Quick DM access directly from the chat window, one click.</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>
+    <value>Got an idea for a plugin integration that is not on the list? Come to the Hellion Forge Discord and write to me. Community input shapes 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>
+    <value>Custom title from Honorific</value>
+  </data>
+  <data name="DbViewer_FullTextToggle" xml:space="preserve">
+    <value>Full-text search</value>
+  </data>
+  <data name="DbViewer_FullTextToggle_Hint_Indexing" xml:space="preserve">
+    <value>The full-text index is still being built. The local filter remains available.</value>
+  </data>
+  <data name="DbViewer_FullTextToggle_Hint_PhraseMode" xml:space="preserve">
+    <value>Searches for the exact phrase. Multi-word queries match only when the words appear together in order. To use raw FTS5 MATCH syntax, wrap your term in double quotes yourself.</value>
  </data>
 </root>
@@ -0,0 +1,82 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class CrystalNocturne
+{
+    public const string Slug = "crystal-nocturne";
+
+    public static Theme Build() =>
+        new(
+            Slug: Slug,
+            Name: "Crystal Nocturne",
+            Author: "CRYSTALLITE",
+            Description: "Royal sapphire and electric magenta over obsidian — a nocturne for the crystal-lit dance floor.",
+            Colors: new ThemeColors(
+                PrimaryDark: ColourUtil.HexToRgba("#1D4ED8"),
+                Primary: ColourUtil.HexToRgba("#3B82F6"),
+                PrimaryLight: ColourUtil.HexToRgba("#93C5FD"),
+                PrimaryGlow: ColourUtil.HexToRgba("#3B82F699"),
+                AccentDark: ColourUtil.HexToRgba("#A21CAF"),
+                Accent: ColourUtil.HexToRgba("#D946EF"),
+                AccentLight: ColourUtil.HexToRgba("#F0ABFC"),
+                Identity: ColourUtil.HexToRgba("#3B82F6"),
+                WindowBg: ColourUtil.HexToRgba("#08070F"),
+                ChildBg: ColourUtil.HexToRgba("#11101F"),
+                FrameBg: ColourUtil.HexToRgba("#1C1A33"),
+                Surface: ColourUtil.HexToRgba("#262340"),
+                SurfaceHover: ColourUtil.HexToRgba("#332D55"),
+                Border: ColourUtil.HexToRgba("#D946EF55"),
+                TextPrimary: ColourUtil.HexToRgba("#F5F3FF"),
+                TextMuted: ColourUtil.HexToRgba("#A5A0C0"),
+                TextDim: ColourUtil.HexToRgba("#4B4763"),
+                StatusSuccess: ColourUtil.HexToRgba("#10B981"),
+                StatusDanger: ColourUtil.HexToRgba("#F43F5E"),
+                StatusWarning: ColourUtil.HexToRgba("#FACC15"),
+                StatusInfo: ColourUtil.HexToRgba("#3B82F6")
+            ),
+            Layout: new ThemeLayout(
+                WindowRounding: 2f,
+                ChildRounding: 1f,
+                PopupRounding: 2f,
+                FrameRounding: 1f,
+                GrabRounding: 1f,
+                TabRounding: 1f,
+                ScrollbarRounding: 2f,
+                WindowBorderSize: 1f,
+                FrameBorderSize: 1f
+            ),
+            Typography: new ThemeTypography(),
+            IsBuiltIn: true,
+            ChatColors: new ThemeChatColors(
+                new Dictionary<HellionChat.Code.ChatType, uint>
+                {
+                    // Crystal Nocturne — sapphire-blue identity for party/team channels,
+                    // accent-magenta for tells, with mint/peach accents on linkshells
+                    // so the eight LS slots stay individually distinguishable on the
+                    // dark obsidian background.
+                    [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#F5F3FF"),
+                    [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FACC15"),
+                    [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#F0B090"),
+                    [HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#F0ABFC"),
+                    [HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#F0ABFC"),
+                    [HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#93C5FD"),
+                    [HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#F0B090"),
+                    [HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#A8C8E8"),
+                    [HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#10B981"),
+                    [HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#93C5FD"),
+                    [HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#10B981"),
+                    [HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#FACC15"),
+                    [HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0ABFC"),
+                    [HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#93C5FD"),
+                    [HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#F0B090"),
+                    [HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A5A0C0"),
+                    [HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#D946EF"),
+                    [HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#3B82F6"),
+                    [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#F0B090"),
+                    [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#F0B090"),
+                    [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A5A0C0"),
+                }
+            )
+        );
+}
@@ -2,12 +2,7 @@ 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.
+// Deuteran/Protan-safe palette with preserved channel identity.
 internal static class HellionSpectrum
 {
    public const string Slug = "hellion-spectrum";
@@ -57,9 +52,6 @@ internal static class HellionSpectrum
            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"),
@@ -1,80 +0,0 @@
-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"),
-                }
-            )
-        );
-}
@@ -1,11 +1,21 @@
 using HellionChat.Themes.Builtin;
+using Microsoft.Extensions.Logging;

 namespace HellionChat.Themes;

 public sealed class ThemeRegistry
 {
+    private readonly ILogger<ThemeRegistry>? _logger;
+
    public const string DefaultSlug = HellionArctic.Slug;

+    // 1Hz throttle for the v1.4.8 B2 auto-refresh-on-active path. The
+    // Plugin.Draw hook calls RefreshActiveIfStale every frame, but the
+    // actual File.GetLastWriteTimeUtc disk-stat only runs once per second
+    // -- 60fps would otherwise mean 3600 stats/min on the same path (more
+    // on Wine). Same idiom as the StatusBar 1Hz cache.
+    private const long ActiveStampPollIntervalMs = 1000;
+
    private readonly Dictionary<string, Theme> _builtIns;
    private readonly Dictionary<string, (Theme Theme, DateTime Stamp)> _customCache = new(
        StringComparer.OrdinalIgnoreCase
@@ -13,19 +23,33 @@ public sealed class ThemeRegistry
    private readonly string? _customThemesDir;
    private Theme _active;

-    public ThemeRegistry(string? customThemesDir = null)
+    // v1.4.8 B2: source path of the currently active custom theme. Captured
+    // at Switch() time so RefreshActiveIfStale does not have to reconstruct
+    // a filename from the slug -- custom theme filenames are not required
+    // to match the slug they declare in the JSON body. Null when the active
+    // theme is built-in or no custom-themes directory is configured.
+    private string? _activeCustomPath;
+    private long _lastActiveStampCheckMs = -ActiveStampPollIntervalMs;
+    private DateTime _lastActiveStamp = DateTime.MinValue;
+
+    public ThemeRegistry(string? customThemesDir = null, ILogger<ThemeRegistry>? logger = null)
    {
+        _logger = logger;
+        // Insertion order drives the Theme-Picker grid layout (3 columns).
+        // Row 1: blue family. Row 2: purple to magenta family.
+        // Row 3: green / warm / classic. Row 4: Synthwave Sunset as a
+        // retro bonus on its own line.
        _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() },
+            { EventHorizon.Slug, EventHorizon.Build() },
            { IndigoViolet.Slug, IndigoViolet.Build() },
-            { ForgeMerchantman.Slug, ForgeMerchantman.Build() },
+            { CrystalNocturne.Slug, CrystalNocturne.Build() },
            { MintGrove.Slug, MintGrove.Build() },
+            { ForgeMerchantman.Slug, ForgeMerchantman.Build() },
+            { Chat2Classic.Slug, Chat2Classic.Build() },
            { SynthwaveSunset.Slug, SynthwaveSunset.Build() },
        };

@@ -44,7 +68,9 @@ public sealed class ThemeRegistry
        if (_builtIns.TryGetValue(slug, out var b))
            return b;

-        var custom = LoadCustomBySlug(slug);
+        // Discard the source path here; Switch is the only call-site that
+        // needs to remember it for the auto-refresh hook.
+        var custom = LoadCustomBySlug(slug, out _);
        if (custom != null)
            return custom;

@@ -55,12 +81,70 @@ public sealed class ThemeRegistry

    public IEnumerable<Theme> AllCustom() => RefreshCustomCache();

+    // Built-in-first to match Get(slug)'s lookup order. A user theme JSON
+    // that declares the same slug as a built-in is ignored deliberately --
+    // having Switch prefer custom and Get prefer built-in would produce
+    // a state where _active and Get(_active.Slug) disagree.
    public void Switch(string slug)
    {
-        var theme = Get(slug);
-        // Defensive — ensures any future theme source always gets a populated cache.
-        theme.RecomputeAbgrCache();
-        _active = theme;
+        if (_builtIns.TryGetValue(slug, out var builtin))
+        {
+            _active = builtin;
+            _active.RecomputeAbgrCache();
+            _activeCustomPath = null;
+            return;
+        }
+
+        var customTheme = LoadCustomBySlug(slug, out var customPath);
+        if (customTheme is not null)
+        {
+            _active = customTheme;
+            // Defensive — ensures any future theme source always gets a populated cache.
+            _active.RecomputeAbgrCache();
+            _activeCustomPath = customPath;
+            // Force a first-tick reload-check after the switch so the stamp
+            // baseline is established on the next RefreshActiveIfStale call.
+            _lastActiveStamp = DateTime.MinValue;
+            return;
+        }
+
+        // Fallback: neither built-in nor custom matched. Drop to default
+        // and clear the active custom path so RefreshActiveIfStale stays idle.
+        _active = _builtIns[DefaultSlug];
+        _active.RecomputeAbgrCache();
+        _activeCustomPath = null;
+    }
+
+    // 1Hz-throttled disk-stat on the currently active custom theme file.
+    // When the file's LastWriteTime moves forward (editor save), reload the
+    // theme via Get() so the user sees the edit immediately without
+    // re-selecting in the picker. Built-in themes short-circuit; custom
+    // themes without an _activeCustomPath (e.g. Switch fell to default)
+    // short-circuit too.
+    public void RefreshActiveIfStale()
+    {
+        var now = Environment.TickCount64;
+        if (now - _lastActiveStampCheckMs < ActiveStampPollIntervalMs)
+            return;
+        _lastActiveStampCheckMs = now;
+
+        if (_active.IsBuiltIn)
+            return;
+
+        var path = _activeCustomPath;
+        if (path is null || !File.Exists(path))
+            return;
+
+        var stamp = File.GetLastWriteTimeUtc(path);
+        if (!ThemeStampDiff.IsStale(_lastActiveStamp, stamp))
+            return;
+        _lastActiveStamp = stamp;
+
+        // Get() re-runs RefreshCustomCache which picks up the new content
+        // (the cache keys by path + LastWriteTime, so a mtime bump invalidates).
+        // RecomputeAbgrCache happens inside RefreshCustomCache on cache miss.
+        var reloaded = Get(_active.Slug);
+        _active = reloaded;
    }

    // 0x80070020 = SHARING_VIOLATION, 0x80070021 = LOCK_VIOLATION.
@@ -73,18 +157,30 @@ public sealed class ThemeRegistry
        return code == 0x80070020u || code == 0x80070021u;
    }

-    // Custom themes are loaded lazily, cached by LastWriteTime.
-    // A changed JSON is reloaded on the next lookup.
-    private Theme? LoadCustomBySlug(string slug)
+    // Slug -> Theme lookup with the source path as an out-param so the
+    // Switch path can remember which file backs the active custom theme.
+    // Pure reverse-lookup over the existing _customCache: that cache is
+    // already Path -> (Theme, Stamp), so iterating it costs nothing,
+    // avoids a re-parse of every JSON, and keeps the parse logic (and
+    // the recoverable-file-lock recovery) confined to RefreshCustomCache.
+    // The cache must be warm before this runs; Plugin.LoadAsync triggers
+    // a one-time warm-up via AllCustom() before the first Switch call.
+    private Theme? LoadCustomBySlug(string slug, out string? sourcePath)
    {
+        sourcePath = null;
        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;
+        foreach (var kvp in _customCache)
+        {
+            if (string.Equals(kvp.Value.Theme.Slug, slug, StringComparison.OrdinalIgnoreCase))
+            {
+                sourcePath = kvp.Key;
+                return kvp.Value.Theme;
+            }
+        }
        return null;
    }

@@ -114,7 +210,7 @@ public sealed class ThemeRegistry
                catch (Exception ex) when (IsRecoverableFileLock(ex))
                {
                    // Editor mid-save: keep last known good, retry on next refresh.
-                    Plugin.Log.Debug(
+                    _logger?.LogDebug(
                        $"Custom theme {Path.GetFileName(path)} is locked, keeping last known good"
                    );
                    if (cached.Theme is not null)
@@ -0,0 +1,20 @@
+namespace HellionChat.Themes;
+
+// Pure stale-check for the v1.4.8 B2 theme-auto-refresh-on-active path.
+// Lives in a free helper class so the Build-Suite can exercise the diff
+// rules without instantiating ThemeRegistry (which touches the Dalamud
+// log proxy and the filesystem). The rules:
+// - DateTime.MinValue on the current stat means we could not read the
+//   file -- hold the last known good (return false).
+// - Equal stamps mean no change since we last saw it.
+// - Any other difference, including the first observation where lastSeen
+//   is MinValue, counts as stale and triggers a reload.
+internal static class ThemeStampDiff
+{
+    public static bool IsStale(System.DateTime lastSeen, System.DateTime current)
+    {
+        if (current == System.DateTime.MinValue)
+            return false;
+        return current != lastSeen;
+    }
+}
@@ -1,34 +1,17 @@
 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>
+// Deterministic hash-based color and icon tinting for Auto-Tell sidebar tabs.
+// Same tell partner (name+world) always produces the same color and icon across
+// sessions. Pure string logic, no Dalamud dependency — testable without game refs.
 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>
+    // Fallback for invalid input (empty name or world=0). White matches
+    // TextPrimary default so the sidebar stays visually consistent.
    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>
+    // 12 saturated mid-bright colors from the built-in theme pool, readable
+    // on dark backgrounds. Collision risk is low at realistic 1-5 active tells.
+    // RGBA format, matching ColourUtil.RgbaToAbgr convention.
    public static readonly IReadOnlyList<uint> Palette = new uint[]
    {
        0x00BED2FFu, // Arctic Cyan
@@ -45,30 +28,19 @@ internal static class AutoTellTabTint
        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.
+        // Mask to positive range so modulo always yields a valid index.
        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>
+    // 7 visually distinct FA glyphs that make sense in a tell context.
+    // Excludes cog/comment/users — those read as system or group tabs.
    public static readonly IReadOnlyList<string> IconPool = new[]
    {
        "envelope",
@@ -80,26 +52,17 @@ internal static class AutoTellTabTint
        "fire",
    };

-    /// <summary>
-    /// Fallback-Icon bei ungültigem Input. "envelope" passt semantisch zum
-    /// Tell-Kontext besser als das alte hardcoded "clock".
-    /// </summary>
+    // "envelope" matches the tell context better than the old hardcoded "clock".
    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.
+        // Reversed key ("world@name") gives icon and color independent variation
+        // so the same tell partner doesn't always get the same color+icon pair.
+        // 7 icons x 12 colors = 84 distinct combinations.
        var key = $"{world}@{name}";
        var hash = (uint)(key.GetHashCode() & 0x7FFFFFFF);
        return IconPool[(int)(hash % IconPool.Count)];
@@ -8,16 +8,10 @@ using HellionChat.Util;

 namespace HellionChat.Ui;

-// Hellion Chat — v0.6.0 input bar component for pop-out windows.
-//
-// Pragmatischer Refactor-Scope: Render() ist ein leerer Marker-Stub für
-// das Hauptfenster — der bestehende Input-Layer in ChatLogWindow bleibt
-// unangetastet, weil ein 400-Zeilen-Extract aus einem 1926-Zeilen-File
-// das v0.6.0-Risiko unverhältnismäßig erhöhen würde. Pop-Outs nutzen
-// ausschließlich RenderCompact(), das ist der ganze v0.6.0-Mehrwert.
-// Sollte das Hauptfenster selber später eine Compact-Variante brauchen
-// (oder das große Extract sich aus anderem Grund lohnen), kann Render()
-// in einem späteren Cycle gefüllt werden.
+// Input bar component for pop-out windows. Render() is a stub — the main
+// window input layer stays in ChatLogWindow to avoid a high-risk extract.
+// RenderCompact() is the only v0.6.0 deliverable; Render() can be filled
+// in a later cycle if needed.
 public sealed class ChatInputBar
 {
    private readonly Plugin _plugin;
@@ -35,22 +29,17 @@ public sealed class ChatInputBar
    public InputState State => _state;
    public bool IsFocused { get; private set; }

-    // Stub. v0.6.0 belässt den Hauptfenster-Input wie er ist.
+    // Stub — main window input is handled in ChatLogWindow.
    public void Render() { }

-    // Compact rendering for pop-out windows.
+    // Compact layout for pop-out windows: channel icon button left, text
+    // input right. Auto-translate is intentionally excluded — the upstream
+    // popup isn't instanciable per window without a larger refactor, and
+    // typical pop-out use cases rarely need it. Can be added later if
+    // tester feedback warrants it.
    //
-    // v0.6.0 Compact-Layout: Channel-Icon-Button links (Background-Farbe
-    // aus ChatColours), Text-Input rechts daneben. Auto-Translate-Picker
-    // ist bewusst NICHT im Compact-Mode (Spec-Abweichung Layout D → A).
-    // Rechtfertigung: das Hauptfenster-Auto-Complete-Popup ist nicht ohne
-    // grossen Refactor pro Window instanzierbar; typische Pop-Out-Use-Cases
-    // (FC-Greeter, Club-Hostess) brauchen Auto-Translate selten dort.
-    // Eigene Compact-Auto-Complete-Implementation kann ein späterer
-    // Cycle nachreichen wenn Tester-Feedback das verlangt.
-    //
-    // Channel-Switch wirkt via Plugin.Functions.Chat global (FFXIV-API).
-    // Pro Pop-Out unabhängig bleiben Text-Buffer und History-Cursor.
+    // Channel switching is global via Plugin.Functions.Chat (FFXIV API).
+    // Text buffer and history cursor are independent per pop-out.
    public void RenderCompact()
    {
        var tab = _activeTabAccessor();
@@ -64,18 +53,15 @@ public sealed class ChatInputBar

    private void DrawCompactInput(Tab tab)
    {
-        // Input takes the whole remaining width — no auto-translate button
-        // reserved on the right side in v0.6.0 (see RenderCompact comment).
        var inputWidth = ImGui.GetContentRegionAvail().X;
        if (inputWidth < 60f)
            inputWidth = 60f;

        ImGui.SetNextItemWidth(inputWidth);

-        // CallbackHistory wires up Up/Down navigation against the shared
-        // InputHistoryService. Submit is detected the same way the main
-        // window does it: via IsItemDeactivated + Enter, NOT EnterReturnsTrue
-        // (matching v0.5.x ChatLogWindow.cs behavior).
+        // CallbackHistory wires Up/Down navigation to InputHistoryService.
+        // Submit detected via IsItemDeactivated + Enter, not EnterReturnsTrue
+        // (matches ChatLogWindow behavior).
        const ImGuiInputTextFlags flags = ImGuiInputTextFlags.CallbackHistory;
        ImGui.InputText(
            $"##chat-compact-input-{tab.Identifier}",
@@ -100,9 +86,8 @@ public sealed class ChatInputBar
    private void SubmitCompact(Tab tab) =>
        CompactInputSubmitter.TrySubmit(_state, tab, _host.SendChatBoxFromExternal);

-    // History-navigation callback for the compact input. Cursor math is
-    // delegated to CompactInputHistoryNavigator; only the ImGui buffer
-    // splice stays here because it needs the live callback data.
+    // History navigation callback. Cursor math delegated to
+    // CompactInputHistoryNavigator; ImGui buffer splice stays here.
    // TEST-MIRROR: ../_Helpers/CompactInputHistoryNavigator.cs
    private int CompactCallback(scoped ref ImGuiInputTextCallbackData data)
    {
@@ -148,7 +133,7 @@ public sealed class ChatInputBar
        var v3 = ColourUtil.RgbaToVector3(rgba);
        var bg = new Vector4(v3.X, v3.Y, v3.Z, 1f);

-        // Compute readable foreground — black on bright, white on dark
+        // Black foreground on bright backgrounds, white on dark.
        var luminance = 0.2126f * v3.X + 0.7152f * v3.Y + 0.0722f * v3.Z;
        var fg = luminance > 0.55f ? new Vector4(0f, 0f, 0f, 1f) : new Vector4(1f, 1f, 1f, 1f);

@@ -160,8 +145,7 @@ public sealed class ChatInputBar
        using (ImRaii.PushColor(ImGuiCol.ButtonActive, bg))
        using (ImRaii.PushColor(ImGuiCol.Text, fg))
        {
-            // Single-letter glyph derived from the channel — quick visual cue
-            // until we have a proper icon font available in the compact bar.
+            // Single-letter glyph as a quick visual cue until a proper icon font lands.
            var label = ChannelGlyph(inputType);
            if (
                ImGui.Button($"{label}##chan-compact", new Vector2(buttonSize, buttonSize))
@@ -171,13 +155,9 @@ public sealed class ChatInputBar
        }

        if (tab.Channel is not null && ImGui.IsItemHovered())
-        {
            ImGui.SetTooltip(Resources.Language.ChatLog_SwitcherDisabled);
-        }
        else if (ImGui.IsItemHovered())
-        {
            ImGui.SetTooltip(inputType.Name());
-        }

        using (var popup = ImRaii.Popup(popupId))
        {
@@ -221,17 +201,12 @@ public sealed class ChatInputBar
            _ => "?",
        };

-    // Forwards a tab-cycle keybind delta to the host so all windows
-    // navigate the same active-tab pointer (single source of truth).
-    public void HandleKeybindForward(int delta)
-    {
-        _host.ChangeTabDelta(delta);
-    }
+    // Forwards a tab-cycle keybind delta to the host (single source of truth).
+    public void HandleKeybindForward(int delta) => _host.ChangeTabDelta(delta);
 }

-// Per-window input state. Each ChatInputBar instance owns one of these
-// so pop-outs and the main window keep independent buffers and channels
-// (State-Sync-Entscheidung A in the v0.6.0 spec).
+// Per-window input state. Each ChatInputBar owns one so pop-outs and the
+// main window keep independent buffers and history cursors.
 public sealed class InputState
 {
    public string Buffer = string.Empty;
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Numerics;
 using System.Text;
+using System.Threading;
 using Dalamud.Bindings.ImGui;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Interface;
@@ -16,6 +17,7 @@ using HellionChat.Resources;
 using HellionChat.Util;
 using Lumina.Data.Files;
 using Lumina.Text.ReadOnly;
+using Microsoft.Extensions.Logging;
 using MoreLinq;

 namespace HellionChat.Ui;
@@ -33,11 +35,21 @@ public class DbViewer : Window

    private int CurrentPage = 1;
    private string SimpleSearchTerm = "";
+
+    // v1.4.8 H2: opt-in full-text search across the whole DB via FTS5.
+    // Transient UI state (per-session), not persisted -- users opt in fresh
+    // every time so they always see the page-filter as the default mode.
+    private bool UseFullTextSearch;
+
    private bool OnlyCurrentCharacter = true;
    private readonly Dictionary<ChatType, (ChatSource, ChatSource)> SelectedChannels;

    private bool IsProcessing;
    private long ProcessingStart = Environment.TickCount64;
+
+    // Bumped per trigger so a late worker drops itself instead of overwriting
+    // a newer result.
+    private long _ftsFilterSeq;
    private (DateTime Min, DateTime Max, int Page, bool Local, int ChannelCount) LastProcessed;

    private string MinDateString = "";
@@ -56,10 +68,13 @@ public class DbViewer : Window

    private bool NeedsScrollReset;

-    public DbViewer(Plugin plugin)
+    private readonly ILogger<DbViewer> _logger;
+
+    public DbViewer(Plugin plugin, ILogger<DbViewer> logger)
        : base("DBViewer###chat2-dbviewer")
    {
        Plugin = plugin;
+        _logger = logger;
        SelectedChannels = TabsUtil.MostlyPlayer;

        DateFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
@@ -82,29 +97,13 @@ public class DbViewer : Window

        RespectCloseHotkey = false;
        DisableWindowSounds = true;
-
-        Plugin
-            .Commands.Register(
-                "/hellionView",
-                "Get access to your message history, with simple filter options.",
-                true
-            )
-            .Execute += Toggle;
    }

    public void Dispose()
    {
-        Plugin
-            .Commands.Register(
-                "/hellionView",
-                "Get access to your message history, with simple filter options.",
-                true
-            )
-            .Execute -= Toggle;
+        // Slash-command tear-down moved to Plugin.TearDownCommands.
    }

-    private void Toggle(string _, string __) => Toggle();
-
    public override void Draw()
    {
        var totalPages = (int)Math.Ceiling((double)Count / RowPerPage);
@@ -211,13 +210,6 @@ public class DbViewer : Window
        if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled))
            ImGui.SetTooltip(Language.Export_Txt_Tooltip);

-        // Hellion Chat: the JSON export button used to dump the database in
-        // the upstream webinterface's wire format. With the webinterface
-        // removed there is no consumer for that format any more, so the
-        // button is dropped. The Privacy tab's MessageExporter covers the
-        // same ground (Markdown / JSON / CSV) with channel and date filters
-        // and is the supported way to get history out of the plugin.
-
        var width = 350 * ImGuiHelpers.GlobalScale;
        var loadingIndicator = IsProcessing && ProcessingStart < Environment.TickCount64;

@@ -240,6 +232,24 @@ public class DbViewer : Window
            tooltipRight: Language.Page_ArrowRight_Tooltip
        );

+        // Full-text search toggle (v1.4.8 H2). IsFtsIndexBuilt is a cached
+        // volatile bool in MessageStore -- single field read per frame, no
+        // SELECT count(*). ImRaii.Disabled blocks any click while the index
+        // is still being built, so no defensive force-off branch needed
+        // inside the if-body. UseFullTextSearch is transient UI state, so we
+        // do not call SaveConfig here.
+        var ftsReady = Plugin.MessageManager.Store.IsFtsIndexBuilt;
+        using (ImRaii.Disabled(!ftsReady))
+        {
+            if (ImGui.Checkbox(HellionStrings.DbViewer_FullTextToggle, ref UseFullTextSearch))
+                TriggerFilterRefresh();
+        }
+        ImGuiUtil.HelpMarker(
+            ftsReady
+                ? HellionStrings.DbViewer_FullTextToggle_Hint_PhraseMode
+                : HellionStrings.DbViewer_FullTextToggle_Hint_Indexing
+        );
+
        ImGui.SameLine(ImGui.GetContentRegionMax().X - width);
        ImGui.SetNextItemWidth(width);
        if (
@@ -250,7 +260,7 @@ public class DbViewer : Window
                30
            )
        )
-            Filtered = Filter(Messages);
+            TriggerFilterRefresh();

        // Third row

@@ -314,7 +324,7 @@ public class DbViewer : Window
                }
                catch (Exception ex)
                {
-                    Plugin.Log.Error(ex, "Failed reading messages from database");
+                    _logger.LogError(ex, "Failed reading messages from database");
                }
                finally
                {
@@ -454,11 +464,53 @@ public class DbViewer : Window
        }
    }

+    // FTS path hits SQLite per keystroke -- dispatch to a worker, drop stale
+    // results via _ftsFilterSeq. Page-filter path is in-memory LINQ, stays
+    // inline.
+    private void TriggerFilterRefresh()
+    {
+        if (!UseFullTextSearch || !Plugin.MessageManager.Store.IsFtsIndexBuilt)
+        {
+            Filtered = Filter(Messages);
+            return;
+        }
+
+        var snapshot = Messages;
+        var mySeq = Interlocked.Increment(ref _ftsFilterSeq);
+        Task.Run(() =>
+        {
+            try
+            {
+                var result = Filter(snapshot);
+                if (Interlocked.Read(ref _ftsFilterSeq) == mySeq)
+                    Filtered = result;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "FTS filter worker failed");
+            }
+        });
+    }
+
    private ConcurrentStack<Message> Filter(Message[] messages)
    {
        if (SimpleSearchTerm == "")
            return new ConcurrentStack<Message>(messages.Reverse().OrderByDescending(m => m.Date));

+        // Full-text mode bypasses the page-bounded messages array and queries
+        // the FTS5 index across the whole DB. IsFtsIndexBuilt re-check guards
+        // against the (rare) case of the toggle being on while the index is
+        // mid-rebuild -- ImRaii.Disabled prevents the user from flipping it,
+        // but a Dispose-and-reopen during indexing could leave UseFullTextSearch
+        // true while ftsReady flipped back to false; the local fallback below
+        // still serves the page.
+        if (UseFullTextSearch && Plugin.MessageManager.Store.IsFtsIndexBuilt)
+        {
+            var guidHits = Plugin.MessageManager.Store.FullTextSearch(SimpleSearchTerm);
+            var resolved = Plugin.MessageManager.Store.LoadByGuids(guidHits);
+            return new ConcurrentStack<Message>(resolved.OrderByDescending(m => m.Date));
+        }
+
        return new ConcurrentStack<Message>(
            messages
                .Reverse()
@@ -577,7 +629,7 @@ public class DbViewer : Window
            }
            catch (Exception ex)
            {
-                Plugin.Log.Error(ex, "Failed creating txt backup");
+                _logger.LogError(ex, "Failed creating txt backup");

                Notification.Content = "Error ...";
                Notification.Type = NotificationType.Error;
@@ -28,17 +28,13 @@ public class DebuggerWindow : Window, IDisposable

        RespectCloseHotkey = false;
        DisableWindowSounds = true;
-
-        Plugin.Commands.Register("/hellionDebugger", showInHelp: false).Execute += Toggle;
    }

    public void Dispose()
    {
-        Plugin.Commands.Register("/hellionDebugger", showInHelp: false).Execute -= Toggle;
+        // Slash-command tear-down moved to Plugin.TearDownCommands.
    }

-    private void Toggle(string _, string __) => Toggle();
-
    public override unsafe void Draw()
    {
        var agent = (nint)AgentItemDetail.Instance();
@@ -30,14 +30,10 @@ public sealed class FirstRunWizard : Window

    public override void OnClose()
    {
-        // Closing the wizard without picking anything = the user accepts
-        // whatever defaults are already in place. Mark as complete so we
-        // don't pester them again on the next launch.
-        if (!Plugin.Config.FirstRunCompleted)
-        {
-            Plugin.Config.FirstRunCompleted = true;
-            Plugin.SaveConfig();
-        }
+        // OnClose fires on explicit X-click and on plugin dispose. We never
+        // implicitly accept the defaults here — the explicit "Later" button
+        // does that. If the user hasn't picked a profile yet, the wizard
+        // reopens on the next plugin load.
    }

    public override void Draw()
@@ -49,7 +45,12 @@ public sealed class FirstRunWizard : Window

        var avail = ImGui.GetContentRegionAvail();
        var cardWidth = (avail.X - ImGui.GetStyle().ItemSpacing.X * 2) / 3f;
-        var cardHeight = avail.Y - ImGui.GetTextLineHeightWithSpacing();
+        // Reserve room for the footer separator + cancel button below the cards.
+        var footerReserve =
+            ImGui.GetStyle().ItemSpacing.Y * 3
+            + ImGui.GetTextLineHeight()
+            + ImGui.GetFrameHeightWithSpacing();
+        var cardHeight = avail.Y - footerReserve;

        DrawCard(
            "privacy-first",
@@ -87,6 +88,20 @@ public sealed class FirstRunWizard : Window
            HellionStrings.Wizard_Profile_FullHistory_Apply,
            ApplyFullHistory
        );
+
+        ImGui.Spacing();
+        ImGui.Separator();
+        ImGui.Spacing();
+
+        if (ImGui.Button(HellionStrings.Wizard_Cancel_Label))
+        {
+            Plugin.Config.FirstRunCompleted = true;
+            Plugin.SaveConfig();
+            IsOpen = false;
+        }
+
+        if (ImGui.IsItemHovered())
+            ImGuiUtil.Tooltip(HellionStrings.Wizard_Cancel_Tooltip);
    }

    private void DrawCard(
@@ -5,18 +5,12 @@ using HellionChat.Util;

 namespace HellionChat.Ui;

-/// <summary>
-/// ImGui style override for Hellion Chat. v1.1.0 ist die Engine
-/// theme-getrieben: PushGlobal nimmt eine Theme-Instance + Window-
-/// Opacity, die gesamten Color- und Style-Slots werden aus dem Theme
-/// gelesen statt aus einer fixen Konstanten-Tabelle.
-/// </summary>
+// Theme-driven ImGui style override. PushGlobal is pushed once per frame
+// in Plugin.Draw and drives every Hellion-rendered window.
 internal static class HellionStyle
 {
-    /// <summary>
-    /// Local color stack auf Basis des aktiven Themes. Cheap. Use inside a
-    /// `using var _ = HellionStyle.Push(theme);` block.
-    /// </summary>
+    // Local color stack for the active theme. Use inside a
+    // `using var _ = HellionStyle.Push(theme);` block.
    internal static IDisposable Push(Theme theme)
    {
        var a = theme.AbgrCache;
@@ -37,13 +31,8 @@ internal static class HellionStyle
        return stack;
    }

-    /// <summary>
-    /// Global color and style-variable stack pushed once per frame in
-    /// Plugin.Draw. Drives every Hellion-rendered window from the active
-    /// theme's palette and layout values.
-    /// </summary>
-    /// <param name="theme">Active theme from ThemeRegistry.</param>
-    /// <param name="windowOpacity">Window background alpha (0.5–1.0).</param>
+    // Global color and style stack pushed once per frame.
+    // windowOpacity: window background alpha (0.5-1.0).
    internal static IDisposable PushGlobal(Theme theme, float windowOpacity = 1.0f)
    {
        var c = theme.Colors;
@@ -54,17 +43,10 @@ internal static class HellionStyle
        var alphaByte = (uint)Math.Clamp((int)(windowOpacity * 255f), 0x55, 0xFF);
        var windowBgWithAlpha = (c.WindowBg & 0xFFFFFF00u) | alphaByte;

-        // ChildBg-Alpha: Sub-Bereiche (Tab-Sidebar, Message-Area, Input-Bar)
-        // werden im ChatLog-Window als BeginChild gezeichnet. Würde der ChildBg
-        // mit dem gleichen Alpha wie WindowBg gerendert, multiplizieren sich
-        // die Layer (1 - (1-α)² Deckung), und 50 % WindowOpacity kommt mit
-        // 75 % Deckung im Child-Bereich an — das Fenster wirkt solider als der
-        // Slider verspricht. Bei voller Opacity bleibt der Theme-Akzent
-        // erhalten (Theme-eigene Alpha-Komponente, i.d.R. FF); sobald der User
-        // Transparenz zieht, wird ChildBg vollständig durchsichtig damit nur
-        // der WindowBg-Layer die finale Deckung bestimmt.
-        var childBgAlpha = windowOpacity >= 0.999f ? (c.ChildBg & 0xFFu) : 0u;
-        var childBgWithAlpha = (c.ChildBg & 0xFFFFFF00u) | childBgAlpha;
+        // ChildBg alpha resolution lives in HellionStyleHelpers so the
+        // threshold logic can be covered by a pure-helper test in the
+        // build suite.
+        var childBgWithAlpha = HellionStyleHelpers.ResolveChildBgAlpha(c.ChildBg, windowOpacity);

        // Layout
        stack.PushStyleVar(ImGuiStyleVar.WindowRounding, l.WindowRounding);
@@ -77,8 +59,8 @@ internal static class HellionStyle
        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.
+        // Surfaces — WindowBg/ChildBg use opacity-modulated values (RGBA path);
+        // everything else reads from the pre-computed ABGR cache.
        stack.PushColor(ImGuiCol.WindowBg, windowBgWithAlpha);
        stack.PushColor(ImGuiCol.ChildBg, childBgWithAlpha);
        stack.PushColorAbgr(ImGuiCol.PopupBg, a.ChildBg);
@@ -0,0 +1,17 @@
+namespace HellionChat.Ui;
+
+internal static class HellionStyleHelpers
+{
+    // Child surfaces are drawn over WindowBg, so at partial window opacity
+    // the theme's own ChildBg alpha would double-multiply and read too solid.
+    // Above ~full opacity we preserve the theme alpha; below it we wipe to 0
+    // so WindowBg alone carries the coverage. The 0.999f threshold is a
+    // float-imprecision guard around the user-facing 100% slider value.
+    // TEST-MIRROR: ../../Hellion Build test/_Helpers/HellionStyleHelpersTests.cs
+    public static uint ResolveChildBgAlpha(uint themeChildBgRgba, float windowOpacity)
+    {
+        var alphaPreserved = windowOpacity >= 0.999f;
+        var childBgAlpha = alphaPreserved ? (themeChildBgRgba & 0xFFu) : 0u;
+        return (themeChildBgRgba & 0xFFFFFF00u) | childBgAlpha;
+    }
+}
@@ -3,6 +3,7 @@ using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Style;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface.Windowing;
+using Microsoft.Extensions.Logging;

 namespace HellionChat.Ui;

@@ -11,28 +12,26 @@ internal class Popout : Window
    private readonly ChatLogWindow ChatLogWindow;
    private readonly Tab Tab;
    private readonly int Idx;
+    private readonly ILogger<Popout> _logger;

-    private long FrameTime; // set every frame
+    private long FrameTime;
    private long LastActivityTime = Environment.TickCount64;

-    // v0.6.0 — optional input bar inside the pop-out window. Lazy-allocated
-    // when the user enables Tab.PopOutInputEnabled and torn down when the
-    // toggle is turned off (independent text buffer is intentionally
-    // discarded — see v0.6.0 spec edge-case P1).
+    // Optional input bar inside the pop-out. Lazy-allocated when enabled,
+    // torn down on toggle-off (buffer discarded intentionally).
    public ChatInputBar? InputBar { get; private set; }
    public bool HasFocusedInputBar => InputBar?.IsFocused ?? false;

-    // Hellion Chat — v0.6.1 expose just the tab identifier (not the whole Tab
-    // reference) so AutoTellTabsService.DropOldestTempTab can locate the
-    // matching pop-out window when an LRU temp tab gets evicted.
+    // Exposed so AutoTellTabsService can locate this window during LRU eviction.
    internal Guid TabIdentifier => Tab.Identifier;

-    public Popout(ChatLogWindow chatLogWindow, Tab tab, int idx)
+    public Popout(ChatLogWindow chatLogWindow, Tab tab, int idx, ILogger<Popout> logger)
        : base($"{tab.Name}##popout")
    {
        ChatLogWindow = chatLogWindow;
        Tab = tab;
        Idx = idx;
+        _logger = logger;

        Size = new Vector2(350, 350);
        SizeCondition = ImGuiCond.FirstUseEver;
@@ -40,12 +39,9 @@ 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.
+        // AllowBackgroundBlur is intentionally off: Dalamud blurs the entire
+        // tab container, not just this window, which would affect adjacent plugins.
+        // Users can enable blur per-window via the Dalamud hamburger menu.
    }

    public override void PreOpenCheck()
@@ -70,7 +66,6 @@ internal class Popout : Window
            return true;
        }

-        // Activity in the tab, this popout window, or the main chat log window.
        var lastActivityTime = Math.Max(Tab.LastActivity, LastActivityTime);
        lastActivityTime = Math.Max(lastActivityTime, ChatLogWindow.LastActivityTime);
        return FrameTime - lastActivityTime <= 1000 * Plugin.Config.InactivityHideTimeout;
@@ -78,10 +73,8 @@ internal class Popout : Window

    public override void PreDraw()
    {
-        // Hellion Chat v1.1.0+ — Theme-Engine ist Source-of-Truth, kein
-        // zusätzlicher Dalamud-StyleModel-Override mehr pro Window. Plugin.Draw
-        // pusht das aktive Hellion-Theme global; Pop-Out zeichnet sich damit
-        // konsistent zum Haupt-Chat-Window.
+        // Theme engine pushes the active theme globally in Plugin.Draw;
+        // pop-outs draw consistently without per-window overrides.
        Flags = ImGuiWindowFlags.None;
        if (!Plugin.Config.ShowPopOutTitleBar)
            Flags |= ImGuiWindowFlags.NoTitleBar;
@@ -92,19 +85,10 @@ internal class Popout : Window
        if (!Tab.CanResize)
            Flags |= ImGuiWindowFlags.NoResize;

-        // Idx may point past the end if PopOutDocked was resized (e.g., a tab
-        // dropped) between the AddPopOutsToDraw() snapshot and this frame.
-        // Guard the read so we don't index into stale state.
+        // Guard against Idx pointing past the end if PopOutDocked was resized mid-frame.
        if (Idx >= 0 && Idx < ChatLogWindow.PopOutDocked.Count && !ChatLogWindow.PopOutDocked[Idx])
        {
-            if (Tab.IndependentOpacity)
-            {
-                BgAlpha = Tab.Opacity / 100f;
-            }
-            else
-            {
-                BgAlpha = Plugin.Config.WindowOpacity;
-            }
+            BgAlpha = Tab.IndependentOpacity ? Tab.Opacity / 100f : Plugin.Config.WindowOpacity;
        }
    }

@@ -118,24 +102,15 @@ internal class Popout : Window
            ImGui.Separator();
        }

-        // v0.6.0 — one-time hint banner explaining the new pop-out input
-        // feature. Shown once per user; "Got it" or "Open settings"
-        // dismisses it and persists the flag.
        var hintBannerHeight = DrawHintBannerIfNeeded();

-        // v0.6.0 — pop-out optional input bar. Reserve height first so the
-        // message log draws into the right region; only shown when the
-        // global master switch is on. Toggle-OFF resets InputBar so the
-        // next toggle-ON gives a fresh buffer (no stale text persists).
+        // Toggle-OFF resets InputBar so the next toggle-ON starts with a fresh buffer.
        var inputEnabled = Plugin.Config.PopOutInputEnabled;
        if (!inputEnabled && InputBar != null)
-        {
            InputBar = null;
-        }
+
        if (inputEnabled)
-        {
            InputBar ??= new ChatInputBar(ChatLogWindow.Plugin, ChatLogWindow, () => Tab);
-        }

        var inputBarHeight = inputEnabled
            ? ImGui.GetFrameHeightWithSpacing() + ImGui.GetStyle().ItemSpacing.Y
@@ -155,8 +130,7 @@ internal class Popout : Window
            LastActivityTime = FrameTime;
    }

-    // Returns the vertical space the banner consumed (0 when not shown)
-    // so the message log can shrink accordingly.
+    // Returns the vertical space consumed by the banner (0 when not shown).
    private float DrawHintBannerIfNeeded()
    {
        if (Plugin.Config.SeenPopOutInputHint)
@@ -204,7 +178,7 @@ internal class Popout : Window
        {
            Plugin.Config.SeenPopOutInputHint = true;
            ChatLogWindow.Plugin.SaveConfig();
-            Plugin.Log.Debug("Pop-Out input hint dismissed");
+            _logger.LogDebug("Pop-Out input hint dismissed");
            if (openSettings)
                ChatLogWindow.Plugin.SettingsWindow.Toggle();
        }
@@ -240,21 +214,18 @@ internal class Popout : Window

    private bool HideStateCheck()
    {
-        // if the chat has no hide state set, and the player has entered battle, we hide chat if they have configured it
        if (Tab.HideInBattle && CurrentHideState == HideState.None && Plugin.InBattle)
        {
            CurrentHideState = HideState.Battle;
-            Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: None → Battle");
+            _logger.LogTrace($"Popout HideState [{Tab.Name}]: None -> Battle");
        }

-        // If the chat is hidden because of battle, we reset it here
        if (CurrentHideState is HideState.Battle && !Plugin.InBattle)
        {
            CurrentHideState = HideState.None;
-            Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: Battle → None");
+            _logger.LogTrace($"Popout HideState [{Tab.Name}]: Battle -> None");
        }

-        // if the chat has no hide state and in a cutscene, set the hide state to cutscene
        if (
            Tab.HideDuringCutscenes
            && CurrentHideState == HideState.None
@@ -264,37 +235,34 @@ internal class Popout : Window
            if (ChatLogWindow.Plugin.Functions.Chat.CheckHideFlags())
            {
                CurrentHideState = HideState.Cutscene;
-                Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: None → Cutscene");
+                _logger.LogTrace($"Popout HideState [{Tab.Name}]: None -> Cutscene");
            }
        }

-        // if the chat is hidden because of a cutscene and no longer in a cutscene, set the hide state to none
        if (
            CurrentHideState is HideState.Cutscene or HideState.CutsceneOverride
            && !Plugin.CutsceneActive
            && !Plugin.GposeActive
        )
        {
-            Plugin.Log.Verbose(
-                $"Popout HideState [{Tab.Name}]: {CurrentHideState} → None (cutscene/gpose ended)"
+            _logger.LogTrace(
+                $"Popout HideState [{Tab.Name}]: {CurrentHideState} -> None (cutscene/gpose ended)"
            );
            CurrentHideState = HideState.None;
        }

-        // if the chat is hidden because of a cutscene and the chat has been activated, show chat
        if (CurrentHideState == HideState.Cutscene && ChatLogWindow.Activate)
        {
            CurrentHideState = HideState.CutsceneOverride;
-            Plugin.Log.Verbose(
-                $"Popout HideState [{Tab.Name}]: Cutscene → CutsceneOverride (user activate)"
+            _logger.LogTrace(
+                $"Popout HideState [{Tab.Name}]: Cutscene -> CutsceneOverride (user activate)"
            );
        }

-        // if the user hid the chat and is now activating chat, reset the hide state
        if (CurrentHideState == HideState.User && ChatLogWindow.Activate)
        {
            CurrentHideState = HideState.None;
-            Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: User → None (activate)");
+            _logger.LogTrace($"Popout HideState [{Tab.Name}]: User -> None (activate)");
        }

        return CurrentHideState is HideState.Cutscene or HideState.User or HideState.Battle
@@ -29,21 +29,13 @@ public class SeStringDebugger : Window

        RespectCloseHotkey = false;
        DisableWindowSounds = true;
-
-#if DEBUG
-        Plugin.Commands.Register("/hellionSeString", showInHelp: false).Execute += Toggle;
-#endif
    }

    public void Dispose()
    {
-#if DEBUG
-        Plugin.Commands.Register("/hellionSeString", showInHelp: false).Execute -= Toggle;
-#endif
+        // Slash-command tear-down moved to Plugin.TearDownCommands.
    }

-    private void Toggle(string _, string __) => Toggle();
-
    public override void Draw()
    {
        if (Plugin.MessageManager.LastMessage.Sender == null)
@@ -6,6 +6,7 @@ using Dalamud.Utility;
 using HellionChat.Resources;
 using HellionChat.Ui.SettingsTabs;
 using HellionChat.Util;
+using Microsoft.Extensions.Logging;

 namespace HellionChat.Ui;

@@ -25,7 +26,7 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
    private SettingsView View = SettingsView.Overview;
    private readonly SettingsOverview Overview;

-    internal SettingsWindow(Plugin plugin)
+    internal SettingsWindow(Plugin plugin, ILoggerFactory loggerFactory)
        : base($"{Language.Settings_Title.Format(Plugin.PluginName)}###chat2-settings")
    {
        Flags = ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse;
@@ -45,13 +46,13 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
        Tabs =
        [
            new General(Plugin, Mutable),
-            new ThemeAndLayout(Plugin, Mutable),
-            new FontsAndColours(Plugin, Mutable),
+            new ThemeAndLayout(Plugin, Mutable, loggerFactory.CreateLogger<ThemeAndLayout>()),
+            new FontsAndColours(Plugin, Mutable, loggerFactory.CreateLogger<FontsAndColours>()),
            new SettingsTabs.Window(Plugin, Mutable),
            new Chat(Plugin, Mutable),
            new SettingsTabs.Tabs(Plugin, Mutable),
            new SettingsTabs.Privacy(Plugin, Mutable),
-            new DataManagement(Plugin, Mutable),
+            new DataManagement(Plugin, Mutable, loggerFactory.CreateLogger<DataManagement>()),
            new SettingsTabs.Integrations(Plugin, Mutable),
            new Information(Mutable),
        ];
@@ -60,23 +61,11 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
        DisableWindowSounds = true;

        Initialise();
-
-        Plugin
-            .Commands.Register("/hellion", "Perform various actions with Hellion Chat.")
-            .Execute += Command;
-        Plugin.Interface.UiBuilder.OpenConfigUi += Toggle;
    }

    public void Dispose()
    {
-        Plugin.Interface.UiBuilder.OpenConfigUi -= Toggle;
-        Plugin.Commands.Register("/hellion").Execute -= Command;
-    }
-
-    private void Command(string command, string args)
-    {
-        if (string.IsNullOrWhiteSpace(args))
-            Toggle();
+        // Slash-command + OpenConfigUi tear-down moved to Plugin.TearDownCommands.
    }

    private void Initialise()
@@ -92,10 +81,8 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
            View = SettingsView.Overview;
        }

-        // 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).
+        // ESC in Detail view returns to Overview. Window focus check is
+        // required so ESC doesn't fire when the user targets a different window.
        if (
            View == SettingsView.Detail
            && ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows)
@@ -128,13 +115,13 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window

    private void DrawDetail()
    {
-        // Breadcrumb-Header — Akzent-Cyan, klickbar, führt zurück zur Overview
+        // Breadcrumb header -- accent cyan, clickable, returns to 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"))
+            if (ImGui.SmallButton("<- Settings"))
            {
                View = SettingsView.Overview;
                return;
@@ -149,11 +136,8 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
        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).
+        // Section content fills full width. Navigation back to another
+        // section goes via the breadcrumb or ESC.
        var style = ImGui.GetStyle();
        var height =
            ImGui.GetContentRegionAvail().Y
@@ -182,9 +166,7 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
        ImGui.SameLine();

        if (ImGui.Button(Language.Settings_Discard))
-        {
            IsOpen = false;
-        }

        const string buttonLabel = "Anna's Ko-fi";
        const string buttonLabel2 = "Infi's Ko-fi";
@@ -206,18 +188,17 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
            );

            if (ImGui.Button(buttonLabel2))
-                Dalamud.Utility.Util.OpenLink("https://ko-fi.com/infiii");
+                Plugin.PlatformUtil.OpenLink("https://ko-fi.com/infiii");

            ImGui.SameLine();

            if (ImGui.Button(buttonLabel))
-                Dalamud.Utility.Util.OpenLink("https://ko-fi.com/lojewalo");
+                Plugin.PlatformUtil.OpenLink("https://ko-fi.com/lojewalo");
        }

        if (!save)
            return;

-        // calculate all conditions before updating config
        var hideChanged = !Mutable.HideChat && Mutable.HideChat != Plugin.Config.HideChat;
        var languageChanged = Mutable.LanguageOverride != Plugin.Config.LanguageOverride;
        var fontChanged =
@@ -230,18 +211,16 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
            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.
+
+        // Only refilter when filter-relevant settings changed. Clear+Refilter
+        // reloads from the DB and silently drops in-session messages that
+        // weren't persisted (Privacy-First blocks most channels). Cosmetic
+        // changes (theme, icons, layout) skip the cycle.
        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
+        // Defer save by 60 frames to avoid committing changes that cause a crash.
        Plugin.DeferredSaveFrames = 60;
        if (filtersChanged)
        {
@@ -259,24 +238,16 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
            GameFunctions.GameFunctions.SetChatInteractable(true);

        if (Plugin.Config.ShowEmotes)
-            _ = EmoteCache.LoadData(); // Fire-and-forget intentional, exceptions are caught inside
+            _ = EmoteCache.LoadData();

        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>
+    // Returns true if any filter-relevant setting changed between Plugin.Config
+    // and the Mutable copy. Gates Clear+Refilter on Save so cosmetic changes
+    // don't wipe in-session chat history.
    private bool HasFilterRelevantChanges()
    {
-        // Top-level privacy controls.
        if (Mutable.PrivacyFilterEnabled != Plugin.Config.PrivacyFilterEnabled)
            return true;
        if (Mutable.PrivacyPersistUnknownChannels != Plugin.Config.PrivacyPersistUnknownChannels)
@@ -285,27 +256,23 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
            return true;

        // FilterIncludePreviousSessions changes the GetMostRecentMessages
-        // window in MessageManager.FilterAllTabs and is therefore filter-
-        // relevant even though it lives outside the Privacy block.
+        // window and is filter-relevant even 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.
+        // Compare persistent tabs only -- TempTabs are never refiltered.
        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
+            return true;

        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.
+            // Identifier mismatch means reorder or slot swap -- treat as filter-relevant.
            if (orig.Identifier != neu.Identifier)
                return true;

@@ -314,8 +281,6 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
            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)
@@ -11,48 +11,60 @@ 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"
-        ),
-    ];
+    // Card order matches the Tabs index in SettingsWindow 1:1.
+    private static (FontAwesomeIcon Icon, string Title, string Subtext)[] BuildCardDefs() =>
+        [
+            (
+                FontAwesomeIcon.SlidersH,
+                HellionStrings.Settings_Card_General_Title,
+                HellionStrings.Settings_Card_General_Subtext
+            ),
+            (
+                FontAwesomeIcon.Palette,
+                HellionStrings.Settings_Card_ThemeAndLayout_Title,
+                HellionStrings.Settings_Card_ThemeAndLayout_Subtext
+            ),
+            (
+                FontAwesomeIcon.Font,
+                HellionStrings.Settings_Card_FontsAndColours_Title,
+                HellionStrings.Settings_Card_FontsAndColours_Subtext
+            ),
+            (
+                FontAwesomeIcon.WindowMaximize,
+                HellionStrings.Settings_Card_Window_Title,
+                HellionStrings.Settings_Card_Window_Subtext
+            ),
+            (
+                FontAwesomeIcon.Comments,
+                HellionStrings.Settings_Card_Chat_Title,
+                HellionStrings.Settings_Card_Chat_Subtext
+            ),
+            (
+                FontAwesomeIcon.FolderTree,
+                HellionStrings.Settings_Card_Tabs_Title,
+                HellionStrings.Settings_Card_Tabs_Subtext
+            ),
+            (
+                FontAwesomeIcon.ShieldAlt,
+                HellionStrings.Settings_Card_Privacy_Title,
+                HellionStrings.Settings_Card_Privacy_Subtext
+            ),
+            (
+                FontAwesomeIcon.Database,
+                HellionStrings.Settings_Card_DataManagement_Title,
+                HellionStrings.Settings_Card_DataManagement_Subtext
+            ),
+            (
+                FontAwesomeIcon.Plug,
+                HellionStrings.Settings_Card_Integrations_Title,
+                HellionStrings.Settings_Card_Integrations_Subtext
+            ),
+            (
+                FontAwesomeIcon.InfoCircle,
+                HellionStrings.Settings_Card_Information_Title,
+                HellionStrings.Settings_Card_Information_Subtext
+            ),
+        ];

    public SettingsOverview(SettingsWindow window)
    {
@@ -64,19 +76,18 @@ internal sealed class SettingsOverview
        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.
+        // 110f accommodates two-line subtexts; wrap width is matched in DrawCard.
        var cardHeight = 110f;

-        for (var i = 0; i < CardDefs.Length; i++)
+        // One draw-list lookup per frame instead of one per card.
+        var drawList = ImGui.GetWindowDrawList();
+        var cardDefs = BuildCardDefs();
+        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);
+            var (icon, title, subtext) = cardDefs[i];
+            DrawCard(i, icon, title, subtext, cardWidth, cardHeight, drawList);

-            if ((i + 1) % columns != 0 && i != CardDefs.Length - 1)
+            if ((i + 1) % columns != 0 && i != cardDefs.Length - 1)
                ImGui.SameLine();
        }
    }
@@ -87,12 +98,12 @@ internal sealed class SettingsOverview
        string title,
        string subtext,
        float w,
-        float h
+        float h,
+        ImDrawListPtr drawList
    )
    {
-        // 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.
+        // BeginGroup makes the card a single layout item so SameLine works
+        // in the caller loop -- without it ImGui tracks each child separately.
        ImGui.BeginGroup();

        var cursorBefore = ImGui.GetCursorScreenPos();
@@ -100,12 +111,8 @@ internal sealed class SettingsOverview
        var hovered = ImGui.IsItemHovered();
        var bgColor = hovered ? 0xFF22303Fu : 0xFF1A2538u;

-        var draw = ImGui.GetWindowDrawList();
-        draw.AddRectFilled(cursorBefore, cursorBefore + new Vector2(w, h), bgColor, 4f);
+        drawList.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);
@@ -115,17 +122,15 @@ internal sealed class SettingsOverview

        using (_window.Plugin.FontManager.FontAwesome.Push())
        {
-            draw.AddText(iconPos, titleColor, icon.ToIconString());
+            drawList.AddText(iconPos, titleColor, icon.ToIconString());
        }

-        draw.AddText(titlePos, titleColor, title);
+        drawList.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.
+        // Subtext wraps at card inner width (16px padding each side) via DrawList
+        // to avoid expanding the group bounds and breaking SameLine in the card row.
        var subtextWrapWidth = w - 32f;
-        draw.AddText(
+        drawList.AddText(
            ImGui.GetFont(),
            ImGui.GetFontSize(),
            subtextPos,
@@ -137,8 +142,6 @@ internal sealed class SettingsOverview
        ImGui.EndGroup();

        if (clicked)
-        {
            _window.OpenSection(index);
-        }
    }
 }
@@ -9,10 +9,7 @@ using HellionChat.Util;

 namespace HellionChat.Ui.SettingsTabs;

-// Chat-Tab — vier eigenständige Sektionen: Auto-Tell-Tabs, Behaviour,
-// Preview, Emotes. Der Emotes-Block ist 1:1 aus der Bestand-Datei
-// Emote.cs übernommen; die Datei wird in Plan-Task 11 (Settings UX
-// Polish v0.5.0) entfernt, sobald alle Tabs migriert sind.
+// Four sections: Auto-Tell Tabs, Behaviour, Preview, Emotes.
 internal sealed class Chat : ISettingsTab
 {
    private Plugin Plugin { get; }
@@ -22,9 +19,8 @@ internal sealed class Chat : ISettingsTab

    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.
+    // Tracks which EmoteCache state WordPopupOptions was built for so we
+    // don't refill every frame when FilteredSheet is empty.
    private EmoteCache.LoadingState? WordPopupOptionsBuiltFor;

    internal Chat(Plugin plugin, Configuration mutable)
@@ -36,15 +32,13 @@ internal sealed class Chat : ISettingsTab
        WordPopupOptionsBuiltFor = EmoteCache.State;
    }

-    private SearchSelector.SelectorPopupOptions RefillSheet()
-    {
-        return new SearchSelector.SelectorPopupOptions
+    private SearchSelector.SelectorPopupOptions RefillSheet() =>
+        new SearchSelector.SelectorPopupOptions
        {
            FilteredSheet = EmoteCache
                .SortedCodeArray.Where(w => !Mutable.BlockedEmotes.Contains(w))
                .ToArray(),
        };
-    }

    public void Draw(bool changed)
    {
@@ -61,9 +55,7 @@ internal sealed class Chat : ISettingsTab
    {
        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Chat_AutoTellTabs_Heading);
        if (!tree.Success)
-        {
            return;
-        }

        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
        {
@@ -76,9 +68,7 @@ internal sealed class Chat : ISettingsTab
            ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
            var limit = Mutable.AutoTellTabsLimit;
            if (ImGui.SliderInt(HellionStrings.ChatLog_AutoTellTabs_Limit_Name, ref limit, 1, 50))
-            {
                Mutable.AutoTellTabsLimit = limit;
-            }
            ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Limit_Description);

            ImGui.Checkbox(
@@ -119,9 +109,7 @@ internal sealed class Chat : ISettingsTab
                    100
                )
            )
-            {
                Mutable.AutoTellTabsHistoryPreload = preload;
-            }
            ImGuiUtil.HelpMarker(HellionStrings.Privacy_AutoTellTabs_Preload_Description);

            ImGui.Spacing();
@@ -133,9 +121,7 @@ internal sealed class Chat : ISettingsTab
    {
        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Chat_Behaviour_Heading);
        if (!tree.Success)
-        {
            return;
-        }

        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
        {
@@ -153,6 +139,12 @@ internal sealed class Chat : ISettingsTab
                );
                ImGuiUtil.HelpMarker(Language.Options_CollapseDuplicateMsgUniqueLink_Description);
            }
+
+            ImGui.Checkbox(
+                HellionStrings.Settings_Chat_SymbolPicker_Enable_Name,
+                ref Mutable.SymbolPickerEnabled
+            );
+            ImGuiUtil.HelpMarker(HellionStrings.Settings_Chat_SymbolPicker_Enable_Description);
        }
    }

@@ -160,9 +152,7 @@ internal sealed class Chat : ISettingsTab
    {
        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Chat_Preview_Heading);
        if (!tree.Success)
-        {
            return;
-        }

        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
        {
@@ -178,9 +168,7 @@ internal sealed class Chat : ISettingsTab
                    foreach (var position in Enum.GetValues<PreviewPosition>())
                    {
                        if (ImGui.Selectable(position.Name(), Mutable.PreviewPosition == position))
-                        {
                            Mutable.PreviewPosition = position;
-                        }
                    }
                }
            }
@@ -193,9 +181,7 @@ internal sealed class Chat : ISettingsTab
                    ref Mutable.PreviewMinimum
                )
            )
-            {
                Mutable.PreviewMinimum = Math.Clamp(Mutable.PreviewMinimum, 1, 250);
-            }

            ImGui.Checkbox(Language.Options_PreviewOnlyIf_Name, ref Mutable.OnlyPreviewIf);
            ImGuiUtil.HelpMarker(Language.Options_PreviewOnlyIf_Description);
@@ -206,9 +192,7 @@ internal sealed class Chat : ISettingsTab
    {
        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Chat_Emotes_Heading);
        if (!tree.Success)
-        {
            return;
-        }

        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
        {
@@ -233,17 +217,13 @@ internal sealed class Chat : ISettingsTab
            using (Plugin.FontManager.FontAwesome.Push())
                ImGui.Button(FontAwesomeIcon.Plus.ToIconString(), new Vector2(buttonWidth, 0));

-            // Open the selector popup on left-click; SelectorPopup uses
-            // ImRaii.ContextPopupItem internally which only opens on right-
-            // click otherwise — without this OpenPopup the button looked
-            // active but the popup never appeared on a normal click.
+            // OpenPopup on click because SelectorPopup uses ContextPopupItem
+            // which only triggers on right-click by default.
            if (ImGui.IsItemClicked())
                ImGui.OpenPopup("WordAddPopup");

            if (SearchSelector.SelectorPopup("WordAddPopup", out var newWord, WordPopupOptions))
-            {
                Mutable.BlockedEmotes.Add(newWord);
-            }

            using (
                var table = ImRaii.Table(
@@ -257,11 +237,9 @@ internal sealed class Chat : ISettingsTab
                {
                    ImGui.TableSetupColumn(Language.Options_Emote_EmoteTable);
                    ImGui.TableSetupColumn("##Del", ImGuiTableColumnFlags.WidthStretch, 0.07f);
-
                    ImGui.TableHeadersRow();

-                    var copiedList = Mutable.BlockedEmotes.ToArray();
-                    foreach (var word in copiedList)
+                    foreach (var word in Mutable.BlockedEmotes.ToArray())
                    {
                        ImGui.TableNextColumn();
                        ImGui.TextUnformatted(word);
@@ -274,9 +252,7 @@ internal sealed class Chat : ISettingsTab
                                !ImGui.GetIO().KeyCtrl
                            )
                        )
-                        {
                            Mutable.BlockedEmotes.Remove(word);
-                        }
                    }
                }
            }
@@ -289,17 +265,14 @@ internal sealed class Chat : ISettingsTab
            ImGui.Spacing();

            if (EmoteCache.State is EmoteCache.LoadingState.Done)
-            {
                ImGui.TextColored(ImGuiColors.HealerGreen, Language.Options_Emote_Ready);
-            }
            else
-            {
                ImGui.TextColored(ImGuiColors.DPSRed, Language.Options_Emote_NotReady);
-            }

            ImGui.TextUnformatted(
                $"{Language.Options_Emote_Loaded} {EmoteCache.SortedCodeArray.Length}"
            );
+
            using (
                var emoteTable = ImRaii.Table(
                    "##LoadedEmotes",
@@ -11,6 +11,7 @@ using HellionChat.Export;
 using HellionChat.Privacy;
 using HellionChat.Resources;
 using HellionChat.Util;
+using Microsoft.Extensions.Logging;

 namespace HellionChat.Ui.SettingsTabs;

@@ -18,6 +19,7 @@ internal sealed class DataManagement : ISettingsTab
 {
    private Plugin Plugin { get; }
    private Configuration Mutable { get; }
+    private readonly ILogger<DataManagement> _logger;

    public string Name =>
        HellionStrings.Settings_Card_DataManagement_Title + "###tabs-datamanagement";
@@ -136,10 +138,11 @@ internal sealed class DataManagement : ISettingsTab
        ),
    ];

-    internal DataManagement(Plugin plugin, Configuration mutable)
+    internal DataManagement(Plugin plugin, Configuration mutable, ILogger<DataManagement> logger)
    {
        Plugin = plugin;
        Mutable = mutable;
+        _logger = logger;
    }

    public void Draw(bool changed)
@@ -229,7 +232,7 @@ internal sealed class DataManagement : ISettingsTab
                    }
                    catch (Exception e)
                    {
-                        Plugin.Log.Error(e, "Unable to delete old database");
+                        _logger.LogError(e, "Unable to delete old database");
                        WrapperUtil.AddNotification(
                            Language.Options_Database_Old_Delete_Error,
                            NotificationType.Error
@@ -391,7 +394,7 @@ internal sealed class DataManagement : ISettingsTab
                Plugin.Config.RetentionLastRunAt = DateTimeOffset.UtcNow;
                Plugin.SaveConfig();

-                Plugin.Log.Information($"Manual retention run deleted {deleted} expired messages.");
+                _logger.LogInformation($"Manual retention run deleted {deleted} expired messages.");

                if (deleted > 0)
                {
@@ -405,7 +408,7 @@ internal sealed class DataManagement : ISettingsTab
                            .Wait(TimeSpan.FromSeconds(5))
                    )
                    {
-                        Plugin.Log.Warning(
+                        _logger.LogWarning(
                            "Retention sweep: framework refresh timed out after 5s."
                        );
                    }
@@ -418,7 +421,7 @@ internal sealed class DataManagement : ISettingsTab
            }
            catch (Exception e)
            {
-                Plugin.Log.Error(e, "Manual retention run failed");
+                _logger.LogError(e, "Manual retention run failed");
                WrapperUtil.AddNotification(HellionStrings.Retention_Error, NotificationType.Error);
            }
            finally
@@ -566,7 +569,7 @@ internal sealed class DataManagement : ISettingsTab
        }
        catch (Exception e)
        {
-            Plugin.Log.Error(e, "Failed to compute cleanup preview");
+            _logger.LogError(e, "Failed to compute cleanup preview");
            WrapperUtil.AddNotification(
                HellionStrings.Cleanup_PreviewError,
                NotificationType.Error
@@ -587,7 +590,7 @@ internal sealed class DataManagement : ISettingsTab
            try
            {
                var deleted = Plugin.MessageManager.Store.CleanupRetainOnly(allowed);
-                Plugin.Log.Information($"Privacy cleanup: deleted {deleted} messages");
+                _logger.LogInformation($"Privacy cleanup: deleted {deleted} messages");

                if (
                    !Plugin
@@ -599,7 +602,7 @@ internal sealed class DataManagement : ISettingsTab
                        .Wait(TimeSpan.FromSeconds(5))
                )
                {
-                    Plugin.Log.Warning("Privacy cleanup: framework refresh timed out after 5s.");
+                    _logger.LogWarning("Privacy cleanup: framework refresh timed out after 5s.");
                }

                WrapperUtil.AddNotification(
@@ -609,7 +612,7 @@ internal sealed class DataManagement : ISettingsTab
            }
            catch (Exception e)
            {
-                Plugin.Log.Error(e, "Privacy cleanup failed");
+                _logger.LogError(e, "Privacy cleanup failed");
                WrapperUtil.AddNotification(HellionStrings.Cleanup_Error, NotificationType.Error);
            }
            finally
@@ -769,7 +772,7 @@ internal sealed class DataManagement : ISettingsTab
            }
            catch (Exception e)
            {
-                Plugin.Log.Error(e, "Export failed");
+                _logger.LogError(e, "Export failed");
                WrapperUtil.AddNotification(HellionStrings.Export_Error, NotificationType.Error);
            }
            finally
@@ -849,7 +852,7 @@ internal sealed class DataManagement : ISettingsTab
                )
            )
            {
-                Plugin.Log.Warning("Clearing messages from database");
+                _logger.LogWarning("Clearing messages from database");
                Plugin.MessageManager.Store.ClearMessages();
                Plugin.MessageManager.ClearAllTabs();

@@ -907,7 +910,7 @@ internal sealed class DataManagement : ISettingsTab

    private void InsertMessages(int count)
    {
-        Plugin.Log.Info($"Inserting {count} messages due to user request");
+        _logger.LogInformation($"Inserting {count} messages due to user request");

        var stopwatch = Stopwatch.StartNew();
        var playerName = Plugin.PlayerState.CharacterName;
@@ -952,7 +955,7 @@ internal sealed class DataManagement : ISettingsTab

        var elapsedTicks = stopwatch.ElapsedTicks;
        stopwatch.Stop();
-        Plugin.Log.Info(
+        _logger.LogInformation(
            $"Crafted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
        );

@@ -962,7 +965,7 @@ internal sealed class DataManagement : ISettingsTab

        elapsedTicks = stopwatch.ElapsedTicks;
        stopwatch.Stop();
-        Plugin.Log.Info(
+        _logger.LogInformation(
            $"Upserted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
        );

@@ -973,7 +976,7 @@ internal sealed class DataManagement : ISettingsTab
                Plugin.MessageManager.ClearAllTabs();
                elapsedTicks = stopwatch.ElapsedTicks;
                stopwatch.Stop();
-                Plugin.Log.Info(
+                _logger.LogInformation(
                    $"Cleared {Plugin.Config.Tabs.Count} tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
                );
            })
@@ -986,7 +989,7 @@ internal sealed class DataManagement : ISettingsTab
                Plugin.MessageManager.FilterAllTabs();
                elapsedTicks = stopwatch.ElapsedTicks;
                stopwatch.Stop();
-                Plugin.Log.Info(
+                _logger.LogInformation(
                    $"Fetched and filtered all tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
                );
            })
@@ -7,6 +7,7 @@ using Dalamud.Interface.Utility.Raii;
 using HellionChat.Code;
 using HellionChat.Resources;
 using HellionChat.Util;
+using Microsoft.Extensions.Logging;

 namespace HellionChat.Ui.SettingsTabs;

@@ -14,14 +15,16 @@ internal sealed class FontsAndColours : ISettingsTab
 {
    private Plugin Plugin { get; }
    private Configuration Mutable { get; }
+    private readonly ILogger<FontsAndColours> _logger;

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

-    internal FontsAndColours(Plugin plugin, Configuration mutable)
+    internal FontsAndColours(Plugin plugin, Configuration mutable, ILogger<FontsAndColours> logger)
    {
        Plugin = plugin;
        Mutable = mutable;
+        _logger = logger;
    }

    public void Draw(bool changed)
@@ -312,6 +315,6 @@ internal sealed class FontsAndColours : ISettingsTab
        }
        Plugin.SaveConfig();
        GlobalParametersCache.Refresh();
-        Plugin.Log.Debug($"Applied chat colour preset: {preset.DisplayName}");
+        _logger.LogDebug($"Applied chat colour preset: {preset.DisplayName}");
    }
 }
@@ -8,9 +8,7 @@ using HellionChat.Util;

 namespace HellionChat.Ui.SettingsTabs;

-// Information-Tab vereint die früheren About- und Changelog-Tabs in
-// drei kollabierbaren Sektionen. Der About-Inhalt ist 1:1 aus About.cs
-// übernommen, die Changelog-Render-Logik aus Changelog.cs.
+// Combines the former About and Changelog tabs into three collapsible sections.
 internal sealed class Information : ISettingsTab
 {
    private Configuration Mutable { get; }
@@ -99,7 +97,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(
+                Plugin.PlatformUtil.OpenLink(
                    "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/issues"
                );
        }
@@ -118,7 +116,7 @@ internal sealed class Information : ISettingsTab
            ImGui.TextUnformatted(HellionStrings.About_Maintainer_Website_Label);
            ImGui.SameLine();
            if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "hellionMedia"))
-                Dalamud.Utility.Util.OpenLink("https://hellion-media.de");
+                Plugin.PlatformUtil.OpenLink("https://hellion-media.de");

            ImGuiHelpers.ScaledDummy(10.0f);

@@ -139,7 +137,7 @@ internal sealed class Information : ISettingsTab
            ImGui.TextUnformatted(HellionStrings.About_BuiltOn_Upstream_Label);
            ImGui.SameLine();
            if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "chatTwoUpstream"))
-                Dalamud.Utility.Util.OpenLink("https://github.com/Infiziert90/ChatTwo");
+                Plugin.PlatformUtil.OpenLink("https://github.com/Infiziert90/ChatTwo");

            ImGuiHelpers.ScaledDummy(10.0f);

@@ -8,9 +8,8 @@ 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.
+// Added in v1.3.0. Each future integration cycle adds a section above
+// the "Coming soon" block and removes its stub item.
 internal sealed class Integrations : ISettingsTab
 {
    private Plugin Plugin { get; }
@@ -48,11 +47,9 @@ internal sealed class Integrations : ISettingsTab
        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.
+        // Toggle works regardless of detection state: "show when available,
+        // hide otherwise". Disabling it when Honorific is missing would force
+        // the user to retoggle on every reload.
        if (
            ImGui.Checkbox(
                HellionStrings.Settings_Integrations_Honorific_Toggle,
@@ -74,22 +71,31 @@ internal sealed class Integrations : ISettingsTab
            {
                ImGui.TextWrapped(HellionStrings.Settings_Integrations_Honorific_ToggleHint);
            }
+
+            if (
+                ImGui.Checkbox(
+                    HellionStrings.Settings_Integrations_Honorific_Glow_Toggle,
+                    ref Mutable.ShowHonorificGlow
+                )
+            )
+            {
+                Plugin.SaveConfig();
+            }
+            ImGuiUtil.HelpMarker(HellionStrings.Settings_Integrations_Honorific_Glow_Hint);
        }

-        // 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.
+        // Honorific has no LICENSE in its repo so we link upstream and author
+        // instead of bundling assets. Text labels because FA Brands isn't
+        // guaranteed in Dalamud's font set.
        ImGui.Spacing();
        if (ImGui.Button(HellionStrings.Settings_Integrations_Honorific_LinkRepo))
        {
-            Dalamud.Utility.Util.OpenLink(IntegrationLinks.HonorificRepo);
+            Plugin.PlatformUtil.OpenLink(IntegrationLinks.HonorificRepo);
        }
        ImGui.SameLine();
        if (ImGui.Button(HellionStrings.Settings_Integrations_Honorific_LinkAuthor))
        {
-            Dalamud.Utility.Util.OpenLink(IntegrationLinks.HonorificAuthor);
+            Plugin.PlatformUtil.OpenLink(IntegrationLinks.HonorificAuthor);
        }
    }

@@ -147,9 +153,7 @@ internal sealed class Integrations : ISettingsTab
        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.
+        // Each integration cycle removes its stub here and adds a full section above.
        DrawComingSoonItem(
            HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Title,
            HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Description
@@ -200,7 +204,7 @@ internal sealed class Integrations : ISettingsTab

        if (ImGui.Button(HellionStrings.Settings_Integrations_GotAnIdea_LinkLabel))
        {
-            Dalamud.Utility.Util.OpenLink(BrandingLinks.HellionForgeDiscordInvite);
+            Plugin.PlatformUtil.OpenLink(BrandingLinks.HellionForgeDiscordInvite);
        }
    }

@@ -20,8 +20,7 @@ internal sealed class Privacy : ISettingsTab
        Mutable = mutable;
    }

-    // (HeadingKey lookup, ChatType list). Heading is resolved per-frame so
-    // a runtime LanguageChanged call updates the labels immediately.
+    // (HeadingKey, ChatType list). Heading resolved per-frame for live language switching.
    private static readonly (Func<string> Heading, ChatType[] Types)[] Groups =
    [
        (
@@ -123,7 +123,7 @@ internal sealed class Tabs : ISettingsTab
                ImGuiInputTextFlags.EnterReturnsTrue
            );

-            // v1.2.0 — Per-Tab Icon-Override. Default-Mapping greift falls nichts gesetzt.
+            // Per-tab icon override added in v1.2.0. Falls back to default mapping if unset.
            ImGui.TextUnformatted(HellionStrings.Tabs_Icon_Label);
            ImGui.SameLine();
            ImGuiUtil.HelpMarker(HellionStrings.Tabs_Icon_HelpMarker);
@@ -135,7 +135,7 @@ internal sealed class Tabs : ISettingsTab
            {
                if (combo.Success)
                {
-                    // Erste Option: Default (löscht Icon, lässt Mapping greifen).
+                    // First option clears the icon and lets the default mapping take over.
                    if (
                        ImGui.Selectable(
                            HellionStrings.Tabs_Icon_DefaultOption,
@@ -148,7 +148,7 @@ internal sealed class Tabs : ISettingsTab

                    ImGui.Separator();

-                    // Pool-Optionen aus TabIconGlyphResolver.PickerOptions (Single-Source-of-Truth).
+                    // Options sourced from TabIconGlyphResolver.PickerOptions (single source of truth).
                    foreach (var option in TabIconGlyphResolver.PickerOptions)
                    {
                        var isSelected = string.Equals(
@@ -305,10 +305,8 @@ internal sealed class Tabs : ISettingsTab

                        ImGui.SameLine();

-                        // Guard against an empty worlds list — can happen briefly
-                        // when switching characters or if the datacenter sheet
-                        // has not yet populated. Without the guard the indexed
-                        // access into worlds[selectedWorld] would crash.
+                        // Guard against an empty worlds list (character switch or sheet not yet populated)
+                        // to avoid an out-of-bounds crash on worlds[selectedWorld].
                        if (worlds.Count == 0)
                        {
                            ImGui.TextDisabled("(no worlds available)");
@@ -4,6 +4,7 @@ using Dalamud.Interface.Utility.Raii;
 using HellionChat.Resources;
 using HellionChat.Themes;
 using HellionChat.Util;
+using Microsoft.Extensions.Logging;

 namespace HellionChat.Ui.SettingsTabs;

@@ -11,16 +12,18 @@ internal sealed class ThemeAndLayout : ISettingsTab
 {
    private Plugin Plugin { get; }
    private Configuration Mutable { get; }
+    private readonly ILogger<ThemeAndLayout> _logger;

    private string? _applyDismissedFor;

    public string Name =>
        HellionStrings.Settings_Card_ThemeAndLayout_Title + "###tabs-themeandlayout";

-    internal ThemeAndLayout(Plugin plugin, Configuration mutable)
+    internal ThemeAndLayout(Plugin plugin, Configuration mutable, ILogger<ThemeAndLayout> logger)
    {
        Plugin = plugin;
        Mutable = mutable;
+        _logger = logger;
    }

    public void Draw(bool changed)
@@ -43,9 +46,9 @@ internal sealed class ThemeAndLayout : ISettingsTab
            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));
+            ImGui.TextUnformatted(
+                string.Format(HellionStrings.Settings_Themes_Active, active.Name)
+            );
            using (ImRaii.PushColor(ImGuiCol.Text, 0xFF8FA3B5u))
                ImGui.TextUnformatted(active.Author);

@@ -55,10 +58,7 @@ internal sealed class ThemeAndLayout : ISettingsTab
            ImGui.Separator();
            ImGui.Spacing();

-            var builtInsLabel =
-                HellionStrings.ResourceManager.GetString("Settings_Themes_BuiltIns")
-                ?? "Built-in themes";
-            ImGui.TextUnformatted(builtInsLabel);
+            ImGui.TextUnformatted(HellionStrings.Settings_Themes_BuiltIns);
            ImGui.Spacing();
            DrawThemeGrid(registry.AllBuiltIns(), active.Slug);

@@ -68,10 +68,7 @@ internal sealed class ThemeAndLayout : ISettingsTab
                ImGui.Spacing();
                ImGui.Separator();
                ImGui.Spacing();
-                var customLabel =
-                    HellionStrings.ResourceManager.GetString("Settings_Themes_Custom")
-                    ?? "Custom themes";
-                ImGui.TextUnformatted(customLabel);
+                ImGui.TextUnformatted(HellionStrings.Settings_Themes_Custom);
                ImGui.Spacing();
                DrawThemeGrid(customs, active.Slug);
            }
@@ -80,21 +77,15 @@ internal sealed class ThemeAndLayout : ISettingsTab
            ImGui.Separator();
            ImGui.Spacing();

-            var openFolderLabel =
-                HellionStrings.ResourceManager.GetString("Settings_Themes_OpenFolder")
-                ?? "Open themes folder";
-            if (ImGui.Button(openFolderLabel))
+            if (ImGui.Button(HellionStrings.Settings_Themes_OpenFolder))
            {
                var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
                Directory.CreateDirectory(dir);
-                Dalamud.Utility.Util.OpenLink(dir);
+                Plugin.PlatformUtil.OpenLink(dir);
            }

            ImGui.SameLine();
-            var exportLabel =
-                HellionStrings.ResourceManager.GetString("Settings_Themes_ExportActive")
-                ?? "Export active...";
-            if (ImGui.Button(exportLabel))
+            if (ImGui.Button(HellionStrings.Settings_Themes_ExportActive))
            {
                var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
                Directory.CreateDirectory(dir);
@@ -102,7 +93,7 @@ internal sealed class ThemeAndLayout : ISettingsTab
                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}");
+                _logger.LogInformation($"Exported active theme '{active.Slug}' to {path}");
            }
        }
    }
@@ -206,25 +197,19 @@ internal sealed class ThemeAndLayout : ISettingsTab
        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);
+        draw.AddText(
+            origin + new Vector2(12f, 10f),
+            textColor,
+            HellionStrings.Settings_Themes_ApplyChatColors_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))
+            if (ImGui.Button(HellionStrings.Settings_Themes_ApplyChatColors_Apply))
            {
                foreach (var kvp in themeChatColors.Channels)
                    Mutable.ChatColours[kvp.Key] = kvp.Value;
@@ -233,7 +218,7 @@ internal sealed class ThemeAndLayout : ISettingsTab
        }

        ImGui.SameLine();
-        if (ImGui.Button(keepLabel))
+        if (ImGui.Button(HellionStrings.Settings_Themes_ApplyChatColors_Keep))
        {
            _applyDismissedFor = active.Slug;
        }
@@ -268,13 +253,32 @@ internal sealed class ThemeAndLayout : ISettingsTab
                string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName)
            );

+            if (Mutable.SidebarTabView)
+            {
+                var sidebarWidth = Mutable.SidebarWidth;
+                if (
+                    ImGui.SliderInt(
+                        HellionStrings.Settings_ThemeAndLayout_SidebarWidth_Name,
+                        ref sidebarWidth,
+                        44,
+                        160,
+                        $"{sidebarWidth} px"
+                    )
+                )
+                {
+                    Mutable.SidebarWidth = sidebarWidth;
+                }
+                ImGuiUtil.HelpMarker(
+                    HellionStrings.Settings_ThemeAndLayout_SidebarWidth_Description
+                );
+            }
+
            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).
+            // Slider range 50-100% maps to 0.5-1.0 internally. Floor at 50% prevents
+            // accidentally hiding the chat background (v1.2.0 bug at WindowAlpha=0).
            var opacityPercent = Mutable.WindowOpacity * 100f;
            if (
                ImGuiUtil.DragFloatVertical(
@@ -7,15 +7,14 @@ 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.
+    // Mini chat window mockup drawn directly into the WindowDrawList.
+    // No textures, no per-frame allocations — pure AddRectFilled/AddText.
    public static void Draw(Vector2 origin, Vector2 size, Theme theme)
    {
        var draw = ImGui.GetWindowDrawList();
        var c = theme.Colors;

-        // Window-Bg
+        // Window background
        draw.AddRectFilled(
            origin,
            origin + size,
@@ -23,7 +22,7 @@ internal static class ThemeMockup
            theme.Layout.WindowRounding
        );

-        // Title-Bar
+        // Title bar
        var titleHeight = 14f;
        draw.AddRectFilled(
            origin,
@@ -32,7 +31,7 @@ internal static class ThemeMockup
            theme.Layout.WindowRounding
        );

-        // Tab-Bar — 3 Mini-Tabs
+        // Tab bar (3 tabs)
        var tabY = origin.Y + titleHeight + 4f;
        var tabHeight = 12f;
        for (var i = 0; i < 3; i++)
@@ -46,7 +45,7 @@ internal static class ThemeMockup
                theme.Layout.TabRounding
            );

-            if (i == 0) // Active-Pill
+            if (i == 0) // active pill
            {
                draw.AddRectFilled(
                    new Vector2(tabX, tabY + tabHeight - 2f),
@@ -56,7 +55,7 @@ internal static class ThemeMockup
            }
        }

-        // Card-Row mit Mock-Sender + Text
+        // Message card row
        var rowY = tabY + tabHeight + 6f;
        var rowHeight = 18f;
        draw.AddRectFilled(
@@ -66,7 +65,7 @@ internal static class ThemeMockup
            2f
        );

-        // Akzent-Button rechts unten
+        // Accent button (bottom right)
        var btnW = 28f;
        var btnH = 10f;
        var btnX = origin.X + size.X - btnW - 6f;
@@ -78,7 +77,7 @@ internal static class ThemeMockup
            theme.Layout.FrameRounding
        );

-        // Border um das gesamte Mockup
+        // Mockup border
        draw.AddRect(
            origin,
            origin + size,
@@ -107,7 +107,7 @@ internal sealed class Window : ISettingsTab
                1,
                10
            );
-            // Untergrenze von 2 Sekunden gegen Selbst-Soft-Lock.
+            // Floor at 2 seconds to prevent self-soft-lock.
            Mutable.InactivityHideTimeout = Math.Max(2, Mutable.InactivityHideTimeout);

            using (ImRaii.Disabled(Mutable.HideInBattle))
@@ -177,7 +177,6 @@ internal sealed class Window : ISettingsTab
            ImGui.Checkbox(Language.Options_CanMove_Name, ref Mutable.CanMove);
            ImGui.Checkbox(Language.Options_CanResize_Name, ref Mutable.CanResize);

-            // v0.6.0 — global master switch for the pop-out input bar.
            ImGui.Checkbox(
                HellionStrings.Settings_Window_PopOutInputEnabled_Name,
                ref Mutable.PopOutInputEnabled
@@ -186,9 +185,7 @@ internal sealed class Window : ISettingsTab

            ImGui.Spacing();

-            // Manual escape hatch for off-screen windows. The plugin already
-            // runs an automatic bounds check once per session, but a button
-            // is the user-friendly fallback after a display layout change.
+            // Fallback for off-screen windows after a display layout change.
            if (ImGui.Button(HellionStrings.Settings_Window_ResetPosition_Name))
                Plugin.ChatLogWindow.RequestPositionReset = true;
            ImGuiUtil.HelpMarker(HellionStrings.Settings_Window_ResetPosition_Description);
@@ -2,6 +2,7 @@ using System.Globalization;
 using System.Numerics;
 using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
+using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using HellionChat.Code;
 using HellionChat.Resources;
@@ -9,32 +10,31 @@ 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>
+// Bottom status bar. Slots left to right: channel indicator, privacy badge,
+// counts, tells (hidden at 0), version (right-aligned). Updates at 1Hz;
+// format strings are cached between updates.
 internal sealed class StatusBar
 {
-    public const float Height = 22f;
+    // DPI-aware bar height. The previous fixed 22px constant clipped on
+    // Windows display-scaling >100% because ImGui renders the font bigger
+    // than the reservation. GetTextLineHeightWithSpacing scales with the
+    // current ImGui font; the 2px spacer is GlobalScale-rounded to stay
+    // on integer pixel boundaries (same idiom as v1.4.6 F7.2 underline-pill
+    // in ChatLogWindow.cs:1639-1653).
+    public static float Height =>
+        ImGui.GetTextLineHeightWithSpacing() + MathF.Round(2f * ImGuiHelpers.GlobalScale);
+
    private const long UpdateIntervalMs = 1000;

-    // Cache-State — initial outdated, damit der erste Frame frisch berechnet.
+    // Initially outdated so the first frame always computes fresh.
    private long _lastUpdateMs = -UpdateIntervalMs;
    private string _cachedCountsText = string.Empty;
    private string _cachedTellsText = string.Empty;

-    /// <summary>
-    /// Reine String-Logik — testbar ohne ImGui-Init.
-    /// </summary>
+    // Pure string logic, testable without ImGui init.
    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).
+        // InvariantCulture so locale doesn't affect the format (e.g. de_DE "1,2k").
        var msgPart =
            messages >= 1000
                ? string.Format(CultureInfo.InvariantCulture, "{0:0.0}k msg", messages / 1000.0)
@@ -43,10 +43,7 @@ internal sealed class StatusBar
        return $"{tabsPart} · {msgPart}";
    }

-    /// <summary>
-    /// Reine String-Logik — testbar ohne ImGui-Init.
-    /// 0 Tells → Leerstring (Slot wird ausgeblendet).
-    /// </summary>
+    // Pure string logic, testable without ImGui init. Returns empty string at 0 tells.
    public static string FormatTells(int count)
    {
        if (count <= 0)
@@ -54,8 +51,7 @@ internal sealed class StatusBar
        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.
+    // Single-pass replacement for a LINQ Sum+Count pair. Pure helper for unit testing.
    internal static (int messages, int tells) AggregateForStatusBar(IList<Tab> tabs)
    {
        int messages = 0,
@@ -69,10 +65,7 @@ internal sealed class StatusBar
        return (messages, tells);
    }

-    /// <summary>
-    /// Test-Hook: Cache-Logic ohne reale Time-Source verifizieren.
-    /// Nicht für Production-Render.
-    /// </summary>
+    // Test hook to verify cache logic without a real time source.
    internal (string counts, string tells) SnapshotForTest(
        long now,
        int tabs,
@@ -93,24 +86,18 @@ internal sealed class StatusBar
        _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.
+        // Border top via DrawList -- ImGui.Separator has too much padding.
        var cursorY = ImGui.GetCursorScreenPos().Y;
        var winLeft = ImGui.GetWindowPos().X;
        var winRight = winLeft + ImGui.GetWindowSize().X;
@@ -123,9 +110,9 @@ internal sealed class StatusBar
                1f
            );

-        ImGui.Dummy(new Vector2(0, 2)); // BorderTop-Spacing
+        ImGui.Dummy(new Vector2(0, 2));

-        // Slot 1: Active-Channel-Indicator
+        // Slot 1: active channel indicator
        var inputCh = plugin.CurrentTab?.CurrentChannel?.Channel ?? InputChannel.Invalid;
        var hasChannel = inputCh != InputChannel.Invalid;
        var chatType = inputCh.ToChatType();
@@ -137,7 +124,7 @@ internal sealed class StatusBar
        ImGui.SameLine();
        ImGui.TextUnformatted(channelName);

-        // Slot 2: Privacy-Badge — abgeleitet aus PrivacyFilterEnabled.
+        // Slot 2: privacy badge
        ImGui.SameLine();
        DrawSeparator();
        ImGui.SameLine();
@@ -151,13 +138,13 @@ internal sealed class StatusBar
            : HellionStrings.StatusBar_Privacy_Open;
        ImGui.TextUnformatted(privacyLabel);

-        // Slot 3: Counts
+        // Slot 3: counts
        ImGui.SameLine();
        DrawSeparator();
        ImGui.SameLine();
        ImGui.TextUnformatted(_cachedCountsText);

-        // Slot 4: Tells (nur wenn > 0)
+        // Slot 4: tells (hidden at 0)
        if (!string.IsNullOrEmpty(_cachedTellsText))
        {
            ImGui.SameLine();
@@ -166,14 +153,20 @@ internal sealed class StatusBar
            ImGui.TextUnformatted(_cachedTellsText);
        }

-        // Slot 5: Version (rechtsbündig, muted)
+        // Slot 5: version, right-aligned, muted. Hidden when the window is
+        // too narrow to fit all five slots — the other four need ~200 px
+        // before the version text starts clipping into them.
        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)))
+        const float MinOtherSlotsWidth = 200f;
+        if (contentRegionMax - versionWidth > MinOtherSlotsWidth)
        {
-            ImGui.TextUnformatted(versionText);
+            ImGui.SameLine(contentRegionMax - versionWidth);
+            using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(theme.Colors.TextMuted)))
+            {
+                ImGui.TextUnformatted(versionText);
+            }
        }
    }

@@ -0,0 +1,308 @@
+using System.Numerics;
+using Dalamud.Bindings.ImGui;
+using Dalamud.Game.Text;
+using Dalamud.Interface.Utility.Raii;
+
+namespace HellionChat.Ui;
+
+// Popup picker for chat-input symbol insertion. Two tabs:
+//   PUA  — Dalamud's SeIconChar enum (161 server-safe FFXIV glyphs)
+//   BMP  — server-verified Unicode symbols (whitelist built 2026-05-16)
+//
+// Render-only — the Settings-Guard for showing the trigger button lives on
+// the caller side (ChatLogWindow). Recent-Used is session state by design.
+internal sealed class SymbolPicker
+{
+    private const string PopupId = "HellionSymbolPicker";
+    private const int RecentCapacity = 16;
+
+    private string _search = string.Empty;
+    private readonly List<uint> _recentUsed = new(capacity: RecentCapacity);
+
+    // FFXIV server-safe BMP symbols, verified 2026-05-16 via /echo + /say.
+    // Filtered ranges: U+2694-26C4 (Misc Symbols Extended), U+2700+ (Dingbats
+    // Extended), diagonal arrows, U+2153+ fractions, chess pieces.
+    // Full probe log: Cycles/v1.4.10 BMP-Whitelist Notes.md.
+    private static readonly (uint Codepoint, string Name)[] BmpWhitelist = new[]
+    {
+        (0x00A1u, "Inverted Exclamation"),
+        (0x00A2u, "Cent Sign"),
+        (0x00A3u, "Pound Sign"),
+        (0x00A4u, "Currency Sign"),
+        (0x00A5u, "Yen Sign"),
+        (0x00A7u, "Section Sign"),
+        (0x00A9u, "Copyright Sign"),
+        (0x00ABu, "Left Angle Quote"),
+        (0x00AEu, "Registered Sign"),
+        (0x00B0u, "Degree Sign"),
+        (0x00B1u, "Plus-Minus Sign"),
+        (0x00B6u, "Pilcrow Sign"),
+        (0x00BBu, "Right Angle Quote"),
+        (0x00BCu, "One Quarter"),
+        (0x00BDu, "One Half"),
+        (0x00BEu, "Three Quarters"),
+        (0x00BFu, "Inverted Question"),
+        (0x00D7u, "Multiplication Sign"),
+        (0x00F7u, "Division Sign"),
+        (0x0393u, "Greek Capital Gamma"),
+        (0x0394u, "Greek Capital Delta"),
+        (0x0398u, "Greek Capital Theta"),
+        (0x039Bu, "Greek Capital Lambda"),
+        (0x039Eu, "Greek Capital Xi"),
+        (0x03A0u, "Greek Capital Pi"),
+        (0x03A3u, "Greek Capital Sigma"),
+        (0x03A6u, "Greek Capital Phi"),
+        (0x03A8u, "Greek Capital Psi"),
+        (0x03A9u, "Greek Capital Omega"),
+        (0x03B1u, "Greek Small Alpha"),
+        (0x03B2u, "Greek Small Beta"),
+        (0x03B3u, "Greek Small Gamma"),
+        (0x03B4u, "Greek Small Delta"),
+        (0x03B5u, "Greek Small Epsilon"),
+        (0x03B6u, "Greek Small Zeta"),
+        (0x03B7u, "Greek Small Eta"),
+        (0x03B8u, "Greek Small Theta"),
+        (0x03B9u, "Greek Small Iota"),
+        (0x03BAu, "Greek Small Kappa"),
+        (0x03BBu, "Greek Small Lambda"),
+        (0x03BCu, "Greek Small Mu"),
+        (0x03BDu, "Greek Small Nu"),
+        (0x03BEu, "Greek Small Xi"),
+        (0x03BFu, "Greek Small Omicron"),
+        (0x03C0u, "Greek Small Pi"),
+        (0x03C1u, "Greek Small Rho"),
+        (0x03C3u, "Greek Small Sigma"),
+        (0x03C4u, "Greek Small Tau"),
+        (0x03C5u, "Greek Small Upsilon"),
+        (0x03C6u, "Greek Small Phi"),
+        (0x03C7u, "Greek Small Chi"),
+        (0x03C8u, "Greek Small Psi"),
+        (0x03C9u, "Greek Small Omega"),
+        (0x2013u, "En Dash"),
+        (0x2014u, "Em Dash"),
+        (0x2020u, "Dagger"),
+        (0x2021u, "Double Dagger"),
+        (0x2026u, "Horizontal Ellipsis"),
+        (0x203Bu, "Reference Mark"),
+        (0x20ACu, "Euro Sign"),
+        (0x2122u, "Trade Mark Sign"),
+        (0x2190u, "Leftwards Arrow"),
+        (0x2191u, "Upwards Arrow"),
+        (0x2192u, "Rightwards Arrow"),
+        (0x2193u, "Downwards Arrow"),
+        (0x21D2u, "Rightwards Double Arrow"),
+        (0x21D4u, "Left Right Double Arrow"),
+        (0x2202u, "Partial Differential"),
+        (0x2207u, "Nabla"),
+        (0x2211u, "Summation"),
+        (0x221Au, "Square Root"),
+        (0x221Eu, "Infinity"),
+        (0x222Bu, "Integral"),
+        (0x2260u, "Not Equal To"),
+        (0x25A0u, "Black Square"),
+        (0x25A1u, "White Square"),
+        (0x25B2u, "Black Up Triangle"),
+        (0x25B3u, "White Up Triangle"),
+        (0x25BCu, "Black Down Triangle"),
+        (0x25C6u, "Black Diamond"),
+        (0x25C7u, "White Diamond"),
+        (0x25CBu, "White Circle"),
+        (0x25CFu, "Black Circle"),
+        (0x2600u, "Black Sun With Rays"),
+        (0x2601u, "Cloud"),
+        (0x2602u, "Umbrella"),
+        (0x2603u, "Snowman"),
+        (0x2605u, "Black Star"),
+        (0x2606u, "White Star"),
+        (0x2640u, "Female Sign"),
+        (0x2642u, "Male Sign"),
+        (0x2660u, "Black Spade Suit"),
+        (0x2661u, "White Heart Suit"),
+        (0x2663u, "Black Club Suit"),
+        (0x2665u, "Black Heart Suit"),
+        (0x266Au, "Eighth Note"),
+        (0x2713u, "Check Mark"),
+    };
+
+    public void OpenPopup() => ImGui.OpenPopup(PopupId);
+
+    // Returns the inserted codepoint as a string fragment if the user clicked
+    // one this frame, or null otherwise. Caller splices the fragment into the
+    // chat-input buffer at the current cursor position.
+    public string? DrawAndConsume()
+    {
+        // ImRaii.Popup auto-disposes EndPopup, same idiom as other popups in
+        // ChatLogWindow.
+        using var popup = ImRaii.Popup(PopupId);
+        if (!popup)
+            return null;
+
+        string? inserted = null;
+
+        // Recent-Used-Row sits above the tabs so both PUA and BMP picks share
+        // one fast-access strip. Session-only by design (see TrackRecent).
+        if (_recentUsed.Count > 0)
+        {
+            ImGui.TextDisabled("Recent");
+            ImGui.SameLine();
+            foreach (var codepoint in _recentUsed)
+            {
+                var glyph = char.ConvertFromUtf32((int)codepoint);
+                if (
+                    ImGui.Selectable(
+                        glyph,
+                        false,
+                        ImGuiSelectableFlags.DontClosePopups,
+                        new Vector2(20, 20)
+                    )
+                )
+                {
+                    inserted = glyph;
+                }
+                ImGui.SameLine();
+            }
+            ImGui.NewLine();
+            ImGui.Separator();
+        }
+
+        using (var tabs = ImRaii.TabBar("##symbolpicker-tabs"))
+        {
+            if (tabs)
+            {
+                inserted = DrawPuaTab() ?? inserted;
+                inserted = DrawBmpTab() ?? inserted;
+            }
+        }
+
+        if (inserted is not null)
+            TrackRecent(inserted);
+
+        return inserted;
+    }
+
+    private string? DrawPuaTab()
+    {
+        using var tab = ImRaii.TabItem("FFXIV Icons");
+        if (!tab)
+            return null;
+
+        ImGui.InputTextWithHint(
+            "##pua-search",
+            "Search by name (e.g. HighQuality)",
+            ref _search,
+            64
+        );
+
+        string? inserted = null;
+
+        if (ImGui.BeginChild("##pua-grid", new Vector2(0, 280), false))
+        {
+            var query = _search;
+            foreach (var icon in Enum.GetValues<SeIconChar>())
+            {
+                var label = icon.ToString();
+                if (
+                    query.Length > 0
+                    && label.IndexOf(query, StringComparison.OrdinalIgnoreCase) < 0
+                )
+                {
+                    continue;
+                }
+
+                // ToIconString gives the single-codepoint glyph; tooltip
+                // carries the enum name for discoverability.
+                if (
+                    ImGui.Selectable(
+                        icon.ToIconString(),
+                        false,
+                        ImGuiSelectableFlags.DontClosePopups,
+                        new Vector2(24, 24)
+                    )
+                )
+                {
+                    inserted = icon.ToIconString();
+                }
+                if (ImGui.IsItemHovered())
+                    ImGui.SetTooltip(label);
+
+                // Manually-wrapping pattern from imgui_demo.cpp;
+                // GetWindowContentRegionMax obsolete since ImGui 1.92, use
+                // GetContentRegionAvail (see ChatLogWindow.cs:840).
+                var style = ImGui.GetStyle();
+                var lastItemX2 = ImGui.GetItemRectMax().X;
+                var availableRightX =
+                    ImGui.GetCursorScreenPos().X + ImGui.GetContentRegionAvail().X;
+                if (lastItemX2 + style.ItemSpacing.X + 24f < availableRightX)
+                    ImGui.SameLine();
+            }
+        }
+        ImGui.EndChild();
+
+        return inserted;
+    }
+
+    private string? DrawBmpTab()
+    {
+        using var tab = ImRaii.TabItem("Symbols");
+        if (!tab)
+            return null;
+
+        ImGui.InputTextWithHint("##bmp-search", "Search by name (e.g. Heart)", ref _search, 64);
+
+        string? inserted = null;
+
+        if (ImGui.BeginChild("##bmp-grid", new Vector2(0, 280), false))
+        {
+            var query = _search;
+            foreach (var (codepoint, name) in BmpWhitelist)
+            {
+                if (query.Length > 0 && name.IndexOf(query, StringComparison.OrdinalIgnoreCase) < 0)
+                {
+                    continue;
+                }
+
+                var glyph = char.ConvertFromUtf32((int)codepoint);
+                if (
+                    ImGui.Selectable(
+                        glyph,
+                        false,
+                        ImGuiSelectableFlags.DontClosePopups,
+                        new Vector2(24, 24)
+                    )
+                )
+                {
+                    inserted = glyph;
+                }
+                if (ImGui.IsItemHovered())
+                    ImGui.SetTooltip(name);
+
+                // Same manually-wrapping pattern as DrawPuaTab — modern API
+                // since GetWindowContentRegionMax was deprecated in ImGui 1.92.
+                var style = ImGui.GetStyle();
+                var lastItemX2 = ImGui.GetItemRectMax().X;
+                var availableRightX =
+                    ImGui.GetCursorScreenPos().X + ImGui.GetContentRegionAvail().X;
+                if (lastItemX2 + style.ItemSpacing.X + 24f < availableRightX)
+                    ImGui.SameLine();
+            }
+        }
+        ImGui.EndChild();
+
+        return inserted;
+    }
+
+    private void TrackRecent(string fragment)
+    {
+        if (string.IsNullOrEmpty(fragment) || fragment.Length > 4)
+            return;
+
+        var codepoint = (uint)char.ConvertToUtf32(fragment, 0);
+
+        // Move-to-front so the head stays the freshest pick.
+        _recentUsed.RemoveAll(c => c == codepoint);
+        _recentUsed.Insert(0, codepoint);
+
+        if (_recentUsed.Count > RecentCapacity)
+            _recentUsed.RemoveAt(_recentUsed.Count - 1);
+    }
+}
@@ -1,22 +1,11 @@
 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>
+// Pure string resolver logic with no Dalamud dependency, kept in its own
+// file so tests (HellionChat.Tests, no Dalamud reference) can call it directly.
+// Used in the settings UI glyph picker and indirectly via TabIconMapping.Resolve.
 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>
+    // Single source of truth for the glyph set; order matches the settings combobox.
    public static readonly IReadOnlyList<string> PickerOptions =
    [
        "comment",
@@ -36,20 +25,13 @@ internal static class TabIconGlyphResolver
        "fire",
    ];

-    /// <summary>
-    /// Glyph-Set, das überhaupt als Override akzeptiert wird. Aus
-    /// <see cref="PickerOptions"/> abgeleitet — KnownGlyphs nie
-    /// manuell pflegen.
-    /// </summary>
+    // Derived from PickerOptions -- never maintain this manually.
    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>
+    // Tab.Name is localised, so we match against a pool of DE/EN synonyms.
    private static readonly Dictionary<string, string> NameDefaults = new(
        StringComparer.OrdinalIgnoreCase
    )
@@ -69,18 +51,11 @@ internal static class TabIconGlyphResolver
        ["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>
+    // Resolves the glyph name for a tab. Priority order:
+    // 1. Tab.Icon override (if set): known glyph -> use it, unknown -> "hashtag"
+    // 2. Auto-tell tab -> autoTellGlyph if provided, else "clock"
+    // 3. Name default lookup
+    // 4. Fallback "hashtag"
    public static string ResolveGlyphName(Tab tab, string? autoTellGlyph = null)
    {
        if (!string.IsNullOrWhiteSpace(tab.Icon))
@@ -2,31 +2,14 @@ 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>
+// Default icon mapping for tabs, used in top-tabs (icon prefix) and sidebar (icon-only with tooltip).
+// Users can override per tab via Settings -> Tabs -> Tab.Icon.
+// Pure string resolver logic lives in TabIconGlyphResolver (no Dalamud dependency) for testability.
 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>
+    // Glyph name -> FontAwesomeIcon lookup for production resolve.
+    // Every key must also exist in TabIconGlyphResolver.PickerOptions.
+    // A missing key silently falls back to FontAwesomeIcon.Hashtag (degraded, no crash).
    private static readonly Dictionary<string, FontAwesomeIcon> GlyphLookup = new(
        StringComparer.OrdinalIgnoreCase
    )
@@ -48,23 +31,13 @@ internal static class TabIconMapping
        ["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>
+    // Resolves the icon for a tab. Auto-tell tabs get a per-partner hashed icon
+    // from the tell pool so parallel tells differ by glyph shape, not just colour.
    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;
@@ -17,10 +17,9 @@ internal static class AutoTranslate
    private static readonly Dictionary<ClientLanguage, List<AutoTranslateEntry>> Entries = new();
    private static readonly HashSet<(uint, uint)> ValidEntries = [];

-    // Serializes all reads and writes against Entries / ValidEntries.
-    // PreloadCache spawns a worker thread that fills both, while the main
-    // thread reads them via Matching / ReplaceWithPayload / StartsWithCommand
-    // — without this lock the HashSet/Dictionary access is undefined.
+    // Serialises all reads/writes against Entries and ValidEntries.
+    // PreloadCache fills both from a worker thread while the main thread
+    // reads via Matching/ReplaceWithPayload/StartsWithCommand.
    private static readonly object EntriesLock = new();

    private static Parser<char, (string name, Maybe<IEnumerable<ISelectorPart>> selector)> Parser()
@@ -54,21 +53,27 @@ internal static class AutoTranslate
        return Map((name, sel) => (name, sel), sheetName, selector.Optional());
    }

-    /// <summary>
-    /// Preloads auto-translate entries into the cache for the current game
-    /// language. Without this, the first message will take a long time to send
-    /// (which causes a hitch in the main thread).
-    ///
-    /// This spawns a new thread.
-    /// </summary>
+    // Warms the auto-translate cache on a background thread so the first
+    // message send doesn't hitch the main thread. IsBackground keeps plugin
+    // unload non-blocking even if the warmup is still in flight.
    internal static void PreloadCache()
    {
-        new Thread(() =>
+        var thread = new Thread(() =>
        {
            var sw = Stopwatch.StartNew();
            AllEntries();
-            Plugin.Log.Debug($"Warming up auto-translate took {sw.ElapsedMilliseconds}ms");
-        }).Start();
+            // v1.4.9 R3 profiling: Information so the xllog tail surfaces this
+            // without a Debug filter. Belt-and-suspenders for future plugin-load
+            // regressions; remains in place after Sub-Task 3.4 Befund.
+            Plugin.LogProxy.Information(
+                $"Warming up auto-translate took {sw.ElapsedMilliseconds}ms"
+            );
+        })
+        {
+            IsBackground = true,
+            Name = "HellionChat-AutoTranslate-Warmup",
+        };
+        thread.Start();
    }

    private static List<AutoTranslateEntry> AllEntries()
@@ -104,7 +109,7 @@ internal static class AutoTranslate
            {
                if (lookup is not ("" or "@"))
                {
-                    // SE added whitespace to the newest additions, but ParseOrThrow doesn't see them as valid
+                    // SE added whitespace to newer entries; strip it before parsing.
                    lookup = lookup.Replace(" ", "");

                    var (sheetName, selector) = parser.ParseOrThrow(lookup);
@@ -144,19 +149,13 @@ internal static class AutoTranslate
                        columns.Add(0);

                    if (rows.Count == 0)
-                        // We can't use an "index from end" (like `^0`) here because
-                        // we're iterating over integers, not an array directly.
-                        // Previously, we were setting `0..^0` which caused these
-                        // sheets to be completely skipped due to this bug.
-                        // See below.
+                        // Can't use index-from-end here because we iterate over integers,
+                        // not an array directly. `0..^0` would silently skip the sheet.
                        rows.Add(..Index.FromStart((int)sheet.GetRowAt(sheet.Count - 1).RowId + 1));

                    foreach (var range in rows)
                    {
-                        // We iterate over the range by numerical values here, so
-                        // we can't use an "index from end" otherwise nothing will
-                        // happen.
-                        // See above.
+                        // Integer iteration -- can't use index-from-end (see above).
                        for (var i = range.Start.Value; i < range.End.Value; i++)
                        {
                            if (!sheet.TryGetRow((uint)i, out var rowParser))
@@ -203,7 +202,7 @@ internal static class AutoTranslate
            }
            catch (Exception ex)
            {
-                Plugin.Log.Error(ex, $"failed to translate: {lookup}");
+                Plugin.LogProxy.Error(ex, $"failed to translate: {lookup}");
            }
        }

@@ -261,7 +260,6 @@ internal static class AutoTranslate
        if (bytes.Length <= search.Length)
            return;

-        // populate the list of valid entries
        bool needBuild;
        lock (EntriesLock)
            needBuild = ValidEntries.Count == 0;
@@ -308,9 +306,8 @@ internal static class AutoTranslate
                start = -1;
            }

-            // 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.
+            // Span comparison avoids the msvcrt.dll P/Invoke which is fragile
+            // under Wine and caused an extra managed-to-unmanaged copy per check.
            if (
                i + search.Length < bytes.Length
                && bytes.AsSpan(i, search.Length).SequenceEqual(search)
@@ -325,7 +322,6 @@ internal static class AutoTranslate
        if (bytes.Length <= search.Length)
            return false;

-        // populate the list of valid entries
        bool needBuild;
        lock (EntriesLock)
            needBuild = ValidEntries.Count == 0;
@@ -0,0 +1,16 @@
+namespace HellionChat.Util;
+
+internal sealed class DalamudPlatformUtil : IPlatformUtil
+{
+    public DalamudPlatformUtil()
+    {
+        // Util.IsWine probes the host process and never changes for the
+        // lifetime of a plugin instance, so we cache it once at ctor.
+        // Mirrors LightlessSync/Services/DalamudUtilService:154.
+        IsWine = Dalamud.Utility.Util.IsWine();
+    }
+
+    public bool IsWine { get; }
+
+    public void OpenLink(string url) => Dalamud.Utility.Util.OpenLink(url);
+}
@@ -0,0 +1,61 @@
+using System;
+using Dalamud.Plugin.Services;
+
+namespace HellionChat.Util;
+
+internal sealed class DalamudPluginLogProxy : IPluginLogProxy
+{
+    private readonly IPluginLog _log;
+
+    public DalamudPluginLogProxy(IPluginLog log) => _log = log;
+
+    public void Verbose(string message) => _log.Verbose(message);
+
+    public void Verbose(Exception exception, string message) => _log.Verbose(exception, message);
+
+    public void Verbose(string messageTemplate, params object[] values) =>
+        _log.Verbose(messageTemplate, values);
+
+    public void Debug(string message) => _log.Debug(message);
+
+    public void Debug(Exception exception, string message) => _log.Debug(exception, message);
+
+    public void Debug(string messageTemplate, params object[] values) =>
+        _log.Debug(messageTemplate, values);
+
+    public void Information(string message) => _log.Information(message);
+
+    public void Information(Exception exception, string message) =>
+        _log.Information(exception, message);
+
+    public void Information(string messageTemplate, params object[] values) =>
+        _log.Information(messageTemplate, values);
+
+    public void Info(string message) => _log.Info(message);
+
+    public void Info(Exception exception, string message) => _log.Info(exception, message);
+
+    public void Info(string messageTemplate, params object[] values) =>
+        _log.Info(messageTemplate, values);
+
+    public void Warning(string message) => _log.Warning(message);
+
+    public void Warning(Exception exception, string message) => _log.Warning(exception, message);
+
+    public void Warning(string messageTemplate, params object[] values) =>
+        _log.Warning(messageTemplate, values);
+
+    public void Error(string message) => _log.Error(message);
+
+    public void Error(Exception exception, string message) => _log.Error(exception, message);
+
+    public void Error(string messageTemplate, params object[] values) =>
+        _log.Error(messageTemplate, values);
+
+    public void Fatal(string message) => _log.Fatal(message);
+
+    public void Fatal(Exception exception, string message) => _log.Fatal(exception, message);
+
+    public void Fatal(string messageTemplate, params object[] values) =>
+        _log.Fatal(messageTemplate, values);
+}
@@ -10,9 +10,8 @@ public static class GlobalParametersCache

    public static int GetValue(int index)
    {
-        // Capture the array reference once so the bounds check and the
-        // indexed read operate on the same instance, even if Refresh
-        // reassigns Cache between the two operations.
+        // Capture the array reference once so bounds check and read operate
+        // on the same instance if Refresh reassigns Cache between the two.
        var cache = Cache;
        if (index < 0 || index >= cache.Length)
            return 0;
@@ -20,12 +19,7 @@ public static class GlobalParametersCache
        return cache[index];
    }

-    /// <summary>
-    /// Refresh the cache of global parameters from RaptureTextModule.
-    /// </summary>
-    /// <remarks>
-    /// This should be called in the main thread when updates are necessary.
-    /// </remarks>
+    // Refreshes the cache from RaptureTextModule. Must be called on the main thread.
    public static unsafe void Refresh()
    {
        if (!ThreadSafety.IsMainThread)
@@ -0,0 +1,11 @@
+namespace HellionChat.Util;
+
+// Indirection over Dalamud.Utility.Util's static surface so services can be
+// constructed in an isolated xUnit AppDomain without loading Dalamud.dll.
+// Production wiring lives in DalamudPlatformUtil; tests substitute a fake.
+internal interface IPlatformUtil
+{
+    bool IsWine { get; }
+
+    void OpenLink(string url);
+}
@@ -0,0 +1,40 @@
+using System;
+
+namespace HellionChat.Util;
+
+// Plugin.LogProxy bridge for consumers that cannot take a logger via the
+// constructor: static helpers (EmoteCache et al.), Dalamud-reflected types
+// (Configuration), data classes with mass instantiation (Message) and
+// instance classes that only log from static methods (FontManager).
+internal interface IPluginLogProxy
+{
+    void Verbose(string message);
+    void Verbose(Exception exception, string message);
+    void Verbose(string messageTemplate, params object[] values);
+
+    void Debug(string message);
+    void Debug(Exception exception, string message);
+    void Debug(string messageTemplate, params object[] values);
+
+    void Information(string message);
+    void Information(Exception exception, string message);
+    void Information(string messageTemplate, params object[] values);
+
+    // IPluginLog exposes Info as a distinct method (short alias of
+    // Information) — both are present so call-sites stay drop-in.
+    void Info(string message);
+    void Info(Exception exception, string message);
+    void Info(string messageTemplate, params object[] values);
+
+    void Warning(string message);
+    void Warning(Exception exception, string message);
+    void Warning(string messageTemplate, params object[] values);
+
+    void Error(string message);
+    void Error(Exception exception, string message);
+    void Error(string messageTemplate, params object[] values);
+
+    void Fatal(string message);
+    void Fatal(Exception exception, string message);
+    void Fatal(string messageTemplate, params object[] values);
+}
@@ -11,8 +11,7 @@ public readonly unsafe ref struct GfdFileView
    private readonly ReadOnlySpan<byte> Span;
    private readonly bool DirectLookup;

-    /// <summary>Initializes a new instance of the <see cref="GfdFileView"/> struct.</summary>
-    /// <param name="span">The data.</param>
+    // span: raw .gfd file bytes
    public GfdFileView(ReadOnlySpan<byte> span)
    {
        Span = span;
@@ -27,18 +26,13 @@ public readonly unsafe ref struct GfdFileView
            DirectLookup &= i + 1 == entries[i].Id;
    }

-    /// <summary>Gets the header.</summary>
    private ref readonly GfdHeader Header => ref MemoryMarshal.AsRef<GfdHeader>(Span);

-    /// <summary>Gets the entries.</summary>
    private ReadOnlySpan<GfdEntry> Entries =>
        MemoryMarshal.Cast<byte, GfdEntry>(Span[sizeof(GfdHeader)..]);

-    /// <summary>Attempts to get an entry.</summary>
-    /// <param name="iconId">The icon ID.</param>
-    /// <param name="entry">The entry.</param>
-    /// <param name="followRedirect">Whether to follow redirects.</param>
-    /// <returns><c>true</c> if found.</returns>
+    // Returns true if the entry was found.
+    // followRedirect: whether to chase redirect chains.
    public bool TryGetEntry(uint iconId, out GfdEntry entry, bool followRedirect = true)
    {
        if (iconId == 0)
@@ -50,9 +44,8 @@ public readonly unsafe ref struct GfdFileView
        var entries = Entries;
        if (DirectLookup)
        {
-            // Resolve redirects on the direct-lookup path too — the binary-search
-            // path follows them, and skipping them here was inconsistent for
-            // contiguous ID sets.
+            // Follow redirects on the direct-lookup path for consistency with
+            // the binary-search path.
            var visited = 0;
            while (iconId <= entries.Length)
            {
@@ -107,49 +100,28 @@ public readonly unsafe ref struct GfdFileView
        return false;
    }

-    /// <summary>Header of a .gfd file.</summary>
+    // .gfd file header
    [StructLayout(LayoutKind.Sequential)]
    public struct GfdHeader
    {
-        /// <summary>Signature: "gftd0100".</summary>
-        public fixed byte Signature[8];
-
-        /// <summary>Number of entries.</summary>
+        public fixed byte Signature[8]; // "gftd0100"
        public int Count;
-
-        /// <summary>Unused/unknown.</summary>
        public fixed byte Padding[4];
    }

-    /// <summary>An entry of a .gfd file.</summary>
+    // .gfd file entry -- one icon slot
    [StructLayout(LayoutKind.Sequential, Size = 0x10)]
    public struct GfdEntry
    {
-        /// <summary>ID of the entry.</summary>
        public ushort Id;
-
-        /// <summary>The left offset of the entry.</summary>
        public ushort Left;
-
-        /// <summary>The top offset of the entry.</summary>
        public ushort Top;
-
-        /// <summary>The width of the entry.</summary>
        public ushort Width;
-
-        /// <summary>The height of the entry.</summary>
        public ushort Height;
-
-        /// <summary>Unknown/unused.</summary>
        public ushort Unk0A;
-
-        /// <summary>The redirected entry, maybe.</summary>
-        public ushort Redirect;
-
-        /// <summary>Unknown/unused.</summary>
+        public ushort Redirect; // non-zero = redirects to another entry
        public ushort Unk0E;

-        /// <summary>Gets a value indicating whether this entry is effectively empty.</summary>
        public bool IsEmpty => Width == 0 || Height == 0;
    }
 }
@@ -254,6 +254,17 @@ internal static class ImGuiUtil
        return end;
    }

+    // ---------------------------------------------------------------
+    // Inspired by ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12).
+    // Upstream dropped the width parameter (no callers there); we keep
+    // it because two ChatLogWindow header buttons size themselves to
+    // match the ChannelIcon button's frame. The actual bug is the
+    // manual size = width - 2 * CellPadding.X subtraction: CellPadding
+    // scales with HUD scale, the raw int does not, so the button
+    // shrank under high HUD scales. ImGui.Button already handles its
+    // own frame padding internally — pass the measured width straight
+    // through.
+    // ---------------------------------------------------------------
    internal static bool IconButton(
        FontAwesomeIcon icon,
        string? id = null,
@@ -268,10 +279,7 @@ internal static class ImGuiUtil
        bool ret;
        using (Plugin.FontManager.FontAwesome.Push())
        {
-            var size = Vector2.Zero;
-            if (width > 0)
-                size.X = width - 2 * ImGui.GetStyle().CellPadding.X;
-
+            var size = width > 0 ? new Vector2(width, 0f) : Vector2.Zero;
            ret = ImGui.Button(label, size);
        }

@@ -575,7 +583,9 @@ internal static class ImGuiUtil

        using (ImRaii.Disabled(isMax))
        {
-            if (IconButton(FontAwesomeIcon.ArrowRight, id + 1.ToString()))
+            // Parentheses pin the operator precedence: without them this resolves as
+            // id.ToString() + "1" (e.g. "01" instead of "1").
+            if (IconButton(FontAwesomeIcon.ArrowRight, (id + 1).ToString()))
                selected++;
        }

@@ -31,18 +31,10 @@ public static class MathUtil
        public override string ToString() => $"X: {X} Y: {Y} Width: {Width} Height: {Height}";
    }

-    /// <summary>
-    /// Checks if two rectangles overlap at any point.
-    /// </summary>
-    /// <param name="a"></param>
-    /// <param name="b"></param>
-    /// <returns>True if overlapping</returns>
+    // Standard AABB overlap test. Inclusive on both axes to catch shared
+    // edges and identical rectangles (previous ValueInRange approach missed these).
    public static bool HasOverlap(this Rectangle a, Rectangle b)
    {
-        // Standard AABB overlap test: two rectangles overlap iff they
-        // overlap on both axes. The previous nested ValueInRange approach
-        // used strict inequalities at both ends, which dropped identical
-        // rectangles and shared-edge cases as false negatives.
        return a.X < b.X + b.Width
            && a.X + a.Width > b.X
            && a.Y < b.Y + b.Height
@@ -42,6 +42,6 @@ public static class MemoryUtil
                str.Append(' ');
        }

-        Plugin.Log.Information(str.ToString());
+        Plugin.LogProxy.Information(str.ToString());
    }
 }
@@ -13,15 +13,10 @@ internal class PartyFinderPayload : Payload
        Id = id;
    }

-    protected override byte[] EncodeImpl()
-    {
-        throw new NotImplementedException();
-    }
+    protected override byte[] EncodeImpl() => throw new NotImplementedException();

-    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-    {
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream) =>
        throw new NotImplementedException();
-    }
 }

 internal class AchievementPayload : Payload
@@ -35,15 +30,10 @@ internal class AchievementPayload : Payload
        Id = id;
    }

-    protected override byte[] EncodeImpl()
-    {
-        throw new NotImplementedException();
-    }
+    protected override byte[] EncodeImpl() => throw new NotImplementedException();

-    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-    {
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream) =>
        throw new NotImplementedException();
-    }
 }

 internal class UriPayload(Uri uri) : Payload
@@ -55,20 +45,14 @@ internal class UriPayload(Uri uri) : Payload
    private const string DefaultScheme = "https";
    private static readonly string[] ExpectedSchemes = ["http", "https"];

-    /// <summary>
-    /// Create a URIPayload from a raw URI string. If the URI does not have a
-    /// scheme, it will default to https://.
-    /// </summary>
-    /// <exception cref="UriFormatException">
-    /// If the URI is invalid, or if the scheme is not supported.
-    /// </exception>
+    // Parses a raw URI string. Defaults to https:// if no scheme is present.
+    // Throws UriFormatException for empty input or unsupported schemes.
    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}://")))
            return new UriPayload(new Uri(rawUri));

@@ -78,15 +62,10 @@ internal class UriPayload(Uri uri) : Payload
        return new UriPayload(new Uri($"{DefaultScheme}://{rawUri}"));
    }

-    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-    {
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream) =>
        throw new NotImplementedException();
-    }

-    protected override byte[] EncodeImpl()
-    {
-        throw new NotImplementedException();
-    }
+    protected override byte[] EncodeImpl() => throw new NotImplementedException();
 }

 internal class EmotePayload : Payload
@@ -95,18 +74,10 @@ internal class EmotePayload : Payload

    public string Code = string.Empty;

-    public static EmotePayload ResolveEmote(string code)
-    {
-        return new EmotePayload { Code = code };
-    }
+    public static EmotePayload ResolveEmote(string code) => new EmotePayload { Code = code };

-    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-    {
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream) =>
        throw new NotImplementedException();
-    }

-    protected override byte[] EncodeImpl()
-    {
-        throw new NotImplementedException();
-    }
+    protected override byte[] EncodeImpl() => throw new NotImplementedException();
 }
@@ -0,0 +1,16 @@
+namespace HellionChat.Util;
+
+// Pure predicates for the TempTab pin lifecycle. Extracted from the strip
+// sites in Plugin.cs and Configuration.cs so they stay in lockstep — a
+// load-time strip that disagrees with the save-time strip is exactly how
+// pinned tabs would silently fall out of the JSON.
+internal static class TabLifecycleHelpers
+{
+    public static bool IsInUnpinnedPool(Tab t) => t.IsTempTab && !t.IsPinned;
+
+    public static bool IsInPinnedPool(Tab t) => t.IsTempTab && t.IsPinned;
+
+    public static bool ShouldStripOnLoad(Tab t) => IsInUnpinnedPool(t);
+
+    public static bool ShouldStripOnSave(Tab t) => IsInUnpinnedPool(t);
+}
@@ -14,12 +14,8 @@ public static class TabsUtil
        return channels;
    }

-    // Hellion-tuned General preset (v1.0.0 — sharpened defaults).
-    // Public-chat-only, the bare three channels you encounter in open
-    // world. Group/FC/Linkshell traffic moves to dedicated tabs, gameplay
-    // events (loot, crafting, gathering, NPC dialogue, PF pings) move to
-    // the System tab where they belong — keeps the General view focused
-    // on actual conversation in the immediate surroundings.
+    // Public-chat-only: Say, Yell, Shout. Group/FC/Linkshell and gameplay
+    // events live in their own tabs to keep General focused on open-world chat.
    public static Tab VanillaGeneral =>
        new()
        {
@@ -55,11 +51,8 @@ public static class TabsUtil
            AllSenderMessages = true,
        };

-    // Hellion default-tab presets used by the v10 wipe migration. Names are
-    // kept in HellionStrings (EN+DE) instead of Language.* so the upstream
-    // resource files stay untouched. Channel selections cover the channels
-    // a typical Eorzea raider uses without forcing the user to hand-tick
-    // each box on first start.
+    // Hellion tab presets. Names live in HellionStrings (EN+DE) so upstream
+    // resource files stay untouched.
    public static Tab HellionFreeCompany =>
        new()
        {
@@ -88,10 +81,8 @@ public static class TabsUtil
                [ChatType.LootNotice] = (ChatSourceExt.All, ChatSourceExt.All),
                [ChatType.LootRoll] = (ChatSourceExt.All, ChatSourceExt.All),
            },
-            // No automatic input-channel switch; the Gruppe tab is a read
-            // surface that pulls in Party, CrossParty, Alliance and PvpTeam
-            // together. Auto-routing /party into this tab would surprise the
-            // user when they actually wanted /alliance or /pvpteam.
+            // No input-channel switch: Party pulls in multiple channel types
+            // and auto-routing /party would surprise users wanting /alliance or /pvpteam.
        };

    public static Tab HellionBeginner =>
@@ -112,7 +103,7 @@ public static class TabsUtil
            Name = HellionStrings.Tabs_Presets_System,
            SelectedChannels = new Dictionary<ChatType, (ChatSource, ChatSource)>
            {
-                // Plain system noise
+                // System noise
                [ChatType.Debug] = (ChatSourceExt.All, ChatSourceExt.All),
                [ChatType.Urgent] = (ChatSourceExt.All, ChatSourceExt.All),
                [ChatType.Notice] = (ChatSourceExt.All, ChatSourceExt.All),
@@ -122,7 +113,7 @@ public static class TabsUtil
                [ChatType.GatheringSystem] = (ChatSourceExt.All, ChatSourceExt.All),
                [ChatType.NoviceNetworkSystem] = (ChatSourceExt.All, ChatSourceExt.All),
                [ChatType.BattleSystem] = (ChatSourceExt.All, ChatSourceExt.All),
-                // Login / logout / announcement noise
+                // Login/logout/announcement noise
                [ChatType.NpcAnnouncement] = (ChatSourceExt.All, ChatSourceExt.All),
                [ChatType.FreeCompanyAnnouncement] = (ChatSourceExt.All, ChatSourceExt.All),
                [ChatType.FreeCompanyLoginLogout] = (ChatSourceExt.All, ChatSourceExt.All),
@@ -130,7 +121,7 @@ public static class TabsUtil
                [ChatType.PvpTeamLoginLogout] = (ChatSourceExt.All, ChatSourceExt.All),
                [ChatType.RetainerSale] = (ChatSourceExt.All, ChatSourceExt.All),
                [ChatType.PeriodicRecruitmentNotification] = (ChatSourceExt.All, ChatSourceExt.All),
-                // Gameplay-event streams (moved out of General in v1.0.0)
+                // Gameplay event streams
                [ChatType.NpcDialogue] = (ChatSourceExt.All, ChatSourceExt.All),
                [ChatType.LootNotice] = (ChatSourceExt.All, ChatSourceExt.All),
                [ChatType.LootRoll] = (ChatSourceExt.All, ChatSourceExt.All),
@@ -135,18 +135,8 @@ public static class Tokenizer
        public int Precedence { get; set; }
    }

-    /// <summary>
-    /// URLRegex returns a regex object that matches URLs like:
-    /// - https://example.com
-    /// - http://example.com
-    /// - www.example.com
-    /// - https://sub.example.com
-    /// - example.com
-    /// - sub.example.com
-    ///
-    /// It matches URLs with www. or https:// prefix, and also matches URLs
-    /// without a prefix on specific TLDs.
-    /// </summary>
+    // Matches URLs with http(s):// or www. prefix, and bare domains on known TLDs.
+    // Examples: https://example.com, www.sub.example.com, example.com
    private static readonly Regex UrlRegex = new(
        @"(?<URL>((https?:\/\/|www\.)[a-z0-9-]+(\.[a-z0-9-]+)*|([a-z0-9-]+(\.[a-z0-9-]+)*\.(com|net|org|co|io|app)))(:[\d]{1,5})?(\/[^\s]*)?)",
        RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture
@@ -0,0 +1,21 @@
+namespace HellionChat.Util;
+
+internal static class UrlValidation
+{
+    // Used by BrandingLinks/IntegrationLinks at module init. A typo in a URL
+    // rotation throws loudly at plugin load instead of silently failing when
+    // a user clicks the broken button.
+    public static void ValidateAll(string source, params string[] urls)
+    {
+        foreach (var url in urls)
+        {
+            if (
+                !Uri.TryCreate(url, UriKind.Absolute, out var uri)
+                || (uri.Scheme is not "https" and not "http")
+            )
+            {
+                throw new InvalidOperationException($"{source} contains malformed URL: {url}");
+            }
+        }
+    }
+}
@@ -21,12 +21,12 @@ public static class WrapperUtil
    {
        try
        {
-            Plugin.Log.Debug($"Opening URI {uri} in default browser");
-            Dalamud.Utility.Util.OpenLink(uri.ToString());
+            Plugin.LogProxy.Debug($"Opening URI {uri} in default browser");
+            Plugin.PlatformUtil.OpenLink(uri.ToString());
        }
        catch (Exception ex)
        {
-            Plugin.Log.Error($"Error opening URI: {ex}");
+            Plugin.LogProxy.Error($"Error opening URI: {ex}");
            AddNotification(Language.Context_OpenInBrowserError, NotificationType.Error);
        }
    }
@@ -2,16 +2,17 @@ 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.
+// Extracted history-navigation cursor math from CompactCallback to allow unit
+// testing without ImGuiInputTextCallbackData (DeleteChars/InsertChars).
+// Buffer mutation stays at the call site; only the cursor/replacement decision lives here.
 //
 // Index semantics match InputHistoryService:
-//   index 0          = oldest entry
-//   index Count - 1  = newest entry
-//   cursor == -1     = "not browsing history"
+//   index 0        = oldest entry
+//   index Count-1  = newest entry
+//   cursor == -1   = not browsing history
+//
+// replacement == null: caller must NOT touch the buffer (cursor unchanged).
+// replacement != null: write it to the buffer (including "" to clear it).
 //
 // TEST-MIRROR: ../../../Hellion Build test/Ui/CompactInputHistoryNavigatorTests.cs
 public static class CompactInputHistoryNavigator
@@ -22,9 +23,6 @@ public static class CompactInputHistoryNavigator
        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,
@@ -38,7 +36,6 @@ public static class CompactInputHistoryNavigator
        ArgumentNullException.ThrowIfNull(push);
        ArgumentNullException.ThrowIfNull(getByCursor);

-        var prev = currentCursor;
        var next = currentCursor;

        switch (direction)
@@ -46,8 +43,7 @@ public static class CompactInputHistoryNavigator
            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.
+                    // Stash current input so the user can recover it after browsing.
                    var offset = 0;
                    if (!string.IsNullOrWhiteSpace(currentBuffer))
                    {
@@ -57,10 +53,9 @@ public static class CompactInputHistoryNavigator
                    next = getCount() - 1 - offset;
                }
                else if (currentCursor > 0)
-                {
                    next--;
-                }
                break;
+
            case Direction.Down:
                if (currentCursor != -1)
                {
@@ -71,10 +66,9 @@ public static class CompactInputHistoryNavigator
                break;
        }

-        if (prev == next)
+        if (next == currentCursor)
            return (next, null);

-        var replacement = getByCursor(next) ?? string.Empty;
-        return (next, replacement);
+        return (next, getByCursor(next) ?? string.Empty);
    }
 }
@@ -3,11 +3,8 @@ 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.
+// Extracted submit logic from ChatInputBar.SubmitCompact to allow unit testing
+// without a sealed ChatLogWindow dependency.
 // TEST-MIRROR: ../../../Hellion Build test/Ui/CompactInputSubmitterTests.cs
 public static class CompactInputSubmitter
 {
@@ -1,110 +1,398 @@
 {
-    "version": 1,
-    "dependencies": {
-        "net10.0-windows7.0": {
-            "DalamudPackager": {
-                "type": "Direct",
-                "requested": "[15.0.0, )",
-                "resolved": "15.0.0",
-                "contentHash": "411vwC8/X8Z/sQ2TI6v3SvOn66xFPeOjFn3Zn+h0d3Ox2t1kFm66AhDvmx/qcMwVrR+Hidxj0dadpQ2dgyXMBQ=="
-            },
-            "DotNet.ReproducibleBuilds": {
-                "type": "Direct",
-                "requested": "[1.2.39, )",
-                "resolved": "1.2.39",
-                "contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg=="
-            },
-            "MessagePack": {
-                "type": "Direct",
-                "requested": "[3.1.4, 4.0.0)",
-                "resolved": "3.1.4",
-                "contentHash": "BH0wlHWmVoZpbAPyyt2Awbq30C+ZsS3eHSkYdnyUAbqVJ22fAJDzn2xTieBeoT5QlcBzp61vHcv878YJGfi3mg==",
-                "dependencies": {
-                    "MessagePack.Annotations": "3.1.4",
-                    "MessagePackAnalyzer": "3.1.4",
-                    "Microsoft.NET.StringTools": "17.11.4"
-                }
-            },
-            "Microsoft.Data.Sqlite": {
-                "type": "Direct",
-                "requested": "[10.0.7, )",
-                "resolved": "10.0.7",
-                "contentHash": "DZ6G2QuyPrsh5VS+wfiZbNBtYT6p+CkxXjD0aZHF04xso7QsG/uk0JpG30hzYlK6u/wtTzta1Dqfgbc/Sl2sDA==",
-                "dependencies": {
-                    "Microsoft.Data.Sqlite.Core": "10.0.7",
-                    "SQLitePCLRaw.bundle_e_sqlite3": "2.1.11",
-                    "SQLitePCLRaw.core": "2.1.11"
-                }
-            },
-            "morelinq": {
-                "type": "Direct",
-                "requested": "[4.4.0, )",
-                "resolved": "4.4.0",
-                "contentHash": "QX3bsK9oFeUXk8tFsc9NkI6NnCr8Ar/ex027p+ZZ/jdLCdX2RlryDtxUqZW5j45NVwn4E4Z4hzupsoMQd6Yxtg=="
-            },
-            "Pidgin": {
-                "type": "Direct",
-                "requested": "[3.5.1, 4.0.0)",
-                "resolved": "3.5.1",
-                "contentHash": "zU7tkXlF3D6d2GLTjJDomAL3nnl4AwfZvSgSz8D4b+Ry21/clqedYlxBnEAkAU/bkGfEv6uRR7QCdWZUpKrB/g=="
-            },
-            "SixLabors.ImageSharp": {
-                "type": "Direct",
-                "requested": "[3.1.12, 4.0.0)",
-                "resolved": "3.1.12",
-                "contentHash": "iAg6zifihXEFS/t7fiHhZBGAdCp3FavsF4i2ZIDp0JfeYeDVzvmlbY1CNhhIKimaIzrzSi5M/NBFcWvZT2rB/A=="
-            },
-            "SQLitePCLRaw.lib.e_sqlite3": {
-                "type": "Direct",
-                "requested": "[3.50.3, )",
-                "resolved": "3.50.3",
-                "contentHash": "tVyhqQ8wxgedWiiPFChyZhE8I3PkOM/AE1azsj1qsdYUws13ONBFyi3aDxju4tD2kzedB2q5+50WrTyY0h2gMQ=="
-            },
-            "MessagePack.Annotations": {
-                "type": "Transitive",
-                "resolved": "3.1.4",
-                "contentHash": "aVWrDAkCdqxwQsz/q0ldPh2EFn48M99YUzE9OvZjMq2RNLKz4o2z88iGFvSvbMqOWRweRvKPHBJZe22PRqzslQ=="
-            },
-            "MessagePackAnalyzer": {
-                "type": "Transitive",
-                "resolved": "3.1.4",
-                "contentHash": "CTaSsN/liJ7MhLCAB7Z4ZLBNuVGCq9lt2BT/cbrc9vzGv89yK3CqIA+z9T19a11eQYl9etZHL6MQJgCqECRVpg=="
-            },
-            "Microsoft.Data.Sqlite.Core": {
-                "type": "Transitive",
-                "resolved": "10.0.7",
-                "contentHash": "xVrtBg3M1wJlBDkoT0dXEYB/wSc8bIHJPYtw/bu1AqpWgF79uPSs87DAhERR/Ilumre6TKZa1cjMg3VUUObVLA==",
-                "dependencies": {
-                    "SQLitePCLRaw.core": "2.1.11"
-                }
-            },
-            "Microsoft.NET.StringTools": {
-                "type": "Transitive",
-                "resolved": "17.11.4",
-                "contentHash": "mudqUHhNpeqIdJoUx2YDWZO/I9uEDYVowan89R6wsomfnUJQk6HteoQTlNjZDixhT2B4IXMkMtgZtoceIjLRmA=="
-            },
-            "SQLitePCLRaw.bundle_e_sqlite3": {
-                "type": "Transitive",
-                "resolved": "2.1.11",
-                "contentHash": "DC4nA7yWnf4UZdgJDF+9Mus4/cb0Y3Sfgi3gDnAoKNAIBwzkskNAbNbyu+u4atT0ruVlZNJfwZmwiEwE5oz9LQ==",
-                "dependencies": {
-                    "SQLitePCLRaw.lib.e_sqlite3": "2.1.11",
-                    "SQLitePCLRaw.provider.e_sqlite3": "2.1.11"
-                }
-            },
-            "SQLitePCLRaw.core": {
-                "type": "Transitive",
-                "resolved": "2.1.11",
-                "contentHash": "PK0GLFkfhZzLQeR3PJf71FmhtHox+U3vcY6ZtswoMjrefkB9k6ErNJEnwXqc5KgXDSjige2XXrezqS39gkpQKA=="
-            },
-            "SQLitePCLRaw.provider.e_sqlite3": {
-                "type": "Transitive",
-                "resolved": "2.1.11",
-                "contentHash": "Y/0ZkR+r0Cg3DQFuCl1RBnv/tmxpIZRU3HUvelPw6MVaKHwYYR8YNvgs0vuNuXCMvlyJ+Fh88U1D4tah1tt6qw==",
-                "dependencies": {
-                    "SQLitePCLRaw.core": "2.1.11"
-                }
-            }
+  "version": 1,
+  "dependencies": {
+    "net10.0-windows7.0": {
+      "DalamudPackager": {
+        "type": "Direct",
+        "requested": "[15.0.0, )",
+        "resolved": "15.0.0",
+        "contentHash": "411vwC8/X8Z/sQ2TI6v3SvOn66xFPeOjFn3Zn+h0d3Ox2t1kFm66AhDvmx/qcMwVrR+Hidxj0dadpQ2dgyXMBQ=="
+      },
+      "DotNet.ReproducibleBuilds": {
+        "type": "Direct",
+        "requested": "[1.2.39, )",
+        "resolved": "1.2.39",
+        "contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg=="
+      },
+      "MessagePack": {
+        "type": "Direct",
+        "requested": "[3.1.4, 4.0.0)",
+        "resolved": "3.1.4",
+        "contentHash": "BH0wlHWmVoZpbAPyyt2Awbq30C+ZsS3eHSkYdnyUAbqVJ22fAJDzn2xTieBeoT5QlcBzp61vHcv878YJGfi3mg==",
+        "dependencies": {
+          "MessagePack.Annotations": "3.1.4",
+          "MessagePackAnalyzer": "3.1.4",
+          "Microsoft.NET.StringTools": "17.11.4"
        }
+      },
+      "Microsoft.Data.Sqlite": {
+        "type": "Direct",
+        "requested": "[10.0.7, )",
+        "resolved": "10.0.7",
+        "contentHash": "DZ6G2QuyPrsh5VS+wfiZbNBtYT6p+CkxXjD0aZHF04xso7QsG/uk0JpG30hzYlK6u/wtTzta1Dqfgbc/Sl2sDA==",
+        "dependencies": {
+          "Microsoft.Data.Sqlite.Core": "10.0.7",
+          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.11",
+          "SQLitePCLRaw.core": "2.1.11"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Direct",
+        "requested": "[10.0.7, 11.0.0)",
+        "resolved": "10.0.7",
+        "contentHash": "91F/o3emPV/+xY/ip3s2LqDNF14kjttlVtq0BXgg6p4MnCzeSZxnUJm+t6WRrtD3JdGo88/oX+z7OwK4y8PZuw==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Hosting": {
+        "type": "Direct",
+        "requested": "[10.0.7, 11.0.0)",
+        "resolved": "10.0.7",
+        "contentHash": "M/vBpfWcschvS2EUeq7cHfscsxabiGTptXwV7GeSueovGiSoNjyo1j5PMcWuOAAQrRW3nRqxZk8NeumrmpzUBg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.7",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.7",
+          "Microsoft.Extensions.Configuration.CommandLine": "10.0.7",
+          "Microsoft.Extensions.Configuration.EnvironmentVariables": "10.0.7",
+          "Microsoft.Extensions.Configuration.FileExtensions": "10.0.7",
+          "Microsoft.Extensions.Configuration.Json": "10.0.7",
+          "Microsoft.Extensions.Configuration.UserSecrets": "10.0.7",
+          "Microsoft.Extensions.DependencyInjection": "10.0.7",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Diagnostics": "10.0.7",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.7",
+          "Microsoft.Extensions.FileProviders.Physical": "10.0.7",
+          "Microsoft.Extensions.Hosting.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Logging": "10.0.7",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Logging.Configuration": "10.0.7",
+          "Microsoft.Extensions.Logging.Console": "10.0.7",
+          "Microsoft.Extensions.Logging.Debug": "10.0.7",
+          "Microsoft.Extensions.Logging.EventLog": "10.0.7",
+          "Microsoft.Extensions.Logging.EventSource": "10.0.7",
+          "Microsoft.Extensions.Options": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Logging": {
+        "type": "Direct",
+        "requested": "[10.0.7, 11.0.0)",
+        "resolved": "10.0.7",
+        "contentHash": "hOeRIQ63GkgiYCB/MIFp+LQs8aXpJXpB55t6Aj37ab7t2/6WeFcPXxYM9hdy/o5tffzwf8mhqzLJP6mjGYCxjw==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection": "10.0.7",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Options": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Options": {
+        "type": "Direct",
+        "requested": "[10.0.7, 11.0.0)",
+        "resolved": "10.0.7",
+        "contentHash": "00SHUGTh2jSMvIr6x9Xwd2nE+B5/qFCO/9hDwUDhJsjYRDlADmaBZ7tqehXzBDsfjHSXJzuRHJzPYPPjphBQ7Q==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Primitives": "10.0.7"
+        }
+      },
+      "morelinq": {
+        "type": "Direct",
+        "requested": "[4.4.0, )",
+        "resolved": "4.4.0",
+        "contentHash": "QX3bsK9oFeUXk8tFsc9NkI6NnCr8Ar/ex027p+ZZ/jdLCdX2RlryDtxUqZW5j45NVwn4E4Z4hzupsoMQd6Yxtg=="
+      },
+      "Pidgin": {
+        "type": "Direct",
+        "requested": "[3.5.1, 4.0.0)",
+        "resolved": "3.5.1",
+        "contentHash": "zU7tkXlF3D6d2GLTjJDomAL3nnl4AwfZvSgSz8D4b+Ry21/clqedYlxBnEAkAU/bkGfEv6uRR7QCdWZUpKrB/g=="
+      },
+      "SixLabors.ImageSharp": {
+        "type": "Direct",
+        "requested": "[3.1.12, 4.0.0)",
+        "resolved": "3.1.12",
+        "contentHash": "iAg6zifihXEFS/t7fiHhZBGAdCp3FavsF4i2ZIDp0JfeYeDVzvmlbY1CNhhIKimaIzrzSi5M/NBFcWvZT2rB/A=="
+      },
+      "SQLitePCLRaw.lib.e_sqlite3": {
+        "type": "Direct",
+        "requested": "[3.50.3, )",
+        "resolved": "3.50.3",
+        "contentHash": "tVyhqQ8wxgedWiiPFChyZhE8I3PkOM/AE1azsj1qsdYUws13ONBFyi3aDxju4tD2kzedB2q5+50WrTyY0h2gMQ=="
+      },
+      "MessagePack.Annotations": {
+        "type": "Transitive",
+        "resolved": "3.1.4",
+        "contentHash": "aVWrDAkCdqxwQsz/q0ldPh2EFn48M99YUzE9OvZjMq2RNLKz4o2z88iGFvSvbMqOWRweRvKPHBJZe22PRqzslQ=="
+      },
+      "MessagePackAnalyzer": {
+        "type": "Transitive",
+        "resolved": "3.1.4",
+        "contentHash": "CTaSsN/liJ7MhLCAB7Z4ZLBNuVGCq9lt2BT/cbrc9vzGv89yK3CqIA+z9T19a11eQYl9etZHL6MQJgCqECRVpg=="
+      },
+      "Microsoft.Data.Sqlite.Core": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "xVrtBg3M1wJlBDkoT0dXEYB/wSc8bIHJPYtw/bu1AqpWgF79uPSs87DAhERR/Ilumre6TKZa1cjMg3VUUObVLA==",
+        "dependencies": {
+          "SQLitePCLRaw.core": "2.1.11"
+        }
+      },
+      "Microsoft.Extensions.Configuration": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "wZbGh7J8R1vXN525O6d8dlcDTxhRTnd5MyW4LdfP5S0tSnTwTCseYSrq6g0Mxh7W9xn8P/2xPuf0D/m6k2dy2w==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Primitives": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "t56nEgvECcyLPojZIUFWJknQQDAbgfTf9J+QMYJE1YYvVgz69vN6B/AKL8Grvj3Lcnp8kTpNqwmwFhb3YLJmtQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Binder": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "8bS1qIaRivny+WX+49pmeJ6iAylbtX8C0DLEcCQWZjdxQvLqaMssXiGD9P/6pYElrHbK5/nAHmjbQ8STqdMYeg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.7",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Configuration.CommandLine": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "3lNjglxfFxOzI9zG+3HSg/YSGqo//8Fqw6u6iuIamZb4JCorbA3JLaeWOpfKTAPi2UJwaispOXWx14dUqcGz4A==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.7",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Configuration.EnvironmentVariables": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "TWto3imA+mJMLZI+5sbgLiFFoOFNFkizQYNaC5jTuiHKn3diwm1RN7mWDOEZN9kG2bixw7IvgpvtUG5/teSRzA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.7",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Configuration.FileExtensions": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "qbZLvLsoTdArSloEnSxs21P781YUmwVmHc5NJPQD/ezAreQ7884z+6QfAZVKi86WAZtzx83jK2uC4itxOM44gQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.7",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.7",
+          "Microsoft.Extensions.FileProviders.Physical": "10.0.7",
+          "Microsoft.Extensions.Primitives": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Json": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "64dimvyyKk0dbUbrLg/YCv4ugJ4sVz2aXLwfvZwR1EC4tJqW9ru/oVRcXwoJRa2lQGXtYtlpk4maWOeIb48tQw==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.7",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Configuration.FileExtensions": "10.0.7",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Configuration.UserSecrets": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "YqVIICoIdl0016wkeO2WQS+uEbEXbUhMLKdC5rZNl1X3nu59F+nwaAHdHjq/4OK+Cx31DYmNUSFh+MUot8qSDw==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Configuration.Json": "10.0.7",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.7",
+          "Microsoft.Extensions.FileProviders.Physical": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "Z6mfFEaFcwCfSboxJwOLfu7/31npCY9q70WUamHW/vRQhDvBKOT4Vf9YkZj5J6hLvJpb0oDEYfHunQZj0xxvKw=="
+      },
+      "Microsoft.Extensions.Diagnostics": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "l+smp1qPlU0OUXD0OGfdp7OUFrbdq7ZaP5T7m2WpfZ4RFKD7iG73BAT7tjSMxNmbSXkhAn1jYHOAqzYG1r9sNg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.7",
+          "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "uJ9JP677y+uy+C0vtaSfi7XXgFAdz8DhU3M9lwwIXDfQKcyQ0yxM9DVYa0NXDtdVTYA2eBUtVFZ8LY0GCdeE/w==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Options": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.FileProviders.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "teioDgVpi8L186wUfrXQV1YuBt6lCSPmFZiMZo53+FZxHFjOV+f4GXo4LXgJ273Mku9//AdXWVjk9J7eJP6inw==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.FileProviders.Physical": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "zhgWg/i0ECj5v0jLFBSZHplvc5ygCI91DR4nne+BP4XAKF5ycz0pEKnFiTw8C1jCABJEZsnBZh6pXAvn71kFmw==",
+        "dependencies": {
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.7",
+          "Microsoft.Extensions.FileSystemGlobbing": "10.0.7",
+          "Microsoft.Extensions.Primitives": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.FileSystemGlobbing": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "NTUspqB+vH9g4wAD6KPOBx01xqYuKXR/cHXm449zpbq1GqfjdAxBmg7eJXrNsPw7SKwIdT2cJ05GxYVvc+lvsA=="
+      },
+      "Microsoft.Extensions.Hosting.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "5s8d6qC6EA8UOI4wR/+zlsq7SXttJMRb9d7zvVZ7+bE3CQEfVtC9ITUDCommm87R1zzj6WJBbCnztuIJXnP3DA==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.7",
+          "Microsoft.Extensions.FileProviders.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Logging.Abstractions": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "tIEcQ2gvERrH2KiCjdsVcHGhXt9lIsuDStfOIeZWr7/fP8IXhGiYfx0/80PNI7WPO2IYuFtlZLSlnTS8+/Mchw==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Logging.Configuration": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "7BBnoGF37USiu7j434put9mDp7EjdlNDIZsR4vHfC1FbLZeLqiWjgJbeEtF0p59Ryqt8AtraHawf0ZKbe5jibg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "10.0.7",
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.7",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Logging": "10.0.7",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Options": "10.0.7",
+          "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Logging.Console": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "DA++Es6v6W0HfrOrw+K8WyN6jNnZHp640PDdEvl8yfeVmgflKdn6vSSFvufNUSOuY+M2ZaSUgfY+jUKtNpXcCw==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Logging": "10.0.7",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Logging.Configuration": "10.0.7",
+          "Microsoft.Extensions.Options": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Logging.Debug": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "Y6DSt/JZApunYWKqTtqbdsR6iqAvHx3D0tavbNJ1rnC24MUpF+3XO/VKgFi+9PFqMyvQ2GHBBGb8H3cLSw7rDg==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Logging": "10.0.7",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Logging.EventLog": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "1C8eTuxF6BLncNSJ1HCfmaBcjpUSqQDPlBVdYTlet9oldHTPpNh9iatxSJLs8TOqdp/FOpH+nSLdBve7fu9mTQ==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Logging": "10.0.7",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Options": "10.0.7",
+          "System.Diagnostics.EventLog": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Logging.EventSource": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "YWfndnDX1jVMGCN8d5T+rO+BO8sDw6BkYlUk0BYui+WP7+HhlWx8QLdA4yUDjrkGVb3AQxIWWEPVKw5Nnfj5GQ==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Logging": "10.0.7",
+          "Microsoft.Extensions.Logging.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Options": "10.0.7",
+          "Microsoft.Extensions.Primitives": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Options.ConfigurationExtensions": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "IT7f+EMXZtkjatEcF+o6aOw/7OE4etRrMiDGEWH/iiTu2R3uhC4NEQJCfHiibtX45U3sIQ5Fh6tbb1qaOz3YAg==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Configuration.Binder": "10.0.7",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
+          "Microsoft.Extensions.Options": "10.0.7",
+          "Microsoft.Extensions.Primitives": "10.0.7"
+        }
+      },
+      "Microsoft.Extensions.Primitives": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "D5M0Jr551iTgwkZMN9rm0pSkgNLj5quUWQUmQPMZh7k/bnvZTnXRGfE2KuvXf1EEjt/ofD9yw9IumpgdP9QCnw=="
+      },
+      "Microsoft.NET.StringTools": {
+        "type": "Transitive",
+        "resolved": "17.11.4",
+        "contentHash": "mudqUHhNpeqIdJoUx2YDWZO/I9uEDYVowan89R6wsomfnUJQk6HteoQTlNjZDixhT2B4IXMkMtgZtoceIjLRmA=="
+      },
+      "SQLitePCLRaw.bundle_e_sqlite3": {
+        "type": "Transitive",
+        "resolved": "2.1.11",
+        "contentHash": "DC4nA7yWnf4UZdgJDF+9Mus4/cb0Y3Sfgi3gDnAoKNAIBwzkskNAbNbyu+u4atT0ruVlZNJfwZmwiEwE5oz9LQ==",
+        "dependencies": {
+          "SQLitePCLRaw.lib.e_sqlite3": "2.1.11",
+          "SQLitePCLRaw.provider.e_sqlite3": "2.1.11"
+        }
+      },
+      "SQLitePCLRaw.core": {
+        "type": "Transitive",
+        "resolved": "2.1.11",
+        "contentHash": "PK0GLFkfhZzLQeR3PJf71FmhtHox+U3vcY6ZtswoMjrefkB9k6ErNJEnwXqc5KgXDSjige2XXrezqS39gkpQKA=="
+      },
+      "SQLitePCLRaw.provider.e_sqlite3": {
+        "type": "Transitive",
+        "resolved": "2.1.11",
+        "contentHash": "Y/0ZkR+r0Cg3DQFuCl1RBnv/tmxpIZRU3HUvelPw6MVaKHwYYR8YNvgs0vuNuXCMvlyJ+Fh88U1D4tah1tt6qw==",
+        "dependencies": {
+          "SQLitePCLRaw.core": "2.1.11"
+        }
+      },
+      "System.Diagnostics.EventLog": {
+        "type": "Transitive",
+        "resolved": "10.0.7",
+        "contentHash": "WbmDLeTPYhEzXhvYVioTVn/D1XX6bovyny9n5p8Zxtf03+eY385RB818teZm6n+fA63iZNvng0/Np4tLuhkMhQ=="
+      }
    }
-}
+  }
+}
--- a/Show More
+++ b/Show More