chore: re-release Theme Expansion as v1.2.3

Hab vergessen die repo.json wieder mit zu bumpen, deshalb hat
Dalamud den v1.2.2-Release nicht angenommen — komplette Manifest-
Bump-Checkliste diesmal durchgezogen: csproj, yaml-Description +
Changelog, repo.json (AssemblyVersion + TestingAssemblyVersion +
drei DownloadLink*-URLs + Description + Changelog), CHANGELOG.md,
ROADMAP.md, README.md, Forge-Post-Datei. Inhalt unverändert
gegenüber v1.2.2.

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

@@ -0,0 +1,16 @@
+---
+subtitle: "Settings Cleanup"
+versionsnatur: "UX-Polish-Cycle"
+---
+- Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede Card hat einen kurzen Untertitel — kein Raten mehr wo eine Setting steckt
+- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften & Farben** (Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung** (Aufbewahrung, Cleanup, Export, DB-Viewer, Advanced-Tools — vorher zwischen Datenschutz und Datenbank verteilt)
+- Datenschutz fokussiert sich jetzt auf eine Aufgabe: den Privacy-Filter
+- Der Auto-Tell-Tabs-History-Preload-Slider ist von Datenschutz nach Chat → Auto-Tell-Tabs umgezogen
+- KeybindMode wohnt jetzt unter Allgemein → Eingabe statt unter Sprache
+- Vier tote Schema-Felder entfernt (alle obsolet seit der Theme-Engine in v1.1.0): `Stilüberschreiben`-Toggle, `Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes `ShowThemeQuickPicker`
+- Migration v15 → v16: alter `WindowAlpha`-Wert wird automatisch nach `Theme & Layout → Fenster-Style → Fenster-Transparenz` gemappt (nur wenn der Slider noch auf Default 0.85 stand, sonst gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter `pluginConfigs/HellionChat.json.pre-v16-backup`. User die `Stilüberschreiben` aktiv hatten sehen einen einmaligen Hinweis-Toast
+- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+ standardmäßig hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf konservativere 2500
+- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der First-Run-Wizard hat keine Preset-Wahl)
+- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü (oben rechts in der Titelleiste) bietet eigene Overrides für Deckkraft, Hintergrund-Blur, Anpinnen und Durchklick — die haben Vorrang über unseren Slider für das jeweilige Fenster
+
+Pure UX-Polish, keine neuen Features. Nächster Cycle (v1.3.0): Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker) wie ursprünglich geplant.

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

@@ -0,0 +1,13 @@
+---
+subtitle: "Theme Expansion"
+versionsnatur: "Theme-Pack-Patch"
+---
+- Vier neue Built-in-Themes verlängern die Auswahl im Picker — keine Engine-Änderung, keine Settings angefasst, einfach mehr Farboptionen
+- **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral gehalten damit es sich nicht mit den Brand-Themes beißt
+- **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für Aurora-Glitter-Stimmung. Schwester von Event Horizon, aber dunkler und dichter; der Türkis-Akzent hält die beiden klar auseinander
+- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion Forge bekommt ein eigenes Theme im Plugin selbst — Schwester von Hellion Arctic, aber grüner und wärmer statt kaltem Cyan
+- **Hellion Spectrum** — Farbenblind-sichere Channel-Farben (Deuteranopie/Protanopie) auf Basis der Wong/Okabe-Ito-Palette. Channel-Identität bleibt erhalten (Tell pink, Yell gelb, Shout orange, Party blau, FC grün); die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche klar trennbar bleibt. Deckt rund 99 % aller CVD-Fälle ab
+- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene Custom-Themes laufen unverändert weiter
+- Theme-Katalog wächst damit von fünf auf neun Built-ins
+
+Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für Blau-Gelb-Schwäche) kann später nachgeliefert werden, falls Bedarf kommt.

HellionChat/Configuration.cs

@@ -34,7 +34,7 @@ public class ConfigKeyBind
 [Serializable]
 public class Configuration : IPluginConfiguration
 {
-    private const int LatestVersion = 15;
+    private const int LatestVersion = 16;
 
     public int Version { get; set; } = LatestVersion;
 
@@ -45,11 +45,17 @@ public class Configuration : IPluginConfiguration
     // HellionThemeWindowOpacity beim Bump v13 → v14.
     public float WindowOpacity = 0.85f;
 
+
     // v1.1.0 — Felder für künftige UI-Toggles (v1.2.0 / v1.3.0). Werden
     // vorab angelegt, damit später keine Migration nötig ist.
     public bool ReduceMotion;
-    public bool UseCompactDensity;
+    // v1.2.1 — Default geflippt von false → true. Card-Rows-Layout aus
-    public bool ShowThemeQuickPicker;
+    // v1.2.0 wurde als zu dicht empfunden; Single-Line `[HH:mm] Sender:
+    // Text` ist besser lesbar und platzsparender. Bestand-User mit aktiv
+    // false werden durch die v15→v16-Migration auf den neuen Default
+    // gehoben (Heuristik: wer in v1.2.0 false hatte, hatte den damals
+    // neu eingeführten Default — kaum jemand hat aktiv abgeschaltet).
+    public bool UseCompactDensity = true;
 
     // Hellion Chat — Privacy filter (DSGVO Art. 25 Privacy by Default).
     // Master-switch defaults to true; set false to restore upstream behavior.
@@ -147,7 +153,11 @@ public class Configuration : IPluginConfiguration
     public bool HideWhenUiHidden = true;
     public bool HideInLoadingScreens;
     public bool HideInBattle;
-    public bool HideInNewGamePlusMenu;
+    // v1.2.1 — Default geflippt false → true. Hellion-UI im NG+-Menü
+    // versteckt zu halten ist konsistent mit den anderen Hide-Defaults
+    // (Cutscenes, Logged-out, UI-Hidden) — UI-out-of-the-way bei Story-
+    // Sequenzen.
+    public bool HideInNewGamePlusMenu = true;
     public bool HideWhenInactive;
     public int InactivityHideTimeout = 10;
     public bool InactivityHideActiveDuringBattle = true;
@@ -162,7 +172,10 @@ public class Configuration : IPluginConfiguration
     public bool NativeItemTooltips = true;
     public bool PrettierTimestamps = true;
     public bool MoreCompactPretty;
-    public bool HideSameTimestamps;
+    // v1.2.1 — Default geflippt false → true. Wiederholte Zeitstempel
+    // innerhalb derselben Minute lesen sich als Rauschen; ein einziger
+    // Timestamp pro Minute reicht aus um die Konversation zu verorten.
+    public bool HideSameTimestamps = true;
     public bool ShowNoviceNetwork;
     // Hellion Chat — vertical sidebar tab layout reads better than the
     // horizontal tab strip in the company of Auto-Tell-Tabs (a club
@@ -189,7 +202,11 @@ public class Configuration : IPluginConfiguration
     public bool CollapseKeepUniqueLinks;
     public bool PlaySounds = true;
     public bool KeepInputFocus = true;
-    public int MaxLinesToRender = 5_000; // 1-10000
+    // v1.2.1 — Default gesenkt 5000 → 2500. 5000 ist auf Mid-Range-
+    // Hardware bei langen Sessions spürbar langsamer (Card-Layout
+    // re-Layout pro Frame), 2500 deckt eine typische Stunde Chat ab
+    // und bleibt smooth. User die mehr brauchen können bis 10000 hoch.
+    public int MaxLinesToRender = 2_500; // 1-10000
     // Default ON to match a German / European 24h locale. The
     // ChatLogWindow.cs format-flip in v0.5.1 honours this strictly via
     // CultureInfo.InvariantCulture so the result is consistent across
@@ -222,14 +239,25 @@ public class Configuration : IPluginConfiguration
     };
 
     public float TooltipOffset;
-    public float WindowAlpha = 100f;
+    // v1.2.1 — Default-Chat-Farben sind das Hellion-Brand-Preset. Der
-    public Dictionary<ChatType, uint> ChatColours = new();
+    // First-Run-Wizard bietet keine Theme-/Preset-Wahl an, daher kriegen
+    // neue User die Hellion-Brand-Farben out-of-the-box (Cyan-Familie für
+    // Standard/Tell, Ember/Warning für laute Channels). Bestand-User mit
+    // leerem ChatColours-Dict werden durch die v15→v16-Migration auf das
+    // Preset gehoben; User die bereits Custom-Farben haben, bleiben.
+    public Dictionary<ChatType, uint> ChatColours = BuildDefaultChatColours();
+
+    private static Dictionary<ChatType, uint> BuildDefaultChatColours()
+    {
+        var defaults = new Dictionary<ChatType, uint>();
+        foreach (var (channel, colour) in HellionChat.Resources.ChatColourPresets.All["Hellion"].Colours)
+            defaults[channel] = colour;
+        return defaults;
+    }
+
     public bool ColorSelectedInputChannelButton = true;
     public List<Tab> Tabs = [];
 
-    public bool OverrideStyle;
-    public string? ChosenStyle;
-
     public ConfigKeyBind? ChatTabForward;
     public ConfigKeyBind? ChatTabBackward;
 
@@ -294,7 +322,6 @@ public class Configuration : IPluginConfiguration
         ItalicFontV2 = other.ItalicFontV2;
         SymbolsFontSizeV2 = other.SymbolsFontSizeV2;
         TooltipOffset = other.TooltipOffset;
-        WindowAlpha = other.WindowAlpha;
         ChatColours = other.ChatColours.ToDictionary(entry => entry.Key, entry => entry.Value);
         ColorSelectedInputChannelButton = other.ColorSelectedInputChannelButton;
 
@@ -331,8 +358,6 @@ public class Configuration : IPluginConfiguration
         }).ToList();
         Tabs.AddRange(liveTempTabs);
 
-        OverrideStyle = other.OverrideStyle;
-        ChosenStyle = other.ChosenStyle;
         ChatTabForward = other.ChatTabForward;
         ChatTabBackward = other.ChatTabBackward;
 
@@ -353,7 +378,6 @@ public class Configuration : IPluginConfiguration
         WindowOpacity = other.WindowOpacity;
         ReduceMotion = other.ReduceMotion;
         UseCompactDensity = other.UseCompactDensity;
-        ShowThemeQuickPicker = other.ShowThemeQuickPicker;
 
         EnableAutoTellTabs = other.EnableAutoTellTabs;
         AutoTellTabsLimit = other.AutoTellTabsLimit;

HellionChat/HellionChat.csproj

@@ -4,7 +4,7 @@
              0.1.0 is our bootstrap release; the underlying Chat 2 base is
              called out in the yaml changelog so users can see what it
              derives from. -->
-        <Version>1.2.0</Version>
+        <Version>1.2.3</Version>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <!-- Honor packages.lock.json on restore so floating version ranges

HellionChat/HellionChat.yaml

@@ -36,6 +36,11 @@ description: |-
   JSON-based custom-theme authoring. Settings rebuilt around a card
   grid with section detail views. See docs/THEME-AUTHORING.md.
 
+  v1.2.3 — Theme catalogue grown to nine built-in themes:
+  Hellion Arctic, Hellion Spectrum (CVD-safe Deuteran/Protan),
+  Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove,
+  Night Blue, Indigo Violet, Forge Merchantman.
+
   Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
 
   Modding & support: join the Hellion Forge Discord at
@@ -55,6 +60,77 @@ tags:
   - Replacement
   - Privacy
 changelog: |-
+  **Hellion Chat 1.2.3 — Theme Expansion**
+
+  Four new built-in themes round out the picker. No engine changes,
+  no settings touched — just more colour options.
+
+  - **Night Blue** — Royal Blue on deep marine. Cool tech-dashboard
+    mood, distinct from the brand themes.
+  - **Indigo Violet** — Royal Violet on deep indigo with a turquoise-
+    mint counter for an aurora glitter feel. Sister to Event Horizon
+    but darker and denser; the turquoise accent keeps the two
+    distinguishable.
+  - **Forge Merchantman** — Patina bronze on workshop slate, warm
+    amber counter. Hellion Forge given a theme of its own — sister
+    to Hellion Arctic but greener and warmer instead of cold cyan.
+  - **Hellion Spectrum** — Deuteran/Protan-safe channel colours
+    using Wong/Okabe-Ito palette tones. Channel identity (Tell pink,
+    Yell yellow, Shout orange, Party blue, FC green) is preserved;
+    tones are chosen so each channel stays distinguishable under
+    red-green colour vision deficiency. Covers the ~99% of CVD cases
+    that are red-green.
+
+  No schema bump, no migration. Default theme is unchanged (Hellion
+  Arctic). Existing custom themes keep working.
+
+  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
+  **Hellion Chat 1.2.1 — Settings Cleanup**
+
+  Re-sorted the settings menu so related options live together. Card names
+  now describe their contents in plain words — "Theme & Layout", "Fonts &
+  Colours", "Data Management" — and each card has a short subtitle so you
+  don't have to guess where a setting lives. No new features, just
+  housekeeping.
+
+  Card changes:
+
+  - Theme & Layout (new) collects the theme picker, window frame style
+    (title bar, sidebar, hide button, pop-out title bar) and the timestamp
+    style options.
+  - Fonts & Colours (new) is the new home for font choice, font size and
+    per-channel chat colours.
+  - Data Management (new) is everything you do with stored messages:
+    retention windows, cleanup, export, the database viewer and the
+    advanced shift-click tools. All previously scattered between Privacy
+    and Database.
+  - Privacy is now focused on one job: the privacy filter.
+  - Chat absorbs the Auto-Tell-Tabs history preload slider that used to
+    live under Privacy.
+  - General groups the keybind mode under Input where it belongs.
+
+  Cleanup:
+
+  - Removed legacy "Style override" option and the unused style-name field
+    — both made obsolete by the Themes system in 1.1.0.
+  - Removed the legacy WindowAlpha slider; if you had it set, the value is
+    automatically migrated to Theme & Layout → Window Style → Window
+    Transparency.
+  - Removed the unused ShowThemeQuickPicker schema field.
+
+  Migration v15 → v16:
+
+  - A backup of your previous config is written to
+    pluginConfigs/HellionChat.json.pre-v16-backup before the schema change,
+    in case you want to roll back manually.
+  - All other settings are preserved unchanged.
+  - One-time toast on first start if you previously had Style override
+    enabled — it explains the change. Users who never touched that setting
+    see no toast.
+
+  Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+
   **Hellion Chat 1.2.0 — Layout Refresh**
 
   Second UI cycle: tab layouts modernised in both modes, a new

HellionChat/Plugin.cs

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

HellionChat/Resources/HellionStrings.Designer.cs

@@ -323,4 +323,37 @@ internal class HellionStrings
     // Hellion Chat — v1.2.0 Appearance / Compact-Density toggle
     internal static string Appearance_UseCompactDensity_Name => Get(nameof(Appearance_UseCompactDensity_Name));
     internal static string Appearance_UseCompactDensity_Description => Get(nameof(Appearance_UseCompactDensity_Description));
+
+    // Hellion Chat — v1.2.1 Settings Cleanup: new card titles + subtexts
+    internal static string Settings_Card_ThemeAndLayout_Title => Get(nameof(Settings_Card_ThemeAndLayout_Title));
+    internal static string Settings_Card_ThemeAndLayout_Subtext => Get(nameof(Settings_Card_ThemeAndLayout_Subtext));
+    internal static string Settings_Card_FontsAndColours_Title => Get(nameof(Settings_Card_FontsAndColours_Title));
+    internal static string Settings_Card_FontsAndColours_Subtext => Get(nameof(Settings_Card_FontsAndColours_Subtext));
+    internal static string Settings_Card_DataManagement_Title => Get(nameof(Settings_Card_DataManagement_Title));
+    internal static string Settings_Card_DataManagement_Subtext => Get(nameof(Settings_Card_DataManagement_Subtext));
+
+    // Hellion Chat — v1.2.1 Theme & Layout tab section headings + WindowOpacity slider
+    internal static string Settings_ThemeAndLayout_Theme_Heading => Get(nameof(Settings_ThemeAndLayout_Theme_Heading));
+    internal static string Settings_ThemeAndLayout_WindowStyle_Heading => Get(nameof(Settings_ThemeAndLayout_WindowStyle_Heading));
+    internal static string Settings_ThemeAndLayout_TimestampStyle_Heading => Get(nameof(Settings_ThemeAndLayout_TimestampStyle_Heading));
+    internal static string Settings_ThemeAndLayout_WindowOpacity_Name => Get(nameof(Settings_ThemeAndLayout_WindowOpacity_Name));
+    internal static string Settings_ThemeAndLayout_WindowOpacity_Description => Get(nameof(Settings_ThemeAndLayout_WindowOpacity_Description));
+
+    // Hellion Chat — v1.2.1 Fonts & Colours tab section headings
+    internal static string Settings_FontsAndColours_Fonts_Heading => Get(nameof(Settings_FontsAndColours_Fonts_Heading));
+    internal static string Settings_FontsAndColours_Colours_Heading => Get(nameof(Settings_FontsAndColours_Colours_Heading));
+
+    // Hellion Chat — v1.2.1 Data Management tab section headings
+    internal static string Settings_DataManagement_Storage_Heading => Get(nameof(Settings_DataManagement_Storage_Heading));
+    internal static string Settings_DataManagement_Retention_Heading => Get(nameof(Settings_DataManagement_Retention_Heading));
+    internal static string Settings_DataManagement_Cleanup_Heading => Get(nameof(Settings_DataManagement_Cleanup_Heading));
+    internal static string Settings_DataManagement_Export_Heading => Get(nameof(Settings_DataManagement_Export_Heading));
+    internal static string Settings_DataManagement_DbViewer_Heading => Get(nameof(Settings_DataManagement_DbViewer_Heading));
+    internal static string Settings_DataManagement_Advanced_Heading => Get(nameof(Settings_DataManagement_Advanced_Heading));
+
+    // Hellion Chat — v1.2.1 Window-tab Behaviour heading (replaces Frame heading)
+    internal static string Settings_Window_Frame_Behaviour_Heading => Get(nameof(Settings_Window_Frame_Behaviour_Heading));
+
+    // Hellion Chat — v1.2.1 Migration v15 → v16 toast
+    internal static string Migration_v16_OverrideStyle_Toast => Get(nameof(Migration_v16_OverrideStyle_Toast));
 }

HellionChat/Resources/HellionStrings.de.resx

@@ -639,7 +639,7 @@
     <value>Allgemein</value>
   </data>
   <data name="Settings_Card_General_Subtext" xml:space="preserve">
-    <value>Sprache und grundlegendes Verhalten</value>
+    <value>Plugin-globale Einstellungen — Sprache, Eingabe, Audio, Performance.</value>
   </data>
   <data name="Settings_Card_Appearance_Title" xml:space="preserve">
     <value>Erscheinungsbild</value>
@@ -657,25 +657,25 @@
     <value>Fenster</value>
   </data>
   <data name="Settings_Card_Window_Subtext" xml:space="preserve">
-    <value>Fensterposition, Rahmen, Hide-Zustände</value>
+    <value>Verhalten des Fensters — wann es da ist, ob es bewegt werden kann.</value>
   </data>
   <data name="Settings_Card_Chat_Title" xml:space="preserve">
     <value>Chat</value>
   </data>
   <data name="Settings_Card_Chat_Subtext" xml:space="preserve">
-    <value>Chat-Verhalten, Emotes, Auto-Tells</value>
+    <value>Wie Nachrichten angezeigt werden — Tells, Vorschau, Verhalten, Emotes.</value>
   </data>
   <data name="Settings_Card_Tabs_Title" xml:space="preserve">
     <value>Tabs</value>
   </data>
   <data name="Settings_Card_Tabs_Subtext" xml:space="preserve">
-    <value>Tab-Layout, Kanäle, eigene Tabs</value>
+    <value>Tab-Verwaltung — eigene Chat-Tabs anlegen und konfigurieren.</value>
   </data>
   <data name="Settings_Card_Privacy_Title" xml:space="preserve">
     <value>Datenschutz</value>
   </data>
   <data name="Settings_Card_Privacy_Subtext" xml:space="preserve">
-    <value>Filter, Aufbewahrung, Bereinigung, Export</value>
+    <value>Was darf gespeichert werden — Privacy-Filter pro Channel.</value>
   </data>
   <data name="Settings_Card_Database_Title" xml:space="preserve">
     <value>Datenbank</value>
@@ -687,7 +687,7 @@
     <value>Information</value>
   </data>
   <data name="Settings_Card_Information_Subtext" xml:space="preserve">
-    <value>Über, Mitwirkende, Support</value>
+    <value>Über das Plugin — Version, Mission, Lizenz, Changelog.</value>
   </data>
   <data name="Settings_Tab_Themes" xml:space="preserve">
     <value>Themes</value>
@@ -728,4 +728,67 @@
   <data name="Appearance_UseCompactDensity_Description" xml:space="preserve">
     <value>Schaltet das Message-Layout vom Card-Row-Default zurück auf einzeilige `[HH:mm] Sender: Text` Zeilen.</value>
   </data>
+  <data name="Settings_Card_ThemeAndLayout_Title" xml:space="preserve">
+    <value>Theme &amp; Layout</value>
+  </data>
+  <data name="Settings_Card_ThemeAndLayout_Subtext" xml:space="preserve">
+    <value>Wie das Fenster aussieht — Theme, Rahmen, Zeitstempel-Style.</value>
+  </data>
+  <data name="Settings_Card_FontsAndColours_Title" xml:space="preserve">
+    <value>Schriften &amp; Farben</value>
+  </data>
+  <data name="Settings_Card_FontsAndColours_Subtext" xml:space="preserve">
+    <value>Lesbarkeit — Schriftart, Schriftgröße, Chat-Farben pro Channel.</value>
+  </data>
+  <data name="Settings_Card_DataManagement_Title" xml:space="preserve">
+    <value>Daten-Verwaltung</value>
+  </data>
+  <data name="Settings_Card_DataManagement_Subtext" xml:space="preserve">
+    <value>Was passiert mit gespeicherten Daten — Aufbewahrung, Aufräumen, Export, DB-Stats.</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowStyle_Heading" xml:space="preserve">
+    <value>Fenster-Style</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_TimestampStyle_Heading" xml:space="preserve">
+    <value>Zeitstempel-Style</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowOpacity_Name" xml:space="preserve">
+    <value>Fenster-Transparenz</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowOpacity_Description" xml:space="preserve">
+    <value>Wie durchsichtig der Fensterhintergrund ist. Niedrigere Werte lassen mehr vom Spiel durchscheinen. Tipp: Dalamud's Per-Window-Menü (Hamburger in der Titelleiste) bietet pro Fenster eigene Overrides für Deckkraft, Hintergrund-Blur, Durchklick und Anpinnen — die haben Vorrang über diesen Slider für das jeweilige Fenster.</value>
+  </data>
+  <data name="Settings_FontsAndColours_Fonts_Heading" xml:space="preserve">
+    <value>Schriftarten</value>
+  </data>
+  <data name="Settings_FontsAndColours_Colours_Heading" xml:space="preserve">
+    <value>Chat-Farben</value>
+  </data>
+  <data name="Settings_DataManagement_Storage_Heading" xml:space="preserve">
+    <value>Speicherung</value>
+  </data>
+  <data name="Settings_DataManagement_Retention_Heading" xml:space="preserve">
+    <value>Aufbewahrung</value>
+  </data>
+  <data name="Settings_DataManagement_Cleanup_Heading" xml:space="preserve">
+    <value>Cleanup</value>
+  </data>
+  <data name="Settings_DataManagement_Export_Heading" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="Settings_DataManagement_DbViewer_Heading" xml:space="preserve">
+    <value>Datenbank-Viewer</value>
+  </data>
+  <data name="Settings_DataManagement_Advanced_Heading" xml:space="preserve">
+    <value>Erweitert (Shift+Klick zum Öffnen)</value>
+  </data>
+  <data name="Settings_Window_Frame_Behaviour_Heading" xml:space="preserve">
+    <value>Verhalten</value>
+  </data>
+  <data name="Migration_v16_OverrideStyle_Toast" xml:space="preserve">
+    <value>Hellion Chat 1.2.1 hat das Settings-Menü neu sortiert und die alte „Stilüberschreiben"-Option entfernt (überholt durch das Theme-System aus 1.1.0). Deine restlichen Einstellungen bleiben unverändert. Die Fenster-Transparenz ist nach „Theme &amp; Layout" migriert. Ein Backup der vorherigen Config liegt unter pluginConfigs/HellionChat.json.pre-v16-backup neben der aktiven HellionChat.json.</value>
+  </data>
 </root>

HellionChat/Resources/HellionStrings.resx

@@ -639,7 +639,7 @@
     <value>General</value>
   </data>
   <data name="Settings_Card_General_Subtext" xml:space="preserve">
-    <value>Language and basic behaviour</value>
+    <value>Plugin-wide settings — language, input, audio, performance.</value>
   </data>
   <data name="Settings_Card_Appearance_Title" xml:space="preserve">
     <value>Appearance</value>
@@ -657,25 +657,25 @@
     <value>Window</value>
   </data>
   <data name="Settings_Card_Window_Subtext" xml:space="preserve">
-    <value>Window position, frame, hide states</value>
+    <value>Window behaviour — when it shows, whether it can move.</value>
   </data>
   <data name="Settings_Card_Chat_Title" xml:space="preserve">
     <value>Chat</value>
   </data>
   <data name="Settings_Card_Chat_Subtext" xml:space="preserve">
-    <value>Chat behaviour, emotes, auto-tells</value>
+    <value>How messages are displayed — tells, preview, behaviour, emotes.</value>
   </data>
   <data name="Settings_Card_Tabs_Title" xml:space="preserve">
     <value>Tabs</value>
   </data>
   <data name="Settings_Card_Tabs_Subtext" xml:space="preserve">
-    <value>Tab layout, channels, custom tabs</value>
+    <value>Tab management — create and configure your own chat tabs.</value>
   </data>
   <data name="Settings_Card_Privacy_Title" xml:space="preserve">
     <value>Privacy</value>
   </data>
   <data name="Settings_Card_Privacy_Subtext" xml:space="preserve">
-    <value>Filter, retention, cleanup, export</value>
+    <value>What's allowed to be stored — privacy filter per channel.</value>
   </data>
   <data name="Settings_Card_Database_Title" xml:space="preserve">
     <value>Database</value>
@@ -687,7 +687,7 @@
     <value>Information</value>
   </data>
   <data name="Settings_Card_Information_Subtext" xml:space="preserve">
-    <value>About, credits, support</value>
+    <value>About the plugin — version, mission, license, changelog.</value>
   </data>
   <data name="Settings_Tab_Themes" xml:space="preserve">
     <value>Themes</value>
@@ -728,4 +728,67 @@
   <data name="Appearance_UseCompactDensity_Description" xml:space="preserve">
     <value>Schaltet das Message-Layout vom Card-Row-Default zurück auf einzeilige `[HH:mm] Sender: Text` Zeilen.</value>
   </data>
+  <data name="Settings_Card_ThemeAndLayout_Title" xml:space="preserve">
+    <value>Theme &amp; Layout</value>
+  </data>
+  <data name="Settings_Card_ThemeAndLayout_Subtext" xml:space="preserve">
+    <value>How the window looks — theme, frame, timestamp style.</value>
+  </data>
+  <data name="Settings_Card_FontsAndColours_Title" xml:space="preserve">
+    <value>Fonts &amp; Colours</value>
+  </data>
+  <data name="Settings_Card_FontsAndColours_Subtext" xml:space="preserve">
+    <value>Readability — font, font size, per-channel chat colours.</value>
+  </data>
+  <data name="Settings_Card_DataManagement_Title" xml:space="preserve">
+    <value>Data Management</value>
+  </data>
+  <data name="Settings_Card_DataManagement_Subtext" xml:space="preserve">
+    <value>What happens to stored data — retention, cleanup, export, DB stats.</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowStyle_Heading" xml:space="preserve">
+    <value>Window Style</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_TimestampStyle_Heading" xml:space="preserve">
+    <value>Timestamp Style</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowOpacity_Name" xml:space="preserve">
+    <value>Window Transparency</value>
+  </data>
+  <data name="Settings_ThemeAndLayout_WindowOpacity_Description" xml:space="preserve">
+    <value>How transparent the window background is. Lower values let the game show through more. Tip: Dalamud's per-window menu (Hamburger in the title bar) gives you per-window overrides for opacity, background blur, click-through and pinning — those override this slider for that window.</value>
+  </data>
+  <data name="Settings_FontsAndColours_Fonts_Heading" xml:space="preserve">
+    <value>Fonts</value>
+  </data>
+  <data name="Settings_FontsAndColours_Colours_Heading" xml:space="preserve">
+    <value>Chat Colours</value>
+  </data>
+  <data name="Settings_DataManagement_Storage_Heading" xml:space="preserve">
+    <value>Storage</value>
+  </data>
+  <data name="Settings_DataManagement_Retention_Heading" xml:space="preserve">
+    <value>Retention</value>
+  </data>
+  <data name="Settings_DataManagement_Cleanup_Heading" xml:space="preserve">
+    <value>Cleanup</value>
+  </data>
+  <data name="Settings_DataManagement_Export_Heading" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="Settings_DataManagement_DbViewer_Heading" xml:space="preserve">
+    <value>Database Viewer</value>
+  </data>
+  <data name="Settings_DataManagement_Advanced_Heading" xml:space="preserve">
+    <value>Advanced (Shift+Click to open)</value>
+  </data>
+  <data name="Settings_Window_Frame_Behaviour_Heading" xml:space="preserve">
+    <value>Behaviour</value>
+  </data>
+  <data name="Migration_v16_OverrideStyle_Toast" xml:space="preserve">
+    <value>Hellion Chat 1.2.1 reorganised the Settings menu and removed the legacy "Style override" option (made obsolete by the Themes system in 1.1.0). Your other settings are unchanged. Window opacity was migrated to Theme &amp; Layout. A backup of your previous config is at pluginConfigs/HellionChat.json.pre-v16-backup next to the live HellionChat.json.</value>
+  </data>
 </root>

HellionChat/Themes/Builtin/ForgeMerchantman.cs

@@ -0,0 +1,76 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class ForgeMerchantman
+{
+    public const string Slug = "forge-merchantman";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Forge Merchantman",
+        Author: "Hellion Online Media",
+        Description: "Patina Bronze auf Workshop-Slate — Hellion Forge im Plugin.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#1F8A82"),
+            Primary:        ColourUtil.HexToRgba("#2DB39E"),
+            PrimaryLight:   ColourUtil.HexToRgba("#4FC9B0"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#2DB39E99"),
+
+            AccentDark:     ColourUtil.HexToRgba("#B86A20"),
+            Accent:         ColourUtil.HexToRgba("#D9892C"),
+            AccentLight:    ColourUtil.HexToRgba("#E8A04A"),
+
+            Identity:       ColourUtil.HexToRgba("#1F8A82"),
+
+            WindowBg:       ColourUtil.HexToRgba("#050B0A"),
+            ChildBg:        ColourUtil.HexToRgba("#0B1413"),
+            FrameBg:        ColourUtil.HexToRgba("#11201D"),
+            Surface:        ColourUtil.HexToRgba("#182925"),
+            SurfaceHover:   ColourUtil.HexToRgba("#213631"),
+            Border:         ColourUtil.HexToRgba("#2DB39E66"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#D8EFE8"),
+            TextMuted:      ColourUtil.HexToRgba("#8FA39B"),
+            TextDim:        ColourUtil.HexToRgba("#5A6E66"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#5CB85C"),
+            StatusDanger:   ColourUtil.HexToRgba("#D9534F"),
+            StatusWarning:  ColourUtil.HexToRgba("#F0AD4E"),
+            StatusInfo:     ColourUtil.HexToRgba("#2DB39E")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 4f, ChildRounding: 3f, PopupRounding: 3f,
+            FrameRounding: 2f, GrabRounding: 2f, TabRounding: 2f,
+            ScrollbarRounding: 2f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true,
+        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
+        {
+            // Forge Merchantman — Patina-Tinte in Party/FC, Bernstein-Tinte in
+            // Yell/Alliance/CustomEmote. Channel-identity bleibt voll erhalten.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#FFFFFF"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F0C060"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#E8902C"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#6AC9B0"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#E8A04A"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#4FB8A0"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A8E060"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#6AC9B0"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A8E060"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#E8A04A"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F0C060"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E8B0"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#6AC9B0"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#A8A0F0"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#E8B0F0"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8C880"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8C880"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#8FA39B"),
+        })
+    );
+}

HellionChat/Themes/Builtin/HellionSpectrum.cs

@@ -0,0 +1,83 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+// Hellion Spectrum: Deuteran/Protan-safe channel colours.
+// Palette derived from Bang Wong, "Points of view: Color blindness",
+// Nature Methods 8, 441 (2011). Channel identity (Tell pink, Yell yellow,
+// Shout orange, Party blue, FC green) is preserved per Channel-Identity-
+// Rule in docs/THEME-AUTHORING.md; tones are chosen so every channel
+// stays distinguishable under red-green colour-vision deficiency.
+internal static class HellionSpectrum
+{
+    public const string Slug = "hellion-spectrum";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Hellion Spectrum",
+        Author: "Hellion Online Media",
+        Description: "Deuteran/Protan-safe channels — Wong palette tones, channel identity preserved.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#005983"),
+            Primary:        ColourUtil.HexToRgba("#0072B2"),
+            PrimaryLight:   ColourUtil.HexToRgba("#3E9BD0"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#0072B299"),
+
+            AccentDark:     ColourUtil.HexToRgba("#B07F00"),
+            Accent:         ColourUtil.HexToRgba("#E69F00"),
+            AccentLight:    ColourUtil.HexToRgba("#F0B73A"),
+
+            Identity:       ColourUtil.HexToRgba("#005983"),
+
+            WindowBg:       ColourUtil.HexToRgba("#0A0F14"),
+            ChildBg:        ColourUtil.HexToRgba("#101620"),
+            FrameBg:        ColourUtil.HexToRgba("#1A222E"),
+            Surface:        ColourUtil.HexToRgba("#22303F"),
+            SurfaceHover:   ColourUtil.HexToRgba("#2D3E51"),
+            Border:         ColourUtil.HexToRgba("#0072B266"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#F0F4F8"),
+            TextMuted:      ColourUtil.HexToRgba("#9AA8B5"),
+            TextDim:        ColourUtil.HexToRgba("#5E6B78"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#009E73"),
+            StatusDanger:   ColourUtil.HexToRgba("#D55E00"),
+            StatusWarning:  ColourUtil.HexToRgba("#F0E442"),
+            StatusInfo:     ColourUtil.HexToRgba("#56B4E9")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
+            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
+            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true,
+        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
+        {
+            // Hellion Spectrum — Wong/Okabe-Ito tones within FFXIV channel
+            // identity. FC pulled slightly greener than vanilla cyan-teal so
+            // Party-blue and FC-green stay separable under deuteran sim.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#FFFFFF"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F0E442"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#D55E00"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#CC79A7"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#CC79A7"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#56B4E9"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#E69F00"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#009E73"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#94CC4A"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#56B4E9"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#94CC4A"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#E69F00"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F0E442"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#66D9A8"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#56B4E9"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#8B7DD0"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#E0A0C0"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#DAA0DA"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#C9A56F"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#C9A56F"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#C0C0C0"),
+        })
+    );
+}

HellionChat/Themes/Builtin/IndigoViolet.cs

@@ -0,0 +1,77 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class IndigoViolet
+{
+    public const string Slug = "indigo-violet";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Indigo Violet",
+        Author: "Julia Moon",
+        Description: "Royal Violet auf Deep Indigo — Glitter-Galaxy mit Türkis-Mint-Aurora.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#6B3AB0"),
+            Primary:        ColourUtil.HexToRgba("#8B4DDE"),
+            PrimaryLight:   ColourUtil.HexToRgba("#B07CFF"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#8B4DDE99"),
+
+            AccentDark:     ColourUtil.HexToRgba("#36A89C"),
+            Accent:         ColourUtil.HexToRgba("#4FC9B8"),
+            AccentLight:    ColourUtil.HexToRgba("#7AE0CF"),
+
+            Identity:       ColourUtil.HexToRgba("#6B3AB0"),
+
+            WindowBg:       ColourUtil.HexToRgba("#0D061F"),
+            ChildBg:        ColourUtil.HexToRgba("#1A0D3D"),
+            FrameBg:        ColourUtil.HexToRgba("#2A1556"),
+            Surface:        ColourUtil.HexToRgba("#3D1F78"),
+            SurfaceHover:   ColourUtil.HexToRgba("#5B2A9A"),
+            Border:         ColourUtil.HexToRgba("#8B4DDE66"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#F0E6FF"),
+            TextMuted:      ColourUtil.HexToRgba("#A890D0"),
+            TextDim:        ColourUtil.HexToRgba("#7560A0"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#3DDC97"),
+            StatusDanger:   ColourUtil.HexToRgba("#FF5C7A"),
+            StatusWarning:  ColourUtil.HexToRgba("#FFB84A"),
+            StatusInfo:     ColourUtil.HexToRgba("#8B4DDE")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
+            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
+            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true,
+        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
+        {
+            // Indigo Violet — Lavender-Pink-Drift in Tell und LS6/7. Türkis-
+            // Mint-Aurora-Counter in Party/FC und LS4. Glitter-Gold in Yell.
+            // Differenzierung zu Event Horizon: dunkler, dichter, Türkis statt Gold.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#F0E6FF"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#F0D880"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#F09A60"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#E090FF"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#E090FF"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#6AB8D0"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#F0A878"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#4FC9B8"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A0E090"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#6AB8D0"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A0E090"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#F0BC92"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#F0D880"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E0C0"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#6AB8D0"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#B07CFF"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#E090FF"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#C098D8"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8B590"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8B590"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#A890D0"),
+        })
+    );
+}

HellionChat/Themes/Builtin/NightBlue.cs

@@ -0,0 +1,76 @@
+using HellionChat.Util;
+
+namespace HellionChat.Themes.Builtin;
+
+internal static class NightBlue
+{
+    public const string Slug = "night-blue";
+
+    public static Theme Build() => new(
+        Slug: Slug,
+        Name: "Night Blue",
+        Author: "Julia Moon",
+        Description: "Royal Blue auf Marineblau — kühles Tech-Dashboard-Mood.",
+        Colors: new ThemeColors(
+            PrimaryDark:    ColourUtil.HexToRgba("#3576C0"),
+            Primary:        ColourUtil.HexToRgba("#4A90E2"),
+            PrimaryLight:   ColourUtil.HexToRgba("#6AB0FF"),
+            PrimaryGlow:    ColourUtil.HexToRgba("#4A90E299"),
+
+            AccentDark:     ColourUtil.HexToRgba("#C97A2E"),
+            Accent:         ColourUtil.HexToRgba("#E8A040"),
+            AccentLight:    ColourUtil.HexToRgba("#F4B968"),
+
+            Identity:       ColourUtil.HexToRgba("#3576C0"),
+
+            WindowBg:       ColourUtil.HexToRgba("#050B18"),
+            ChildBg:        ColourUtil.HexToRgba("#0A1628"),
+            FrameBg:        ColourUtil.HexToRgba("#122039"),
+            Surface:        ColourUtil.HexToRgba("#1A2D4F"),
+            SurfaceHover:   ColourUtil.HexToRgba("#234070"),
+            Border:         ColourUtil.HexToRgba("#4A90E266"),
+
+            TextPrimary:    ColourUtil.HexToRgba("#E6EDF7"),
+            TextMuted:      ColourUtil.HexToRgba("#8CA0BF"),
+            TextDim:        ColourUtil.HexToRgba("#5A6F8F"),
+
+            StatusSuccess:  ColourUtil.HexToRgba("#3DDC97"),
+            StatusDanger:   ColourUtil.HexToRgba("#FF5C7A"),
+            StatusWarning:  ColourUtil.HexToRgba("#FFB84A"),
+            StatusInfo:     ColourUtil.HexToRgba("#4A90E2")
+        ),
+        Layout: new ThemeLayout(
+            WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f,
+            FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f,
+            ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f
+        ),
+        Typography: new ThemeTypography(),
+        IsBuiltIn: true,
+        ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint>
+        {
+            // Night Blue — Royal-Blue-Tinte in Party/FC, Bronze-Gold in Yell/
+            // Alliance. Channel-identity (Tell-Pink, NN-Lime) bleibt erhalten.
+            [HellionChat.Code.ChatType.Say]              = ColourUtil.HexToRgba("#FFFFFF"),
+            [HellionChat.Code.ChatType.Yell]             = ColourUtil.HexToRgba("#FFD060"),
+            [HellionChat.Code.ChatType.Shout]            = ColourUtil.HexToRgba("#FFA040"),
+            [HellionChat.Code.ChatType.TellIncoming]     = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.TellOutgoing]     = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.Party]            = ColourUtil.HexToRgba("#6AA8E8"),
+            [HellionChat.Code.ChatType.Alliance]         = ColourUtil.HexToRgba("#E8B070"),
+            [HellionChat.Code.ChatType.FreeCompany]      = ColourUtil.HexToRgba("#4FA8E8"),
+            [HellionChat.Code.ChatType.NoviceNetwork]    = ColourUtil.HexToRgba("#A8E060"),
+            [HellionChat.Code.ChatType.CrossParty]       = ColourUtil.HexToRgba("#6AA8E8"),
+            [HellionChat.Code.ChatType.Linkshell1]       = ColourUtil.HexToRgba("#A8E060"),
+            [HellionChat.Code.ChatType.Linkshell2]       = ColourUtil.HexToRgba("#E8B070"),
+            [HellionChat.Code.ChatType.Linkshell3]       = ColourUtil.HexToRgba("#FFD060"),
+            [HellionChat.Code.ChatType.Linkshell4]       = ColourUtil.HexToRgba("#80E8A8"),
+            [HellionChat.Code.ChatType.Linkshell5]       = ColourUtil.HexToRgba("#6AA8E8"),
+            [HellionChat.Code.ChatType.Linkshell6]       = ColourUtil.HexToRgba("#A8A0F0"),
+            [HellionChat.Code.ChatType.Linkshell7]       = ColourUtil.HexToRgba("#FF99CC"),
+            [HellionChat.Code.ChatType.Linkshell8]       = ColourUtil.HexToRgba("#E8B0F0"),
+            [HellionChat.Code.ChatType.CustomEmote]      = ColourUtil.HexToRgba("#E8B070"),
+            [HellionChat.Code.ChatType.StandardEmote]    = ColourUtil.HexToRgba("#E8B070"),
+            [HellionChat.Code.ChatType.Echo]             = ColourUtil.HexToRgba("#8CA0BF"),
+        })
+    );
+}

HellionChat/Themes/ThemeRegistry.cs

@@ -15,11 +15,15 @@ public sealed class ThemeRegistry
     {
         _builtIns = new Dictionary<string, Theme>(StringComparer.OrdinalIgnoreCase)
         {
-            { HellionArctic.Slug, HellionArctic.Build() },
+            { HellionArctic.Slug,     HellionArctic.Build() },
-            { Chat2Classic.Slug,  Chat2Classic.Build() },
+            { HellionSpectrum.Slug,   HellionSpectrum.Build() },
-            { EventHorizon.Slug,  EventHorizon.Build() },
+            { Chat2Classic.Slug,      Chat2Classic.Build() },
-            { MoonlitBloom.Slug,  MoonlitBloom.Build() },
+            { EventHorizon.Slug,      EventHorizon.Build() },
-            { MintGrove.Slug,     MintGrove.Build() },
+            { MoonlitBloom.Slug,      MoonlitBloom.Build() },
+            { NightBlue.Slug,         NightBlue.Build() },
+            { IndigoViolet.Slug,      IndigoViolet.Build() },
+            { ForgeMerchantman.Slug,  ForgeMerchantman.Build() },
+            { MintGrove.Slug,         MintGrove.Build() },
         };
         _active = _builtIns[DefaultSlug];
         _customThemesDir = customThemesDir;

HellionChat/Ui/ChatLogWindow.cs

@@ -106,6 +106,9 @@ public sealed class ChatLogWindow : Window
         IsOpen = true;
         RespectCloseHotkey = false;
         DisableWindowSounds = true;
+        // AllowBackgroundBlur wird nach AddWindow zentral in Plugin.Setup
+        // für alle registrierten Windows gesetzt — keine Per-Window-Logik
+        // hier nötig.
 
         PayloadHandler = new PayloadHandler(this);
         HandlerLender = new Lender<PayloadHandler>(() => new PayloadHandler(this));
@@ -496,6 +499,12 @@ public sealed class ChatLogWindow : Window
         if (!Plugin.Config.ShowTitleBar)
             Flags |= ImGuiWindowFlags.NoTitleBar;
 
+        // BgAlpha wird auf den Style-WindowBg-Alpha aus HellionStyle.PushGlobal
+        // multipliziert (HellionStyle pusht eine voll-deckende Theme-Color, der
+        // tatsächliche transparent-Effekt entsteht über BgAlpha). Wenn der User
+        // im Dalamud-Pinning-Menü (Hamburger oben rechts) eine eigene
+        // Window-Deckkraft eingestellt hat, hat dieses Per-Window-Override
+        // Vorrang über unseren Slider — wir dokumentieren das im HelpMarker.
         if (LastViewport == ImGuiHelpers.MainViewport.Handle && !WasDocked)
             BgAlpha = Plugin.Config.WindowOpacity;
 

HellionChat/Ui/HellionStyle.cs

@@ -52,7 +52,18 @@ internal static class HellionStyle
 
         var alphaByte = (uint)Math.Clamp((int)(windowOpacity * 255f), 0x55, 0xFF);
         var windowBgWithAlpha = (c.WindowBg & 0xFFFFFF00u) | alphaByte;
-        var childBgWithAlpha  = (c.ChildBg  & 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;
 
         // Layout
         stack.PushStyleVar(ImGuiStyleVar.WindowRounding,    l.WindowRounding);

HellionChat/Ui/Popout.cs

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

HellionChat/Ui/Settings.cs

@@ -44,13 +44,13 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
         Tabs =
         [
             new General(Plugin, Mutable),
-            new Appearance(Plugin, Mutable),
+            new ThemeAndLayout(Plugin, Mutable),
-            new SettingsTabs.Themes(Plugin, Mutable),
+            new FontsAndColours(Plugin, Mutable),
             new SettingsTabs.Window(Plugin, Mutable),
             new Chat(Plugin, Mutable),
             new SettingsTabs.Tabs(Plugin, Mutable),
             new SettingsTabs.Privacy(Plugin, Mutable),
-            new Database(Plugin, Mutable),
+            new DataManagement(Plugin, Mutable),
             new Information(Mutable),
         ];
 

HellionChat/Ui/SettingsOverview.cs

@@ -12,18 +12,21 @@ internal sealed class SettingsOverview
     private readonly SettingsWindow _window;
 
     // Card-Reihenfolge entspricht 1:1 dem Tabs-Index in SettingsWindow.
-    // Themes ist Card-Index 2, eingeschoben zwischen Appearance und Window.
+    // 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.SlidersH,        "Settings_Card_General_Title",         "Settings_Card_General_Subtext"),
-        (FontAwesomeIcon.Palette,         "Settings_Card_Appearance_Title",  "Settings_Card_Appearance_Subtext"),
+        (FontAwesomeIcon.Palette,         "Settings_Card_ThemeAndLayout_Title",  "Settings_Card_ThemeAndLayout_Subtext"),
-        (FontAwesomeIcon.Swatchbook,      "Settings_Card_Themes_Title",      "Settings_Card_Themes_Subtext"),
+        (FontAwesomeIcon.Font,            "Settings_Card_FontsAndColours_Title", "Settings_Card_FontsAndColours_Subtext"),
-        (FontAwesomeIcon.WindowMaximize,  "Settings_Card_Window_Title",      "Settings_Card_Window_Subtext"),
+        (FontAwesomeIcon.WindowMaximize,  "Settings_Card_Window_Title",          "Settings_Card_Window_Subtext"),
-        (FontAwesomeIcon.Comments,        "Settings_Card_Chat_Title",        "Settings_Card_Chat_Subtext"),
+        (FontAwesomeIcon.Comments,        "Settings_Card_Chat_Title",            "Settings_Card_Chat_Subtext"),
-        (FontAwesomeIcon.FolderTree,      "Settings_Card_Tabs_Title",        "Settings_Card_Tabs_Subtext"),
+        (FontAwesomeIcon.FolderTree,      "Settings_Card_Tabs_Title",            "Settings_Card_Tabs_Subtext"),
-        (FontAwesomeIcon.ShieldAlt,       "Settings_Card_Privacy_Title",     "Settings_Card_Privacy_Subtext"),
+        (FontAwesomeIcon.ShieldAlt,       "Settings_Card_Privacy_Title",         "Settings_Card_Privacy_Subtext"),
-        (FontAwesomeIcon.Database,        "Settings_Card_Database_Title",    "Settings_Card_Database_Subtext"),
+        (FontAwesomeIcon.Database,        "Settings_Card_DataManagement_Title",  "Settings_Card_DataManagement_Subtext"),
-        (FontAwesomeIcon.InfoCircle,      "Settings_Card_Information_Title", "Settings_Card_Information_Subtext"),
+        (FontAwesomeIcon.InfoCircle,      "Settings_Card_Information_Title",     "Settings_Card_Information_Subtext"),
     ];
 
     public SettingsOverview(SettingsWindow window)
@@ -36,7 +39,10 @@ internal sealed class SettingsOverview
         var avail = ImGui.GetContentRegionAvail();
         var columns = avail.X >= 700f ? 3 : 2;
         var cardWidth = (avail.X - (columns - 1) * 8f) / columns;
-        var cardHeight = 96f;
+        // v1.2.1 — Subtexte wrappen jetzt auf zwei Zeilen, daher 110f statt der
+        // v1.1.0-Höhe 96f. Wrap-Breite + Y-Position der Subtext-Zeile sind in
+        // DrawCard auf den Card-Innenrand abgestimmt.
+        var cardHeight = 110f;
 
         for (var i = 0; i < CardDefs.Length; i++)
         {
@@ -65,10 +71,9 @@ internal sealed class SettingsOverview
         var draw = ImGui.GetWindowDrawList();
         draw.AddRectFilled(cursorBefore, cursorBefore + new Vector2(w, h), bgColor, 4f);
 
-        // Inhalts-Overlay: Icon + Title + Subtext direkt mit DrawList in den
+        // Inhalts-Overlay: Icon + Title via DrawList (kein Wrap nötig). Subtext
-        // Card-Bereich zeichnen, statt Cursor-Hopping mit SetCursorScreenPos.
+        // läuft über ImGui-Cursor + PushTextWrapPos damit der Text bei
-        // DrawList-Overlays ändern den Cursor nicht, BeginGroup/EndGroup
+        // Card-Innenbreite umbricht statt rechts geclippt zu werden.
-        // hält den Layout-Anker stabil für SameLine.
         var iconPos = cursorBefore + new Vector2(16f, 12f);
         var titlePos = cursorBefore + new Vector2(16f, 40f);
         var subtextPos = cursorBefore + new Vector2(16f, 62f);
@@ -76,14 +81,19 @@ internal sealed class SettingsOverview
         var titleColor = ColourUtil.RgbaToAbgr(0xE6F4F1FFu);
         var subtextColor = ColourUtil.RgbaToAbgr(0x8FA3B5FFu);
 
-        // Icon via FontAwesome — temporär den Font pushen, mit DrawList zeichnen
         using (_window.Plugin.FontManager.FontAwesome.Push())
         {
             draw.AddText(iconPos, titleColor, icon.ToIconString());
         }
 
         draw.AddText(titlePos, titleColor, title);
-        draw.AddText(subtextPos, subtextColor, subtext);
+
+        // Subtext mit Wrap auf Card-Innenbreite (16 px Padding links + rechts).
+        // Cursor-basiertes TextUnformatted würde die ImGui-Group-Bounds
+        // erweitern und das SameLine-Wrapping in der Card-Reihe brechen, daher
+        // bleibt der Subtext bewusst beim DrawList-Overlay-Pattern.
+        var subtextWrapWidth = w - 32f;
+        draw.AddText(ImGui.GetFont(), ImGui.GetFontSize(), subtextPos, subtextColor, subtext, subtextWrapWidth);
 
         ImGui.EndGroup();
 

HellionChat/Ui/SettingsTabs/Chat.cs

@@ -89,6 +89,21 @@ internal sealed class Chat : ISettingsTab
 
             ImGui.Spacing();
             ImGuiUtil.WarningText(HellionStrings.ChatLog_AutoTellTabs_ConflictHint);
+
+            ImGui.Spacing();
+            ImGui.Separator();
+            ImGui.Spacing();
+
+            var preload = Mutable.AutoTellTabsHistoryPreload;
+            ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
+            if (ImGui.SliderInt(HellionStrings.Privacy_AutoTellTabs_Preload_Name, ref preload, 0, 100))
+            {
+                Mutable.AutoTellTabsHistoryPreload = preload;
+            }
+            ImGuiUtil.HelpMarker(HellionStrings.Privacy_AutoTellTabs_Preload_Description);
+
+            ImGui.Spacing();
+            ImGuiUtil.HelpText(HellionStrings.Privacy_AutoTellTabs_Preload_Hint);
         }
     }
 

HellionChat/Ui/SettingsTabs/DataManagement.cs

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

HellionChat/Ui/SettingsTabs/Database.cs

@@ -1,261 +0,0 @@
-using System.Diagnostics;
-using HellionChat.Code;
-using HellionChat.Resources;
-using HellionChat.Util;
-using Dalamud.Game.Text.SeStringHandling;
-using Dalamud.Game.Text.SeStringHandling.Payloads;
-using Dalamud.Interface.ImGuiNotification;
-using Dalamud.Interface.Utility.Raii;
-using Dalamud.Bindings.ImGui;
-using Dalamud.Game.Text;
-
-namespace HellionChat.Ui.SettingsTabs;
-
-internal sealed class Database : ISettingsTab
-{
-    private Plugin Plugin { get; }
-    private Configuration Mutable { get; }
-
-    public string Name => HellionStrings.Settings_Tab_Database + "###tabs-database";
-
-    internal Database(Plugin plugin, Configuration mutable)
-    {
-        Plugin = plugin;
-        Mutable = mutable;
-    }
-
-    private bool ShowAdvanced;
-
-    private long DatabaseLastRefreshTicks;
-    private long DatabaseSize;
-    private long DatabaseLogSize;
-    private int DatabaseMessageCount;
-
-    public void Draw(bool changed)
-    {
-        // Shift-on-open keeps the Advanced tools available without a permanent
-        // toggle in the UI, mirroring upstream Chat 2 behaviour.
-        if (changed)
-            ShowAdvanced = ImGui.GetIO().KeyShift;
-
-        DrawStorageSection();
-        ImGui.Spacing();
-        DrawViewerSection();
-        ImGui.Spacing();
-        DrawStatsSection();
-    }
-
-    private void DrawStorageSection()
-    {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Database_Storage_Heading);
-        if (!tree.Success)
-            return;
-
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            ImGui.Checkbox(Language.Options_DatabaseBattleMessages_Name, ref Mutable.DatabaseBattleMessages);
-            ImGuiUtil.HelpMarker(Language.Options_DatabaseBattleMessages_Description);
-
-            if (ImGui.Checkbox(Language.Options_LoadPreviousSession_Name, ref Mutable.LoadPreviousSession))
-                if (Mutable.LoadPreviousSession)
-                    Mutable.FilterIncludePreviousSessions = true;
-            ImGuiUtil.HelpMarker(Language.Options_LoadPreviousSession_Description);
-
-            if (ImGui.Checkbox(Language.Options_FilterIncludePreviousSessions_Name, ref Mutable.FilterIncludePreviousSessions))
-                if (!Mutable.FilterIncludePreviousSessions)
-                    Mutable.LoadPreviousSession = false;
-            ImGuiUtil.HelpMarker(Language.Options_FilterIncludePreviousSessions_Description);
-
-            var old = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat.db"));
-            var migratedOld = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat-litedb.db"));
-            if (old.Exists || migratedOld.Exists)
-            {
-                ImGui.Spacing();
-                ImGui.Separator();
-                ImGui.Spacing();
-
-                ImGui.TextUnformatted(Language.Options_Database_Old_Heading);
-                ImGui.Spacing();
-
-                if (ImGuiUtil.CtrlShiftButton(Language.Options_Database_Old_Delete, Language.Options_Database_Old_Delete_Tooltip))
-                {
-                    try
-                    {
-                        // Delete both legacy files in one click — the previous if/else
-                        // left the second file behind when both happened to exist.
-                        if (old.Exists)
-                            old.Delete();
-                        if (migratedOld.Exists)
-                            migratedOld.Delete();
-                        WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Success, NotificationType.Success);
-                    }
-                    catch (Exception e)
-                    {
-                        Plugin.Log.Error(e, "Unable to delete old database");
-                        WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Error, NotificationType.Error);
-                    }
-                }
-            }
-        }
-    }
-
-    private void DrawViewerSection()
-    {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Database_Viewer_Heading);
-        if (!tree.Success)
-            return;
-
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            // Refresh the database size and message count every 5 seconds to avoid
-            // constant stat calls and spamming the database.
-            if (DatabaseLastRefreshTicks + 5 * 1000 < Environment.TickCount64)
-            {
-                DatabaseSize = Plugin.MessageManager.Store.DatabaseSize();
-                DatabaseLogSize = Plugin.MessageManager.Store.DatabaseLogSize();
-                DatabaseMessageCount = Plugin.MessageManager.Store.MessageCount();
-                DatabaseLastRefreshTicks = Environment.TickCount64;
-            }
-
-            // Copy the directory path instead of the file path so people can
-            // paste it into their file explorer.
-            ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_Path, MessageManager.DatabasePath()));
-            if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
-            {
-                var path = Path.GetDirectoryName(MessageManager.DatabasePath());
-                ImGui.SetClipboardText(path);
-                WrapperUtil.AddNotification(Language.Options_Database_Metadata_CopyConfigPathNotification, NotificationType.Info);
-            }
-
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
-                ImGuiUtil.Tooltip(Language.Options_Database_Metadata_CopyConfigPath);
-            }
-
-            ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_Size, StringUtil.BytesToString(DatabaseSize)));
-            if (ImGui.IsItemHovered())
-                ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseSize));
-
-            ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_LogSize, StringUtil.BytesToString(DatabaseLogSize)));
-            if (ImGui.IsItemHovered())
-                ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseLogSize));
-
-            ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_MessageCount, DatabaseMessageCount));
-
-            if (ImGuiUtil.CtrlShiftButton(Language.Options_ClearDatabase_Button, Language.Options_ClearDatabase_Tooltip))
-            {
-                Plugin.Log.Warning("Clearing messages from database");
-                Plugin.MessageManager.Store.ClearMessages();
-                Plugin.MessageManager.ClearAllTabs();
-
-                // Refresh on next draw
-                DatabaseLastRefreshTicks = 0;
-                WrapperUtil.AddNotification(Language.Options_ClearDatabase_Success, NotificationType.Info);
-            }
-        }
-    }
-
-    private void DrawStatsSection()
-    {
-        if (!ShowAdvanced)
-            return;
-
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Database_Stats_Heading);
-        if (!tree.Success)
-            return;
-
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            using var wrap = ImRaii.TextWrapPos(0.0f);
-
-            ImGuiUtil.WarningText(Language.Options_Database_Advanced_Warning);
-            if (ImGuiUtil.CtrlShiftButton("Perform maintenance", "Ctrl+Shift: MessageManager.Store.PerformMaintenance()"))
-                Plugin.MessageManager.Store.PerformMaintenance();
-
-            if (ImGuiUtil.CtrlShiftButton("Reload messages from database", "Ctrl+Shift: MessageManager.FilterAllTabs()"))
-            {
-                Plugin.MessageManager.ClearAllTabs();
-                Plugin.MessageManager.FilterAllTabsAsync();
-            }
-
-            if (ImGuiUtil.CtrlShiftButton("Inject 10,000 messages", "Ctrl+Shift: creates 10,000 unique messages (async)"))
-                new Thread(() => InsertMessages(10_000)).Start();
-        }
-    }
-
-    private void InsertMessages(int count)
-    {
-        Plugin.Log.Info($"Inserting {count} messages due to user request");
-
-        // Generate
-        var stopwatch = Stopwatch.StartNew();
-        var playerName = Plugin.PlayerState.CharacterName;
-        var worldId = Plugin.PlayerState.HomeWorld.ValueNullable?.RowId ?? 0;
-        var senderSource = new SeStringBuilder()
-            .AddText("<")
-            .Add(new PlayerPayload(playerName, worldId))
-            .AddText("Random Message")
-            .Add(RawPayload.LinkTerminator)
-            .AddText(">: ")
-            .Build();
-        var senderChunks = ChunkUtil.ToChunks(senderSource, ChunkSource.Sender, ChatType.Debug).ToList();
-        var messages = new List<Message>(count);
-        for (var i = 0; i < count; i++)
-        {
-            var contentSource = new SeStringBuilder()
-                .AddText("Random message payload - ")
-                .AddItalics(Guid.NewGuid().ToString())
-                .Build();
-            var contentChunks = ChunkUtil.ToChunks(contentSource, ChunkSource.Content, ChatType.Debug).ToList();
-
-            var chatCode = new ChatCode(XivChatType.Say, 0, 0);
-            messages.Add(new Message(
-                Guid.NewGuid(),
-                Plugin.MessageManager.CurrentContentId,
-                Plugin.MessageManager.CurrentContentId,
-                DateTimeOffset.UtcNow,
-                chatCode,
-                senderChunks,
-                contentChunks,
-                senderSource,
-                contentSource,
-                Guid.Empty
-            ));
-        }
-
-        var elapsedTicks = stopwatch.ElapsedTicks;
-        stopwatch.Stop();
-        Plugin.Log.Info($"Crafted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)");
-
-        // Insert
-        stopwatch = Stopwatch.StartNew();
-        foreach (var message in messages)
-            Plugin.MessageManager.Store.UpsertMessage(message);
-
-        elapsedTicks = stopwatch.ElapsedTicks;
-        stopwatch.Stop();
-        Plugin.Log.Info($"Upserted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)");
-
-        // Clear tabs during framework frame
-        Plugin.Framework.Run(() =>
-        {
-            stopwatch = Stopwatch.StartNew();
-            Plugin.MessageManager.ClearAllTabs();
-            elapsedTicks = stopwatch.ElapsedTicks;
-            stopwatch.Stop();
-            Plugin.Log.Info($"Cleared {Plugin.Config.Tabs.Count} tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)");
-        }).Wait();
-
-        // Fetch and filter during framework frame
-        Plugin.Framework.Run(() =>
-        {
-            stopwatch = Stopwatch.StartNew();
-            // Intentionally synchronous
-            Plugin.MessageManager.FilterAllTabs();
-            elapsedTicks = stopwatch.ElapsedTicks;
-            stopwatch.Stop();
-            Plugin.Log.Info($"Fetched and filtered all tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)");
-        }).Wait();
-    }
-}

HellionChat/Ui/SettingsTabs/FontsAndColours.cs

@@ -4,21 +4,20 @@ using HellionChat.Util;
 using Dalamud;
 using Dalamud.Interface;
 using Dalamud.Interface.FontIdentifier;
-using Dalamud.Interface.Style;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Bindings.ImGui;
 
 namespace HellionChat.Ui.SettingsTabs;
 
-internal sealed class Appearance : ISettingsTab
+internal sealed class FontsAndColours : ISettingsTab
 {
     private Plugin Plugin { get; }
     private Configuration Mutable { get; }
 
-    public string Name => HellionStrings.Settings_Tab_Appearance + "###tabs-appearance";
+    public string Name => HellionStrings.Settings_Card_FontsAndColours_Title + "###tabs-fontsandcolours";
 
-    internal Appearance(Plugin plugin, Configuration mutable)
+    internal FontsAndColours(Plugin plugin, Configuration mutable)
     {
         Plugin = plugin;
         Mutable = mutable;
@@ -26,94 +25,27 @@ internal sealed class Appearance : ISettingsTab
 
     public void Draw(bool changed)
     {
-        DrawThemeSection();
-        ImGui.Spacing();
         DrawFontsSection();
         ImGui.Spacing();
         DrawColoursSection();
-        ImGui.Spacing();
-        DrawTimestampsSection();
-    }
-
-    private void DrawThemeSection()
-    {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Appearance_Theme_Heading);
-        if (!tree.Success)
-        {
-            return;
-        }
-
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            // v1.2.0 — Legacy HellionThemeEnabled/HellionThemeWindowOpacity-Bindings
-            // entfernt. Theme-Auswahl + globale Window-Opacity leben jetzt in
-            // Settings → Themes (eingeführt mit v1.1.0). Hier verbleibt nur der
-            // klassische OverrideStyle-Toggle plus der Bestand-WindowAlpha-Slider
-            // für das Chat-Log-Fenster.
-            ImGui.Checkbox(Language.Options_OverrideStyle_Name, ref Mutable.OverrideStyle);
-            ImGuiUtil.HelpMarker(Language.Options_OverrideStyle_Name_Desc);
-
-            if (Mutable.OverrideStyle)
-            {
-                DrawStyleCombo();
-            }
-
-            ImGuiUtil.DragFloatVertical(Language.Options_WindowOpacity_Name, ref Mutable.WindowAlpha, .25f, 0f, 100f, $"{Mutable.WindowAlpha:N2}%%", ImGuiSliderFlags.AlwaysClamp);
-        }
-    }
-
-    private void DrawStyleCombo()
-    {
-        var styles = StyleModel.GetConfiguredStyles();
-        if (styles == null)
-        {
-            ImGui.TextUnformatted(Language.Options_OverrideStyle_NotAvailable);
-            return;
-        }
-
-        var currentStyle = Mutable.ChosenStyle ?? Language.Options_OverrideStyle_NotSelected;
-        using var combo = ImRaii.Combo(Language.Options_OverrideStyleDropdown_Name, currentStyle);
-        if (!combo)
-        {
-            return;
-        }
-
-        foreach (var style in styles)
-        {
-            if (ImGui.Selectable(style.Name, Mutable.ChosenStyle == style.Name))
-            {
-                Mutable.ChosenStyle = style.Name;
-            }
-        }
     }
 
     private void DrawFontsSection()
     {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Appearance_Fonts_Heading);
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_FontsAndColours_Fonts_Heading);
         if (!tree.Success)
-        {
             return;
-        }
 
         using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
         {
             if (ImGui.Checkbox(HellionStrings.Theme_UseHellionFont_Name, ref Mutable.UseHellionFont))
             {
-                // Mutex with the Bestand custom-font stack. Leaving FontsEnabled
-                // checked alongside UseHellionFont made both checkboxes look
-                // active even though the lower stack was greyed out, which
-                // confused the user during the v0.5.0 walkthrough.
                 if (Mutable.UseHellionFont)
                     Mutable.FontsEnabled = false;
             }
             ImGuiUtil.HelpMarker(HellionStrings.Theme_UseHellionFont_Description);
             ImGui.Spacing();
 
-            // v1.2.0 — Schriftgröße muss auch bei aktiver Hellion-Schrift
-            // editierbar sein (Exo 2 ist Variable-Font, FontSizeV2 wird in
-            // FontManager als SizePt angewendet). Disabled-Wrap nur noch
-            // um den Bestand-Custom-Font-Stack (FontsEnabled-Toggle und
-            // die Font-Chooser) — der ist weiter exclusive zu HellionFont.
             if (Mutable.UseHellionFont)
             {
                 ImGuiUtil.FontSizeCombo(Language.Options_FontSize_Name, ref Mutable.FontSizeV2);
@@ -154,7 +86,6 @@ internal sealed class Appearance : ISettingsTab
                 ImGuiUtil.WarningText(Language.Options_Font_Warning);
                 ImGui.Spacing();
 
-                // LocaleNames being null means it is likely a game font which all support JP symbols.
                 var japaneseChooser = ImGuiUtil.FontChooser(Language.Options_JapaneseFont_Name, Mutable.JapaneseFontV2, false, ref unused, id => !id.LocaleNames?.ContainsKey("ja-jp") ?? false, "いろはにほへと   ちりぬるを");
                 japaneseChooser?.ResultTask.ContinueWith(r =>
                 {
@@ -215,11 +146,9 @@ internal sealed class Appearance : ISettingsTab
 
     private void DrawColoursSection()
     {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Appearance_Colours_Heading);
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_FontsAndColours_Colours_Heading);
         if (!tree.Success)
-        {
             return;
-        }
 
         using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
         {
@@ -266,9 +195,6 @@ internal sealed class Appearance : ISettingsTab
         }
     }
 
-    // Hellion Chat — v0.6.0 preset-buttons row above the per-channel colour
-    // editors. Apply is immediate and overwrites every channel covered by
-    // the preset; channels not in the preset keep their current colour.
     private void DrawColourPresetButtons()
     {
         var first = true;
@@ -282,7 +208,6 @@ internal sealed class Appearance : ISettingsTab
 
             if (preset.IsBrandPreset)
             {
-                // Hellion-Brand visuell hervorheben — blau-violetter Frame-Akzent
                 var border = ColourUtil.RgbaToVector3(ColourUtil.ComponentsToRgba(255, 128, 200));
                 var btn = ColourUtil.RgbaToVector3(ColourUtil.ComponentsToRgba(74, 42, 106));
                 ImGui.PushStyleColor(ImGuiCol.Border, new System.Numerics.Vector4(border.X, border.Y, border.Z, 1f));
@@ -303,9 +228,6 @@ internal sealed class Appearance : ISettingsTab
         }
     }
 
-    // Localized label for a preset; falls back to DisplayName if the i18n
-    // key is missing (defensive — the resource manager returns the key
-    // string itself when a lookup fails).
     private static string GetPresetLabel(ChatColourPreset preset)
     {
         var localized = HellionStrings.ResourceManager.GetString(preset.LocalizationKey, HellionStrings.Culture);
@@ -322,36 +244,4 @@ internal sealed class Appearance : ISettingsTab
         GlobalParametersCache.Refresh();
         Plugin.Log.Debug($"Applied chat colour preset: {preset.DisplayName}");
     }
-
-    private void DrawTimestampsSection()
-    {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Appearance_Timestamps_Heading);
-        if (!tree.Success)
-        {
-            return;
-        }
-
-        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
-        {
-            ImGui.Checkbox(Language.Options_PrettierTimestamps_Name, ref Mutable.PrettierTimestamps);
-            ImGuiUtil.HelpMarker(Language.Options_PrettierTimestamps_Description);
-
-            if (Mutable.PrettierTimestamps)
-            {
-                ImGui.Checkbox(Language.Options_MoreCompactPretty_Name, ref Mutable.MoreCompactPretty);
-                ImGuiUtil.HelpMarker(Language.Options_MoreCompactPretty_Description);
-
-                // v1.2.0 — Card-Rows als Default. Compact-Density schaltet auf den
-                // klassischen Single-Line-Mode `[HH:mm] Sender: Text` zurück.
-                ImGui.Checkbox(HellionStrings.Appearance_UseCompactDensity_Name, ref Mutable.UseCompactDensity);
-                ImGuiUtil.HelpMarker(HellionStrings.Appearance_UseCompactDensity_Description);
-
-                ImGui.Checkbox(Language.Options_HideSameTimestamps_Name, ref Mutable.HideSameTimestamps);
-                ImGuiUtil.HelpMarker(Language.Options_HideSameTimestamps_Description);
-            }
-
-            ImGui.Checkbox(Language.Options_Use24HourClock_Name, ref Mutable.Use24HourClock);
-            ImGuiUtil.HelpMarker(Language.Options_Use24HourClock_Description);
-        }
-    }
 }

HellionChat/Ui/SettingsTabs/General.cs

@@ -51,6 +51,28 @@ internal sealed class General : ISettingsTab
             ImGui.TextUnformatted(Language.Options_ChatTabBackwardKeybind_Name);
             ImGui.SetNextItemWidth(-1);
             ImGuiUtil.KeybindInput("ChatTabBackwardKeybind", ref Mutable.ChatTabBackward);
+
+            ImGui.Spacing();
+
+            using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_KeybindMode_Name, Mutable.KeybindMode.Name()))
+            {
+                if (combo.Success)
+                {
+                    foreach (var mode in Enum.GetValues<KeybindMode>())
+                    {
+                        if (ImGui.Selectable(mode.Name(), Mutable.KeybindMode == mode))
+                        {
+                            Mutable.KeybindMode = mode;
+                        }
+
+                        if (ImGui.IsItemHovered())
+                        {
+                            ImGuiUtil.Tooltip(mode.Tooltip() ?? "");
+                        }
+                    }
+                }
+            }
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_KeybindMode_Description, Plugin.PluginName));
         }
     }
 
@@ -133,27 +155,6 @@ internal sealed class General : ISettingsTab
             ImGuiUtil.HelpMarker(string.Format(Language.Options_CommandHelpSide_Description, Plugin.PluginName));
             ImGui.Spacing();
 
-            using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_KeybindMode_Name, Mutable.KeybindMode.Name()))
-            {
-                if (combo.Success)
-                {
-                    foreach (var mode in Enum.GetValues<KeybindMode>())
-                    {
-                        if (ImGui.Selectable(mode.Name(), Mutable.KeybindMode == mode))
-                        {
-                            Mutable.KeybindMode = mode;
-                        }
-
-                        if (ImGui.IsItemHovered())
-                        {
-                            ImGuiUtil.Tooltip(mode.Tooltip() ?? "");
-                        }
-                    }
-                }
-            }
-            ImGuiUtil.HelpMarker(string.Format(Language.Options_KeybindMode_Description, Plugin.PluginName));
-            ImGui.Spacing();
-
             ImGui.Checkbox(Language.Options_SortAutoTranslate_Name, ref Mutable.SortAutoTranslate);
             ImGuiUtil.HelpMarker(Language.Options_SortAutoTranslate_Description);
         }

HellionChat/Ui/SettingsTabs/Privacy.cs

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

HellionChat/Ui/SettingsTabs/ThemeAndLayout.cs

@@ -0,0 +1,286 @@
+using System.Numerics;
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface.Utility.Raii;
+using HellionChat.Resources;
+using HellionChat.Themes;
+using HellionChat.Util;
+
+namespace HellionChat.Ui.SettingsTabs;
+
+internal sealed class ThemeAndLayout : ISettingsTab
+{
+    private Plugin Plugin { get; }
+    private Configuration Mutable { get; }
+
+    private string? _applyDismissedFor;
+
+    public string Name => HellionStrings.Settings_Card_ThemeAndLayout_Title + "###tabs-themeandlayout";
+
+    internal ThemeAndLayout(Plugin plugin, Configuration mutable)
+    {
+        Plugin = plugin;
+        Mutable = mutable;
+    }
+
+    public void Draw(bool changed)
+    {
+        DrawThemeSection();
+        ImGui.Spacing();
+        DrawWindowStyleSection();
+        ImGui.Spacing();
+        DrawTimestampStyleSection();
+    }
+
+    private void DrawThemeSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_ThemeAndLayout_Theme_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            var registry = Plugin.ThemeRegistry;
+            var active = registry.Get(Mutable.Theme);
+
+            var activeLabelTemplate = HellionStrings.ResourceManager.GetString("Settings_Themes_Active") ?? "Active: {0}";
+            ImGui.TextUnformatted(string.Format(activeLabelTemplate, active.Name));
+            using (ImRaii.PushColor(ImGuiCol.Text, 0xFF8FA3B5u))
+                ImGui.TextUnformatted(active.Author);
+
+            DrawChatColorsApplyBanner(active);
+
+            ImGui.Spacing();
+            ImGui.Separator();
+            ImGui.Spacing();
+
+            var builtInsLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_BuiltIns") ?? "Built-in themes";
+            ImGui.TextUnformatted(builtInsLabel);
+            ImGui.Spacing();
+            DrawThemeGrid(registry.AllBuiltIns(), active.Slug);
+
+            var customs = registry.AllCustom().ToList();
+            if (customs.Count > 0)
+            {
+                ImGui.Spacing();
+                ImGui.Separator();
+                ImGui.Spacing();
+                var customLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_Custom") ?? "Custom themes";
+                ImGui.TextUnformatted(customLabel);
+                ImGui.Spacing();
+                DrawThemeGrid(customs, active.Slug);
+            }
+
+            ImGui.Spacing();
+            ImGui.Separator();
+            ImGui.Spacing();
+
+            var openFolderLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_OpenFolder") ?? "Open themes folder";
+            if (ImGui.Button(openFolderLabel))
+            {
+                var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
+                Directory.CreateDirectory(dir);
+                Dalamud.Utility.Util.OpenLink(dir);
+            }
+
+            ImGui.SameLine();
+            var exportLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ExportActive") ?? "Export active...";
+            if (ImGui.Button(exportLabel))
+            {
+                var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
+                Directory.CreateDirectory(dir);
+                var fileName = $"{active.Slug}.export.json";
+                var path = Path.Combine(dir, fileName);
+                var json = ThemeJsonWriter.Serialize(active);
+                File.WriteAllText(path, json);
+                Plugin.Log.Information($"Exported active theme '{active.Slug}' to {path}");
+            }
+        }
+    }
+
+    private void DrawThemeGrid(IEnumerable<Theme> themes, string activeSlug)
+    {
+        var avail = ImGui.GetContentRegionAvail();
+        var columns = avail.X >= 700f ? 3 : 2;
+        var cardWidth = (avail.X - (columns - 1) * 8f) / columns;
+        var cardHeight = 140f;
+
+        var list = themes.ToList();
+        for (var i = 0; i < list.Count; i++)
+        {
+            DrawThemeCard(list[i], activeSlug, cardWidth, cardHeight);
+
+            if ((i + 1) % columns != 0 && i != list.Count - 1)
+                ImGui.SameLine();
+        }
+    }
+
+    private void DrawThemeCard(Theme theme, string activeSlug, float w, float h)
+    {
+        ImGui.BeginGroup();
+
+        var isActive = string.Equals(theme.Slug, activeSlug, StringComparison.OrdinalIgnoreCase);
+        var cursorBefore = ImGui.GetCursorScreenPos();
+        var clicked = ImGui.InvisibleButton($"##theme-card-{theme.Slug}", new Vector2(w, h));
+        var hovered = ImGui.IsItemHovered();
+
+        var draw = ImGui.GetWindowDrawList();
+        var bg = ColourUtil.RgbaToAbgr(theme.Colors.WindowBg | 0xFFu);
+        draw.AddRectFilled(cursorBefore, cursorBefore + new Vector2(w, h), bg, 4f);
+
+        if (isActive)
+        {
+            var border = ColourUtil.RgbaToAbgr(theme.Colors.Primary);
+            draw.AddRect(cursorBefore, cursorBefore + new Vector2(w, h), border, 4f, ImDrawFlags.None, 2f);
+        }
+        else if (hovered)
+        {
+            var border = ColourUtil.RgbaToAbgr(theme.Colors.PrimaryLight & 0xFFFFFF99u);
+            draw.AddRect(cursorBefore, cursorBefore + new Vector2(w, h), border, 4f, ImDrawFlags.None, 1f);
+        }
+
+        var mockupOrigin = cursorBefore + new Vector2(12f, 12f);
+        var mockupSize = new Vector2(w - 24f, 60f);
+        ThemeMockup.Draw(mockupOrigin, mockupSize, theme);
+
+        var textColor = ColourUtil.RgbaToAbgr(theme.Colors.TextPrimary);
+        var mutedColor = ColourUtil.RgbaToAbgr(theme.Colors.TextMuted);
+        draw.AddText(cursorBefore + new Vector2(12f, 80f), textColor, theme.Name);
+        draw.AddText(cursorBefore + new Vector2(12f, 100f), mutedColor, theme.Author);
+
+        ImGui.EndGroup();
+
+        if (clicked)
+        {
+            Mutable.Theme = theme.Slug;
+            Plugin.ThemeRegistry.Switch(theme.Slug);
+            _applyDismissedFor = null;
+        }
+    }
+
+    private void DrawChatColorsApplyBanner(Theme active)
+    {
+        if (active.ChatColors is not { Channels.Count: > 0 } themeChatColors)
+            return;
+
+        if (_applyDismissedFor == active.Slug)
+            return;
+
+        var alreadyMatching = themeChatColors.Channels.All(kvp =>
+            Mutable.ChatColours.TryGetValue(kvp.Key, out var current) && current == kvp.Value);
+        if (alreadyMatching)
+            return;
+
+        ImGui.Spacing();
+
+        var border = ColourUtil.RgbaToAbgr(active.Colors.Primary);
+        var bgFill = ColourUtil.RgbaToAbgr((active.Colors.Surface & 0xFFFFFF00u) | 0xCCu);
+        var origin = ImGui.GetCursorScreenPos();
+        var width = ImGui.GetContentRegionAvail().X;
+        var height = 64f;
+        var draw = ImGui.GetWindowDrawList();
+        draw.AddRectFilled(origin, origin + new Vector2(width, height), bgFill, 4f);
+        draw.AddRect(origin, origin + new Vector2(width, height), border, 4f, ImDrawFlags.None, 1f);
+
+        var hint = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Hint")
+                   ?? "This theme suggests its own chat channel colours.";
+        var applyLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Apply")
+                         ?? "Apply";
+        var keepLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Keep")
+                        ?? "Keep current";
+
+        var textColor = ColourUtil.RgbaToAbgr(active.Colors.TextPrimary);
+        draw.AddText(origin + new Vector2(12f, 10f), textColor, hint);
+
+        using (ImRaii.PushColor(ImGuiCol.Button, active.Colors.Primary))
+        using (ImRaii.PushColor(ImGuiCol.ButtonHovered, active.Colors.PrimaryLight))
+        using (ImRaii.PushColor(ImGuiCol.ButtonActive, active.Colors.PrimaryDark))
+        {
+            ImGui.SetCursorScreenPos(origin + new Vector2(12f, 32f));
+            if (ImGui.Button(applyLabel))
+            {
+                foreach (var kvp in themeChatColors.Channels)
+                    Mutable.ChatColours[kvp.Key] = kvp.Value;
+                _applyDismissedFor = active.Slug;
+            }
+        }
+
+        ImGui.SameLine();
+        if (ImGui.Button(keepLabel))
+        {
+            _applyDismissedFor = active.Slug;
+        }
+
+        ImGui.SetCursorScreenPos(origin + new Vector2(0f, height + 8f));
+
+        ImGui.Spacing();
+    }
+
+    private void DrawWindowStyleSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_ThemeAndLayout_WindowStyle_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_ShowTitleBar_Name, ref Mutable.ShowTitleBar);
+
+            ImGui.Checkbox(Language.Options_ShowPopOutTitleBar_Name, ref Mutable.ShowPopOutTitleBar);
+
+            ImGui.Checkbox(Language.Options_ShowHideButton_Name, ref Mutable.ShowHideButton);
+            ImGuiUtil.HelpMarker(Language.Options_ShowHideButton_Description);
+
+            ImGui.Checkbox(Language.Options_SidebarTabView_Name, ref Mutable.SidebarTabView);
+            ImGuiUtil.HelpMarker(string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName));
+
+            ImGui.Spacing();
+            ImGui.Separator();
+            ImGui.Spacing();
+
+            // Slider 50–100 % UX-Range; intern 0.5–1.0 als WindowOpacity-Float.
+            // Untere Schwelle 50 % verhindert versehentliches Komplett-Wegblenden
+            // des Chat-Hintergrunds (war v1.2.0 Bug bei WindowAlpha=0).
+            var opacityPercent = Mutable.WindowOpacity * 100f;
+            if (ImGuiUtil.DragFloatVertical(
+                    HellionStrings.Settings_ThemeAndLayout_WindowOpacity_Name,
+                    ref opacityPercent,
+                    .25f,
+                    50f,
+                    100f,
+                    $"{opacityPercent:N0}%%",
+                    ImGuiSliderFlags.AlwaysClamp))
+            {
+                Mutable.WindowOpacity = opacityPercent / 100f;
+            }
+            ImGuiUtil.HelpMarker(HellionStrings.Settings_ThemeAndLayout_WindowOpacity_Description);
+        }
+    }
+
+    private void DrawTimestampStyleSection()
+    {
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_ThemeAndLayout_TimestampStyle_Heading);
+        if (!tree.Success)
+            return;
+
+        using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
+        {
+            ImGui.Checkbox(Language.Options_PrettierTimestamps_Name, ref Mutable.PrettierTimestamps);
+            ImGuiUtil.HelpMarker(Language.Options_PrettierTimestamps_Description);
+
+            if (Mutable.PrettierTimestamps)
+            {
+                ImGui.Checkbox(Language.Options_MoreCompactPretty_Name, ref Mutable.MoreCompactPretty);
+                ImGuiUtil.HelpMarker(Language.Options_MoreCompactPretty_Description);
+
+                ImGui.Checkbox(HellionStrings.Appearance_UseCompactDensity_Name, ref Mutable.UseCompactDensity);
+                ImGuiUtil.HelpMarker(HellionStrings.Appearance_UseCompactDensity_Description);
+
+                ImGui.Checkbox(Language.Options_HideSameTimestamps_Name, ref Mutable.HideSameTimestamps);
+                ImGuiUtil.HelpMarker(Language.Options_HideSameTimestamps_Description);
+            }
+
+            ImGui.Checkbox(Language.Options_Use24HourClock_Name, ref Mutable.Use24HourClock);
+            ImGuiUtil.HelpMarker(Language.Options_Use24HourClock_Description);
+        }
+    }
+}

HellionChat/Ui/SettingsTabs/Themes.cs

@@ -1,223 +0,0 @@
-using System.Numerics;
-using Dalamud.Bindings.ImGui;
-using Dalamud.Interface.Utility.Raii;
-using HellionChat.Resources;
-using HellionChat.Themes;
-using HellionChat.Util;
-
-namespace HellionChat.Ui.SettingsTabs;
-
-internal sealed class Themes : ISettingsTab
-{
-    private readonly Plugin Plugin;
-    private readonly Configuration Mutable;
-
-    // Tracks ob der User die Apply-Frage für das aktive Theme bereits
-    // beantwortet hat. Banner wird nur angezeigt wenn das Theme ein
-    // ChatColors-Set hat UND noch keine Antwort vorliegt UND die aktuellen
-    // Mutable.ChatColours davon abweichen.
-    private string? _applyDismissedFor;
-
-    public string Name => HellionStrings.ResourceManager.GetString("Settings_Tab_Themes") ?? "Themes" + "###tabs-themes";
-
-    internal Themes(Plugin plugin, Configuration mutable)
-    {
-        Plugin = plugin;
-        Mutable = mutable;
-    }
-
-    public void Draw(bool changed)
-    {
-        var registry = Plugin.ThemeRegistry;
-        var active = registry.Get(Mutable.Theme);
-
-        var activeLabelTemplate = HellionStrings.ResourceManager.GetString("Settings_Themes_Active") ?? "Active: {0}";
-        ImGui.TextUnformatted(string.Format(activeLabelTemplate, active.Name));
-        using (ImRaii.PushColor(ImGuiCol.Text, 0xFF8FA3B5u))
-            ImGui.TextUnformatted(active.Author);
-
-        DrawChatColorsApplyBanner(active);
-
-        ImGui.Spacing();
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        var builtInsLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_BuiltIns") ?? "Built-in themes";
-        ImGui.TextUnformatted(builtInsLabel);
-        ImGui.Spacing();
-        DrawThemeGrid(registry.AllBuiltIns(), active.Slug);
-
-        var customs = registry.AllCustom().ToList();
-        if (customs.Count > 0)
-        {
-            ImGui.Spacing();
-            ImGui.Separator();
-            ImGui.Spacing();
-            var customLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_Custom") ?? "Custom themes";
-            ImGui.TextUnformatted(customLabel);
-            ImGui.Spacing();
-            DrawThemeGrid(customs, active.Slug);
-        }
-
-        ImGui.Spacing();
-        ImGui.Separator();
-        ImGui.Spacing();
-
-        var openFolderLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_OpenFolder") ?? "Open themes folder";
-        if (ImGui.Button(openFolderLabel))
-        {
-            var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
-            Directory.CreateDirectory(dir);
-            Dalamud.Utility.Util.OpenLink(dir);
-        }
-
-        ImGui.SameLine();
-        var exportLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ExportActive") ?? "Export active...";
-        if (ImGui.Button(exportLabel))
-        {
-            var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
-            Directory.CreateDirectory(dir);
-            var fileName = $"{active.Slug}.export.json";
-            var path = Path.Combine(dir, fileName);
-            var json = ThemeJsonWriter.Serialize(active);
-            File.WriteAllText(path, json);
-            Plugin.Log.Information($"Exported active theme '{active.Slug}' to {path}");
-        }
-    }
-
-    private void DrawThemeGrid(IEnumerable<Theme> themes, string activeSlug)
-    {
-        var avail = ImGui.GetContentRegionAvail();
-        var columns = avail.X >= 700f ? 3 : 2;
-        var cardWidth = (avail.X - (columns - 1) * 8f) / columns;
-        var cardHeight = 140f;  // Mockup + Name + Author brauchen den Platz
-
-        var list = themes.ToList();
-        for (var i = 0; i < list.Count; i++)
-        {
-            DrawThemeCard(list[i], activeSlug, cardWidth, cardHeight);
-
-            // SameLine zwischen den Cards einer Reihe; am Spalten-Ende kein
-            // SameLine, dann beginnt automatisch eine neue Zeile.
-            if ((i + 1) % columns != 0 && i != list.Count - 1)
-                ImGui.SameLine();
-        }
-    }
-
-    private void DrawThemeCard(Theme theme, string activeSlug, float w, float h)
-    {
-        // BeginGroup macht den Card-Bereich zu einem einzelnen ImGui-Layout-Item.
-        // Damit funktioniert SameLine() im Caller-Loop — sonst tracked ImGui die
-        // einzelnen InvisibleButton-Items separat und das Wrapping bricht.
-        ImGui.BeginGroup();
-
-        var isActive = string.Equals(theme.Slug, activeSlug, StringComparison.OrdinalIgnoreCase);
-        var cursorBefore = ImGui.GetCursorScreenPos();
-        var clicked = ImGui.InvisibleButton($"##theme-card-{theme.Slug}", new Vector2(w, h));
-        var hovered = ImGui.IsItemHovered();
-
-        var draw = ImGui.GetWindowDrawList();
-        var bg = ColourUtil.RgbaToAbgr(theme.Colors.WindowBg | 0xFFu);
-        draw.AddRectFilled(cursorBefore, cursorBefore + new Vector2(w, h), bg, 4f);
-
-        if (isActive)
-        {
-            var border = ColourUtil.RgbaToAbgr(theme.Colors.Primary);
-            draw.AddRect(cursorBefore, cursorBefore + new Vector2(w, h), border, 4f, ImDrawFlags.None, 2f);
-        }
-        else if (hovered)
-        {
-            var border = ColourUtil.RgbaToAbgr(theme.Colors.PrimaryLight & 0xFFFFFF99u);
-            draw.AddRect(cursorBefore, cursorBefore + new Vector2(w, h), border, 4f, ImDrawFlags.None, 1f);
-        }
-
-        // Mini-Mockup oben — DrawList-Operation, kein Cursor-Hopping
-        var mockupOrigin = cursorBefore + new Vector2(12f, 12f);
-        var mockupSize = new Vector2(w - 24f, 60f);
-        ThemeMockup.Draw(mockupOrigin, mockupSize, theme);
-
-        // Name + Author direkt via DrawList (statt SetCursorScreenPos +
-        // TextUnformatted), damit der ImGui-Layout-Cursor stabil bleibt
-        // und die BeginGroup/EndGroup-Klammer den Card-Bereich als ein
-        // Layout-Item führt.
-        var textColor = ColourUtil.RgbaToAbgr(theme.Colors.TextPrimary);
-        var mutedColor = ColourUtil.RgbaToAbgr(theme.Colors.TextMuted);
-        draw.AddText(cursorBefore + new Vector2(12f, 80f), textColor, theme.Name);
-        draw.AddText(cursorBefore + new Vector2(12f, 100f), mutedColor, theme.Author);
-
-        ImGui.EndGroup();
-
-        if (clicked)
-        {
-            Mutable.Theme = theme.Slug;
-            Plugin.ThemeRegistry.Switch(theme.Slug);
-            _applyDismissedFor = null;  // Banner für neues Theme wieder zeigen
-        }
-    }
-
-    private void DrawChatColorsApplyBanner(Theme active)
-    {
-        // Klassik hat per Design keine ChatColors — kein Banner.
-        if (active.ChatColors is not { Channels.Count: > 0 } themeChatColors)
-            return;
-
-        // User hat die Frage bereits für genau dieses Theme beantwortet.
-        if (_applyDismissedFor == active.Slug)
-            return;
-
-        // Wenn die aktuellen Channel-Colors bereits exakt mit dem Theme-Vorschlag
-        // übereinstimmen, gibt's nichts zu tun.
-        var alreadyMatching = themeChatColors.Channels.All(kvp =>
-            Mutable.ChatColours.TryGetValue(kvp.Key, out var current) && current == kvp.Value);
-        if (alreadyMatching)
-            return;
-
-        ImGui.Spacing();
-
-        // Dezent-Akzent-Banner mit Border in Theme-Primary
-        var border = ColourUtil.RgbaToAbgr(active.Colors.Primary);
-        var bgFill = ColourUtil.RgbaToAbgr((active.Colors.Surface & 0xFFFFFF00u) | 0xCCu);
-        var origin = ImGui.GetCursorScreenPos();
-        var width = ImGui.GetContentRegionAvail().X;
-        var height = 64f;
-        var draw = ImGui.GetWindowDrawList();
-        draw.AddRectFilled(origin, origin + new Vector2(width, height), bgFill, 4f);
-        draw.AddRect(origin, origin + new Vector2(width, height), border, 4f, ImDrawFlags.None, 1f);
-
-        var hint = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Hint")
-                   ?? "This theme suggests its own chat channel colours.";
-        var applyLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Apply")
-                         ?? "Apply";
-        var keepLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Keep")
-                        ?? "Keep current";
-
-        var textColor = ColourUtil.RgbaToAbgr(active.Colors.TextPrimary);
-        draw.AddText(origin + new Vector2(12f, 10f), textColor, hint);
-
-        // Buttons als InvisibleButton + DrawList-Overlay, damit sie konsistent
-        // zum Banner-Look bleiben.
-        using (ImRaii.PushColor(ImGuiCol.Button, active.Colors.Primary))
-        using (ImRaii.PushColor(ImGuiCol.ButtonHovered, active.Colors.PrimaryLight))
-        using (ImRaii.PushColor(ImGuiCol.ButtonActive, active.Colors.PrimaryDark))
-        {
-            ImGui.SetCursorScreenPos(origin + new Vector2(12f, 32f));
-            if (ImGui.Button(applyLabel))
-            {
-                foreach (var kvp in themeChatColors.Channels)
-                    Mutable.ChatColours[kvp.Key] = kvp.Value;
-                _applyDismissedFor = active.Slug;
-            }
-        }
-
-        ImGui.SameLine();
-        if (ImGui.Button(keepLabel))
-        {
-            _applyDismissedFor = active.Slug;
-        }
-
-        // Cursor unter den Banner setzen
-        ImGui.SetCursorScreenPos(origin + new Vector2(0f, height + 8f));
-
-        ImGui.Spacing();
-    }
-}

HellionChat/Ui/SettingsTabs/Window.cs

@@ -120,7 +120,7 @@ internal sealed class Window : ISettingsTab
 
     private void DrawFrameSection()
     {
-        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Window_Frame_Heading);
+        using var tree = ImRaii.TreeNode(HellionStrings.Settings_Window_Frame_Behaviour_Heading);
         if (!tree.Success)
         {
             return;
@@ -129,23 +129,12 @@ internal sealed class Window : ISettingsTab
         using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
         {
             ImGui.Checkbox(Language.Options_CanMove_Name, ref Mutable.CanMove);
-
             ImGui.Checkbox(Language.Options_CanResize_Name, ref Mutable.CanResize);
 
-            ImGui.Checkbox(Language.Options_ShowTitleBar_Name, ref Mutable.ShowTitleBar);
-
-            ImGui.Checkbox(Language.Options_ShowPopOutTitleBar_Name, ref Mutable.ShowPopOutTitleBar);
-
             // v0.6.0 — global master switch for the pop-out input bar.
             ImGui.Checkbox(HellionStrings.Settings_Window_PopOutInputEnabled_Name, ref Mutable.PopOutInputEnabled);
             ImGuiUtil.HelpMarker(HellionStrings.Settings_Window_PopOutInputEnabled_Description);
 
-            ImGui.Checkbox(Language.Options_ShowHideButton_Name, ref Mutable.ShowHideButton);
-            ImGuiUtil.HelpMarker(Language.Options_ShowHideButton_Description);
-
-            ImGui.Checkbox(Language.Options_SidebarTabView_Name, ref Mutable.SidebarTabView);
-            ImGuiUtil.HelpMarker(string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName));
-
             ImGui.Spacing();
 
             // Manual escape hatch for off-screen windows. The plugin already

README.md

@@ -12,7 +12,7 @@
   <img src="docs/images/hellion-forge.png" alt="Hellion Forge" width="180" />
 </p>
 
-**Version 1.1.0** — Privacy-First-Chat-Plugin für FINAL FANTASY XIV / Dalamud, basierend auf [Chat 2](https://github.com/Infiziert90/ChatTwo) (EUPL-1.2).
+**Version 1.2.3** — Privacy-First-Chat-Plugin für FINAL FANTASY XIV / Dalamud, basierend auf [Chat 2](https://github.com/Infiziert90/ChatTwo) (EUPL-1.2).
 
 Hellion Chat ist ein Privacy-First-Plugin auf dem Chat-2-Fundament. Der größte Teil der Engine kommt aus Chat 2 (Message-Store, Channel-Logik, Hook-System), die meisten Tastenkürzel funktionieren weiterhin wie gewohnt. Was sich ändert: schärfere Privacy-Defaults von Haus aus, eigene Slash-Commands unter `/hellionchat`, kein Webinterface mehr, und mit v1.1.0 eine Theme-Engine als Schritt in Richtung eigenes UI-Look-and-Feel.
 
@@ -72,7 +72,7 @@ Hellion Chat wird unter **Hellion Forge** entwickelt, der spezialisierten Moddin
 
 #### Custom Themes (v1.1.0)
 
-HellionChat 1.1.0 bringt eine Theme-Engine mit fünf eingebauten Themes (Hellion Arctic, Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove) und ein JSON-basiertes Authoring-Format für eigene Themes. Schema und Schritt-für-Schritt-Anleitung in [`docs/THEME-AUTHORING.md`](docs/THEME-AUTHORING.md).
+HellionChat bringt eine Theme-Engine mit derzeit neun eingebauten Themes (Hellion Arctic, Hellion Spectrum, Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove, Night Blue, Indigo Violet, Forge Merchantman) und ein JSON-basiertes Authoring-Format für eigene Themes. Schema und Schritt-für-Schritt-Anleitung in [`docs/THEME-AUTHORING.md`](docs/THEME-AUTHORING.md). Hellion Spectrum ist Deuteran/Protan-safe (rot-grün-Farbenblindheit) auf Basis der Wong/Okabe-Ito-Palette.
 
 ### Pop-Out Convenience (v0.6.0)
 
@@ -221,7 +221,7 @@ Eine optionale Submission ans Dalamud-Main-Plugin-Repo (zusätzlich zum eigenen
 
 ## Projektstatus
 
-**Version 1.1.0** — Theme-Engine live, Standalone-Cut abgeschlossen (Stand: 2026-05-04).
+**Version 1.2.3** — Theme-Katalog auf neun Built-ins erweitert, Settings thematisch re-sortiert, Standalone-Cut abgeschlossen (Stand: 2026-05-06).
 
 Hellion Chat ist ein eigenständiges Plugin, kein Fork mehr im Repository-Sinne. Vollständig abgeschlossen:
 
@@ -237,7 +237,7 @@ Hellion Chat ist ein eigenständiges Plugin, kein Fork mehr im Repository-Sinne.
 - About-Tab im Hellion-Branding, EN und DE lokalisiert, mit License und Disclaimer
 - AI-Disclosure dokumentiert (siehe [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md))
 - Standalone-Cut: Namespace `HellionChat.*`, IPC-Kanäle `HellionChat.*`, Source-Tree-Restructure, Conflict-Detection gegen Upstream Chat 2, SQLite-CVE-Härtung (3.50.3)
-- Theme-Engine mit fünf eingebauten Themes plus JSON-Authoring-Format (v1.1.0)
+- Theme-Engine mit neun eingebauten Themes plus JSON-Authoring-Format (Engine v1.1.0, Katalog erweitert in v1.2.3, inkl. CVD-safe Hellion Spectrum)
 
 In Arbeit: schrittweise Modernisierung des UI-Look-and-Feel über die Theme-Engine hinaus. Was als Nächstes geplant ist und welche Themen langfristig auf der Liste stehen, steht in [`docs/ROADMAP.md`](docs/ROADMAP.md). Konkrete eingeplante Items werden zusätzlich im [GitHub-Issue-Tracker](https://github.com/JonKazama-Hellion/HellionChat/issues) mit dem `roadmap`-Label geführt.
 

docs/CHANGELOG.md

@@ -12,6 +12,46 @@ und verlinkt für Details auf die Release-Pages.
 
 ---
 
+## v1.2.3 — Theme Expansion (2026-05-06)
+
+### Added
+- Four new built-in themes:
+  - **Night Blue** — Royal Blue on deep marine, cool tech-dashboard mood
+  - **Indigo Violet** — Royal Violet on deep indigo with a turquoise-mint counter (aurora glitter feel)
+  - **Forge Merchantman** — Patina bronze on workshop slate with warm amber counter (Hellion Forge identity)
+  - **Hellion Spectrum** — Deuteran/Protan-safe channel colours using Wong/Okabe-Ito palette tones; channel identity (Tell pink, Yell yellow, Shout orange, Party blue, FC green) preserved while keeping every channel separable under red-green colour vision deficiency
+- Built-in theme catalogue grown from five to nine
+
+### Notes
+- No engine changes, no settings touched, no migration
+- Default theme unchanged (Hellion Arctic). Existing custom themes keep working.
+- Hellion Spectrum covers the ~99 % of CVD cases that are red-green; a Tritan-safe variant could follow in a later cycle if there is demand.
+
+---
+
+## v1.2.1 — Settings Cleanup (2026-05-06)
+
+### Changed
+- Settings cards re-sorted thematically: 9 cards remain, each card has one clear job and a one-line subtitle.
+- **Theme & Layout** (new) collects the theme picker, window frame style (title bar, sidebar, hide button, pop-out title bar) and the timestamp style options.
+- **Fonts & Colours** (new) houses font choice, font size and per-channel chat colours.
+- **Data Management** (new) collects retention windows, cleanup, export, the database viewer and the shift-click advanced tools.
+- **Privacy** is now focused on the privacy filter alone.
+- **Chat** absorbs the Auto-Tell-Tabs history-preload slider that used to live under Privacy.
+- **General** groups the keybind mode under Input.
+
+### Removed
+- Legacy "Style override" option and the unused style-name field — both obsolete since the v1.1.0 themes engine.
+- Legacy `WindowAlpha` slider — if you had it set, the value is auto-migrated to Theme & Layout → Window Style → Window Transparency.
+- Unused `ShowThemeQuickPicker` schema field.
+
+### Migration
+- v15 → v16 with backup at `pluginConfigs/HellionChat.json.pre-v16-backup`.
+- All other settings preserved unchanged.
+- One-time toast on first start if Style override was previously active.
+
+---
+
 ## v1.2.0 — Layout Refresh (2026-05-05)
 
 ### Added

docs/ROADMAP.md

@@ -12,20 +12,33 @@ Privacy-First-Schnittmenge des Plugins erweisen.
 
 ---
 
-## Nächster Cycle (v1.2.0)
+## Nächster Cycle (v1.3.0)
 
-**Layout Refresh** — sichtbare Modernisierung des Chat-Windows selbst.
+**Polish & Motion** — Theme-Crossfade, Header-Quick-Picker,
+Lerp-Animationen, ggf. Theme-Family-Picker (Carls Grün-Familie
+mit Forest/Moss/Mint-Helligkeitsstufen).
 
-- Top-Tabs-Refresh mit Akzent-Pill-Underline statt Background-Fill
+Spec wird im Brainstorming-Cycle vor Beginn der Phase ausgearbeitet.
-- Sidebar-Tabs (existing) bekommen Icons + vertikale Pill am Window-Rand
-- Bottom-Status-Bar (Channel-Indikator, Privacy-Badge, Tab-Count,
-  Tells, Version)
-- Card-Rows als Default-Message-Rendering, mit Compact-Density-Toggle
-- Per-Tab Custom-Icons im Tabs-Settings-Dialog
-- Removal des deprecated `HellionThemeEnabled`/`HellionThemeWindowOpacity`
-  Configuration-Felder
 
-Spec liegt in [[Hellion Chat UI Modernisierung Spec]] (Vault).
+## v1.2.3 — Theme Expansion (released 2026-05-06)
+
+Vier neue Built-In-Themes: Night Blue, Indigo Violet, Forge
+Merchantman, Hellion Spectrum (Deuteran/Protan-safe).
+Keine Engine-Änderungen. Siehe `docs/CHANGELOG.md`.
+
+(v1.2.2 wurde verbrannt weil das `repo.json`-Manifest beim
+ersten Push nicht synchron mitgebumpt wurde — Re-Release als
+v1.2.3 mit kompletter Manifest-Synchronisation.)
+
+## v1.2.1 — Settings Cleanup (released 2026-05-06)
+
+Re-sortierte Settings (9 Cards thematisch), 4 tote Settings entfernt,
+Auto-Migration v15 → v16 ohne Daten-Verlust.
+
+## v1.2.0 — Layout Refresh (released 2026-05-05)
+
+Top-Tabs-Refresh, Sidebar-Tab-Icons, Bottom-Status-Bar, Card-Rows als
+Default-Message-Render, Auto-Tell-Tab-Hashing.
 
 ## v1.1.0 — Theme Foundation (released 2026-05-05)
 

docs/THEME-AUTHORING.md

@@ -4,7 +4,7 @@
 
 # Theme Authoring Guide
 
-> Built by **Hellion Forge** — the plugin workshop arm of [Hellion Online Media](https://hellion-media.de). HellionChat ships with five built-in themes; this guide walks you through writing your own.
+> Built by **Hellion Forge** — the plugin workshop arm of [Hellion Online Media](https://hellion-media.de). HellionChat ships with nine built-in themes; this guide walks you through writing your own.
 
 ## TL;DR
 
@@ -135,7 +135,7 @@ The user is asked **once per theme switch** whether to apply these colors — ne
 
 A theme can tint these toward its brand family (e.g., a purple theme can shift Tell from `#FF99CC` to `#E090FF`), but **don't** flip them (Tell suddenly green, Yell suddenly cyan). RP groups and combat-spec setups depend on the visual hierarchy.
 
-The four colored built-in themes (Hellion Arctic, Event Horizon, Moonlit Bloom, Mint Grove) all follow this rule — read their JSON for reference. Chat 2 Klassik intentionally ships without `chatChannels` so the user keeps their existing picks.
+The eight colored built-in themes (Hellion Arctic, Hellion Spectrum, Event Horizon, Moonlit Bloom, Mint Grove, Night Blue, Indigo Violet, Forge Merchantman) all follow this rule — read their source for reference. Chat 2 Klassik intentionally ships without `chatChannels` so the user keeps their existing picks.
 
 ## Theme families