diff --git a/ChatTwo/ChatTwo.csproj b/ChatTwo/ChatTwo.csproj
index 11ac682..6cce6af 100755
--- a/ChatTwo/ChatTwo.csproj
+++ b/ChatTwo/ChatTwo.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>0.3.0</Version>
+        <Version>0.3.1</Version>
         <ImplicitUsings>enable</ImplicitUsings>
         <!-- HellionChat fork: assembly is renamed so Dalamud uses
              pluginConfigs/HellionChat instead of pluginConfigs/ChatTwo,
diff --git a/ChatTwo/HellionChat.yaml b/ChatTwo/HellionChat.yaml
index 006d339..1d45ee1 100755
--- a/ChatTwo/HellionChat.yaml
+++ b/ChatTwo/HellionChat.yaml
@@ -40,6 +40,23 @@ tags:
   - Replacement
   - Privacy
 changelog: |-
+  **Hellion Chat 0.3.1 — Upstream emote regression fix**
+
+  Cherry-picks Infi's upstream commit ff899ff "Fix a regression
+  from API 15 updates" which changes the BetterTTV emote DTOs
+  (Emote and Top100) from public fields to public properties.
+  System.Text.Json under the API 15 toolchain only honours the
+  [JsonPropertyName] attribute on properties, so the previous
+  field-based version deserialised every fetched emote into empty
+  default values. Result: BetterTTV emotes were silently broken
+  on fresh installs. The fix is six lines and applies cleanly on
+  top of our defensive null-check from earlier; the EmoteCache
+  path-traversal hardening from 0.3.0 stays as it is.
+
+  Authorship of the fix is preserved with git cherry-pick -x, so
+  Infi shows up as the author on the commit. Thanks to him for
+  catching it in the upstream codebase.
+
   **Hellion Chat 0.3.0 — Audit hardening, brand sweep and rebrand of slash commands**
 
   This release closes the remaining audit follow-ups from the
diff --git a/README.md b/README.md
index 9da8440..1ea5ba2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Hellion Chat
 
-**Version 0.3.0** — DSGVO-bewusste Erweiterung von [Chat 2](https://github.com/Infiziert90/ChatTwo) für FINAL FANTASY XIV / Dalamud.
+**Version 0.3.1** — DSGVO-bewusste Erweiterung von [Chat 2](https://github.com/Infiziert90/ChatTwo) für FINAL FANTASY XIV / Dalamud.
 
 Hellion Chat baut auf Chat 2 auf und ergänzt es um Datenschutz- und Daten-Handling-Kontrollen, die mit den Datenschutz-Regeln in der EU, den USA und Japan im Einklang sind. Alle Chat-2-Funktionen, Befehle und Tastenkürzel funktionieren unverändert. Eigenständiger Plugin-Slot, eigene Konfiguration, eigene Datenbank.
 
@@ -231,7 +231,7 @@ Konflikte in Upstream-Sprach-Ressourcen (`Language.<lang>.resx`) kommen häufig
 
 ## Projektstatus
 
-**Version 0.3.0** | Stand: Mai 2026
+**Version 0.3.1** | Stand: Mai 2026
 
 Alle Bootstrap-Phasen abgeschlossen:
 
diff --git a/repo.json b/repo.json
index 97e171a..37c8071 100644
--- a/repo.json
+++ b/repo.json
@@ -3,7 +3,7 @@
     "Author": "JonKazama-Hellion",
     "Name": "Hellion Chat",
     "InternalName": "HellionChat",
-    "AssemblyVersion": "0.3.0.0",
+    "AssemblyVersion": "0.3.1.0",
     "Description": "Hellion Chat is built on top of Chat 2 with one removal and a stack\nof privacy controls on top. Tabs, channel filters, RGB colours,\nemotes, screenshot mode, IPC integration and the chat replacement\nwindow itself work the same. The optional webinterface that Chat 2\nships is intentionally not part of this fork because it serves a\ndifferent use case from the smaller default footprint Hellion Chat\nis built around.\n\nOn top of that, Hellion Chat adds privacy and data-handling controls\ndesigned to align with the modern data protection rules that apply\nacross the EU, the United States and Japan. By default only your own\nconversations are stored; messages from strangers, NPCs and system\nspam stay out of the database. Retention windows are configurable per\nchannel, history can be wiped retroactively, and stored data can be\nexported on demand.\n\nKey additions on top of Chat 2:\n\n- Channel whitelist with a Privacy-First default\n- Per-channel retention with a daily background sweep\n- Retroactive cleanup with a Ctrl+Shift confirm\n- Export to Markdown, JSON or CSV\n- First-run wizard with three preset profiles (Privacy-First, Casual,\n  Full History)\n- Bilingual UI (English and German) with live language switching\n- Independent plugin state — own config file and database directory,\n  so Hellion Chat does not share state with the upstream plugin\n\nBased on Chat 2 by Infi and Anna, licensed under EUPL-1.2.",
     "ApplicableVersion": "any",
     "RepoUrl": "https://github.com/JonKazama-Hellion/HellionChat",
@@ -20,12 +20,12 @@
     "CanUnloadAsync": false,
     "LoadPriority": 0,
     "Punchline": "Chat 2 with privacy controls aligned to EU, US and JP rules",
-    "Changelog": "**Hellion Chat 0.3.0 — Audit hardening, brand sweep and rebrand of slash commands**\n\nThis release closes the remaining audit follow-ups from the\n0.2.0 cleanup and finishes turning Hellion Chat into a properly\nbranded fork rather than a Chat 2 with a different name.\n\nSlash commands have been renamed across the board so they no\nlonger collide with the upstream plugin and tell you which\nplugin owns them at a glance:\n\n- /chat2          becomes /hellion\n- /chat2Viewer    becomes /hellionView\n- /clearlog2      becomes /clearhellion\n- /chat2Debugger  becomes /hellionDebugger (internal)\n- /chat2SeString  becomes /hellionSeString (internal)\n\nThis is a breaking change for anyone with macros bound to the\nold command names. The upstream Chat 2 commands keep working\nif you also have that plugin installed.\n\nPrivacy and storage hardening based on the post-0.2.0 audit:\n\n- Privacy filter master switch now states explicitly that the\n  filter only governs storage, not the live chat log\n- Emote cache refuses to write outside its own directory if a\n  third-party API ever returns a path that escapes\n- Retention sweep is serialised so the 24h auto-sweep and the\n  manual button cannot launch in parallel and race for the\n  SQLite connection\n- DbViewer paging uses an int constant and the matching SQL\n  parameter name (the upstream code passed a float and a name\n  without the parameter prefix; both worked in practice but\n  were inconsistent)\n\nVisual identity now matches the Hellion Online Media website:\n\n- Theme palette switched to Arctic Cyan plus Ember Orange,\n  matching the website's BRANDING.md tokens\n- Active tabs and window title bars use a brand-color-dark teal\n  variation as identity colour, replacing the previous slate\n  violet that did not appear in the brand\n- Resize grips and scrollbar grabs picked up Ember Orange\n  instead of industrial amber on hover and active states\n\nAbout tab rewritten and properly localised:\n\n- New \"Why this fork exists\" block sets out the mission in\n  neutral terms, framing Chat 2's full-history default as the\n  right one for most users while explaining the narrower\n  default footprint this fork chose\n- All Hellion-specific About copy now lives in HellionStrings\n  in EN and DE, so German users see the Hellion sections in\n  German rather than the upstream English fallback\n- Webinterface absence is described as a focus mismatch\n  (different use case, substantial rebuild) rather than as\n  a security issue with the upstream code\n- Translator list at the bottom of the About tab is reachable\n  again on smaller settings windows\n\nBased on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).\n\n**Hellion Chat 0.2.0 — Webinterface removed**\n\nWhat changed in this release:\n\n- Settings tab \"Webinterface\" is gone, the corresponding\n  Configuration fields (WebinterfaceEnabled / AutoStart / Password /\n  Port / AuthStore / MaxLinesToSend) are dropped and stale entries\n  fall out of the JSON on the next save automatically\n- The whole ChatTwo/Http tree, the bundled Svelte frontend in\n  websiteBuild.zip and the WebinterfaceUtil helper are deleted\n- Watson.Lite (the HTTP server) and Newtonsoft.Json (only used by\n  the webinterface JSON wire format) are removed from the\n  package references\n- DbViewer's \"Chat2 JSON Export\" button is dropped because it\n  serialised the database into the webinterface message protocol;\n  the Privacy tab's MessageExporter (Markdown, JSON, CSV with\n  channel and date filters) covers the same ground without the\n  proprietary shape\n- About tab notes the absence so users coming from Chat 2 do not\n  look for it\n- Configuration version bumps from 7 to 8 with a one-shot\n  notification (EN + DE)\n\nNo changes to the privacy filter, retention sweep, first-run wizard\nor export pipeline. Existing chat history is preserved.\n\nBased on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).\n\n**Hellion Chat 0.1.2 — About tab rebrand, DBViewer polish**\n\n- About tab now shows Hellion-specific maintainer, license, EU/US/JP\n  disclaimer and SQUARE ENIX disclaimer instead of the inherited\n  Chat 2 contact info; original ChatTwo translator credits stay\n  visible under a clearly labelled upstream tree node\n- Localization clarified: Hellion-specific German strings are\n  maintained by the fork maintainer, the Crowdin contributor list\n  only covers the inherited upstream strings\n- Cherry-picked DBViewer UI improvements from upstream Chat 2\n  (auto-scroll-reset on page change, tooltips on date reset,\n  folder export, page arrows, localized export-running messages)\n- README rewritten in the Hellion project style with a tech-stack\n  table, architecture tree, database column list, install guide,\n  upstream-sync workflow notes and project-status checklist\n\n**Hellion Chat 0.1.1 — Packaging and migration fixes**\n\n- Plugin icon now ships inside the bundle, so the Hellion logo\n  renders locally in the Dalamud plugin list once installed (the\n  previous release relied only on the remote IconUrl)\n- Plugin icon downsampled from 1024×1024 to 256×256 to match the\n  rendered size; loads faster and caches better\n- Migration from upstream Chat 2 is more robust: each file move is\n  wrapped individually, a locked SQLite database no longer aborts\n  the rest of the migration, and a warning notification fires when\n  any file is held open (with a hint to disable Chat 2 and restart\n  the game)\n- README ships a step-by-step migration guide (fresh install versus\n  coming from Chat 2) and a troubleshooting section with manual\n  recovery commands for Linux and Windows\n\n**Hellion Chat 0.1.0 — Initial fork release**\n\nPrivacy\n- Channel whitelist filter in MessageStore.UpsertMessage with a\n  Privacy-First default (own conversations only)\n- Per-channel retention with a 24-hour idempotent background sweep\n- Retroactive cleanup with a Ctrl+Shift confirm and VACUUM\n- Export to Markdown / JSON / CSV via Dalamud's file dialog\n\nOnboarding\n- First-run wizard with three profiles: Privacy-First / Casual /\n  Full History\n- Configuration migration that seeds defaults on update\n- One-shot migration from upstream Chat 2's pluginConfigs layout\n- Migrate3 idempotency recovery for half-migrated databases\n\nLook & feel\n- Localized UI (English and German) with live language switching\n- Industrial HUD theme with cyan-teal action accents, slate-violet\n  tabs, amber active highlights and a window-opacity slider\n\nBased on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).",
+    "Changelog": "**Hellion Chat 0.3.1 — Upstream emote regression fix**\n\nCherry-picks Infi's upstream commit ff899ff \"Fix a regression\nfrom API 15 updates\" which changes the BetterTTV emote DTOs\n(Emote and Top100) from public fields to public properties.\nSystem.Text.Json under the API 15 toolchain only honours the\n[JsonPropertyName] attribute on properties, so the previous\nfield-based version deserialised every fetched emote into empty\ndefault values. Result: BetterTTV emotes were silently broken\non fresh installs. The fix is six lines and applies cleanly on\ntop of our defensive null-check from earlier; the EmoteCache\npath-traversal hardening from 0.3.0 stays as it is.\n\nAuthorship of the fix is preserved with git cherry-pick -x, so\nInfi shows up as the author on the commit. Thanks to him for\ncatching it in the upstream codebase.\n\n**Hellion Chat 0.3.0 — Audit hardening, brand sweep and rebrand of slash commands**\n\nThis release closes the remaining audit follow-ups from the\n0.2.0 cleanup and finishes turning Hellion Chat into a properly\nbranded fork rather than a Chat 2 with a different name.\n\nSlash commands have been renamed across the board so they no\nlonger collide with the upstream plugin and tell you which\nplugin owns them at a glance:\n\n- /chat2          becomes /hellion\n- /chat2Viewer    becomes /hellionView\n- /clearlog2      becomes /clearhellion\n- /chat2Debugger  becomes /hellionDebugger (internal)\n- /chat2SeString  becomes /hellionSeString (internal)\n\nThis is a breaking change for anyone with macros bound to the\nold command names. The upstream Chat 2 commands keep working\nif you also have that plugin installed.\n\nPrivacy and storage hardening based on the post-0.2.0 audit:\n\n- Privacy filter master switch now states explicitly that the\n  filter only governs storage, not the live chat log\n- Emote cache refuses to write outside its own directory if a\n  third-party API ever returns a path that escapes\n- Retention sweep is serialised so the 24h auto-sweep and the\n  manual button cannot launch in parallel and race for the\n  SQLite connection\n- DbViewer paging uses an int constant and the matching SQL\n  parameter name (the upstream code passed a float and a name\n  without the parameter prefix; both worked in practice but\n  were inconsistent)\n\nVisual identity now matches the Hellion Online Media website:\n\n- Theme palette switched to Arctic Cyan plus Ember Orange,\n  matching the website's BRANDING.md tokens\n- Active tabs and window title bars use a brand-color-dark teal\n  variation as identity colour, replacing the previous slate\n  violet that did not appear in the brand\n- Resize grips and scrollbar grabs picked up Ember Orange\n  instead of industrial amber on hover and active states\n\nAbout tab rewritten and properly localised:\n\n- New \"Why this fork exists\" block sets out the mission in\n  neutral terms, framing Chat 2's full-history default as the\n  right one for most users while explaining the narrower\n  default footprint this fork chose\n- All Hellion-specific About copy now lives in HellionStrings\n  in EN and DE, so German users see the Hellion sections in\n  German rather than the upstream English fallback\n- Webinterface absence is described as a focus mismatch\n  (different use case, substantial rebuild) rather than as\n  a security issue with the upstream code\n- Translator list at the bottom of the About tab is reachable\n  again on smaller settings windows\n\nBased on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).\n\n**Hellion Chat 0.2.0 — Webinterface removed**\n\nWhat changed in this release:\n\n- Settings tab \"Webinterface\" is gone, the corresponding\n  Configuration fields (WebinterfaceEnabled / AutoStart / Password /\n  Port / AuthStore / MaxLinesToSend) are dropped and stale entries\n  fall out of the JSON on the next save automatically\n- The whole ChatTwo/Http tree, the bundled Svelte frontend in\n  websiteBuild.zip and the WebinterfaceUtil helper are deleted\n- Watson.Lite (the HTTP server) and Newtonsoft.Json (only used by\n  the webinterface JSON wire format) are removed from the\n  package references\n- DbViewer's \"Chat2 JSON Export\" button is dropped because it\n  serialised the database into the webinterface message protocol;\n  the Privacy tab's MessageExporter (Markdown, JSON, CSV with\n  channel and date filters) covers the same ground without the\n  proprietary shape\n- About tab notes the absence so users coming from Chat 2 do not\n  look for it\n- Configuration version bumps from 7 to 8 with a one-shot\n  notification (EN + DE)\n\nNo changes to the privacy filter, retention sweep, first-run wizard\nor export pipeline. Existing chat history is preserved.\n\nBased on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).\n\n**Hellion Chat 0.1.2 — About tab rebrand, DBViewer polish**\n\n- About tab now shows Hellion-specific maintainer, license, EU/US/JP\n  disclaimer and SQUARE ENIX disclaimer instead of the inherited\n  Chat 2 contact info; original ChatTwo translator credits stay\n  visible under a clearly labelled upstream tree node\n- Localization clarified: Hellion-specific German strings are\n  maintained by the fork maintainer, the Crowdin contributor list\n  only covers the inherited upstream strings\n- Cherry-picked DBViewer UI improvements from upstream Chat 2\n  (auto-scroll-reset on page change, tooltips on date reset,\n  folder export, page arrows, localized export-running messages)\n- README rewritten in the Hellion project style with a tech-stack\n  table, architecture tree, database column list, install guide,\n  upstream-sync workflow notes and project-status checklist\n\n**Hellion Chat 0.1.1 — Packaging and migration fixes**\n\n- Plugin icon now ships inside the bundle, so the Hellion logo\n  renders locally in the Dalamud plugin list once installed (the\n  previous release relied only on the remote IconUrl)\n- Plugin icon downsampled from 1024×1024 to 256×256 to match the\n  rendered size; loads faster and caches better\n- Migration from upstream Chat 2 is more robust: each file move is\n  wrapped individually, a locked SQLite database no longer aborts\n  the rest of the migration, and a warning notification fires when\n  any file is held open (with a hint to disable Chat 2 and restart\n  the game)\n- README ships a step-by-step migration guide (fresh install versus\n  coming from Chat 2) and a troubleshooting section with manual\n  recovery commands for Linux and Windows\n\n**Hellion Chat 0.1.0 — Initial fork release**\n\nPrivacy\n- Channel whitelist filter in MessageStore.UpsertMessage with a\n  Privacy-First default (own conversations only)\n- Per-channel retention with a 24-hour idempotent background sweep\n- Retroactive cleanup with a Ctrl+Shift confirm and VACUUM\n- Export to Markdown / JSON / CSV via Dalamud's file dialog\n\nOnboarding\n- First-run wizard with three profiles: Privacy-First / Casual /\n  Full History\n- Configuration migration that seeds defaults on update\n- One-shot migration from upstream Chat 2's pluginConfigs layout\n- Migrate3 idempotency recovery for half-migrated databases\n\nLook & feel\n- Localized UI (English and German) with live language switching\n- Industrial HUD theme with cyan-teal action accents, slate-violet\n  tabs, amber active highlights and a window-opacity slider\n\nBased on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).",
     "AcceptsFeedback": true,
-    "DownloadLinkInstall": "https://github.com/JonKazama-Hellion/HellionChat/releases/download/v0.3.0/latest.zip",
-    "DownloadLinkUpdate": "https://github.com/JonKazama-Hellion/HellionChat/releases/download/v0.3.0/latest.zip",
-    "DownloadLinkTesting": "https://github.com/JonKazama-Hellion/HellionChat/releases/download/v0.3.0/latest.zip",
-    "TestingAssemblyVersion": "0.3.0.0",
+    "DownloadLinkInstall": "https://github.com/JonKazama-Hellion/HellionChat/releases/download/v0.3.1/latest.zip",
+    "DownloadLinkUpdate": "https://github.com/JonKazama-Hellion/HellionChat/releases/download/v0.3.1/latest.zip",
+    "DownloadLinkTesting": "https://github.com/JonKazama-Hellion/HellionChat/releases/download/v0.3.1/latest.zip",
+    "TestingAssemblyVersion": "0.3.1.0",
     "IconUrl": "https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/ChatTwo/images/icon.png",
     "ImageUrls": [],
     "DownloadCount": 0,