diff --git a/.github/workflows/compile-and-release.yml b/.github/workflows/compile-and-release.yml
index 4212da622..846898306 100644
--- a/.github/workflows/compile-and-release.yml
+++ b/.github/workflows/compile-and-release.yml
@@ -83,7 +83,9 @@ jobs:
 
       - name: Linux Build Prep
         if: runner.os == 'linux'
-        run: sudo apt-get install libx11-dev libxtst-dev libpng-dev
+        run: |
+          sudo apt-get update
+          sudo apt-get install libx11-dev libxtst-dev libpng-dev
 
       - name: MacOS Build Prep
         if: runner.os == 'macOS'
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 15e1aa5ac..121944746 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -36,5 +36,7 @@
     "prettier.trailingComma": "none",
     "[scss]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
-    }
-}
\ No newline at end of file
+    },
+    "js/ts.tsdk.path": "node_modules/typescript/lib",
+    "js/ts.tsdk.promptToUseWorkspaceVersion": true
+}
diff --git a/package-lock.json b/package-lock.json
index 35ba5fd6a..c8e945247 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,20 +1,18 @@
 {
     "name": "firebotv5",
-    "version": "5.65.4",
+    "version": "5.66.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "firebotv5",
-            "version": "5.65.4",
+            "version": "5.66.0",
             "license": "GPL-3.0",
             "dependencies": {
                 "@aws-sdk/client-polly": "^3.26.0",
                 "@seald-io/nedb": "^4.0.4",
-                "@twurple/api": "^8.0.3",
-                "@twurple/auth": "^8.0.3",
-                "@twurple/chat": "^8.0.3",
-                "@twurple/eventsub-ws": "^8.0.3",
+                "@twurple/chat": "^8.1.4",
+                "@twurple/eventsub-ws": "^8.1.4",
                 "@types/tinycolor2": "^1.4.6",
                 "@zunderscore/elgato-light-control": "^1.2.0",
                 "angular": "^1.8.0",
@@ -50,11 +48,10 @@
                 "escape-html": "^1.0.3",
                 "eventsource": "^1.0.7",
                 "express": "^5.1.0",
-                "expressionish": "github:SReject/expressionish#ab800d753263d46990c8ad5ba1459c366c1acca9",
+                "expressionish": "github:SReject/expressionish#27f38753346b60c5a09d69ebe407bf70583eec2d",
                 "extra-life-ts": "^0.4.0",
                 "firebot-nutjs": "github:crowbartools/firebot-nutjs#f52581d4c4426cf7f4dcc2b0d26cf56777e115f8",
                 "form-data": "^4.0.5",
-                "fs-extra": "^11.2.0",
                 "fuse.js": "^7.1.0",
                 "glob": "^10.3.10",
                 "he": "^1.2.0",
@@ -97,7 +94,7 @@
                 "@types/unzipper": "^0.10.11",
                 "@types/yargs-parser": "^21.0.3",
                 "@typescript-eslint/parser": "^8.46.0",
-                "electron": "^39.2.4",
+                "electron": "^42.0.1",
                 "electron-installer-dmg": "^5.0.1",
                 "electron-winstaller": "^5.4.0",
                 "eslint": "^9.37.0",
@@ -773,6 +770,16 @@
                 "node": ">=0.1.90"
             }
         },
+        "node_modules/@d-fischer/cache-decorators": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/@d-fischer/cache-decorators/-/cache-decorators-4.0.1.tgz",
+            "integrity": "sha512-HNYLBLWs/t28GFZZeqdIBqq8f37mqDIFO6xNPof94VjpKvuP6ROqCZGafx88dk5zZUlBfViV9jD8iNNlXfc4CA==",
+            "license": "MIT",
+            "dependencies": {
+                "@d-fischer/shared-utils": "^3.6.3",
+                "tslib": "^2.6.2"
+            }
+        },
         "node_modules/@d-fischer/connection": {
             "version": "9.0.0",
             "resolved": "https://registry.npmjs.org/@d-fischer/connection/-/connection-9.0.0.tgz",
@@ -855,9 +862,10 @@
             }
         },
         "node_modules/@d-fischer/typed-event-emitter": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/@d-fischer/typed-event-emitter/-/typed-event-emitter-3.3.2.tgz",
-            "integrity": "sha512-M+fZQxiAA6UTwaTNeDhNoQcQG+eg9B85cNTw4FwwmN0ZEi6IfvXS0cnLFW1Ec86TdnFkoQ1VHxGx4pTtKPVe1Q==",
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/@d-fischer/typed-event-emitter/-/typed-event-emitter-3.3.3.tgz",
+            "integrity": "sha512-OvSEOa8icfdWDqcRtjSEZtgJTFOFNgTjje7zaL0+nAtu2/kZtRCSK5wUMrI/aXtCH8o0Qz2vA8UqkhWUTARFQQ==",
+            "license": "MIT",
             "dependencies": {
                 "tslib": "^2.4.0"
             },
@@ -1078,31 +1086,32 @@
             }
         },
         "node_modules/@electron/get": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.2.tgz",
-            "integrity": "sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@electron/get/-/get-5.0.0.tgz",
+            "integrity": "sha512-pjoBpru1KdEtcExBnuHAP1cAc/5faoedw0hzJkL3o4/IJp7HNF1+fbrdxT3gMYRX2oJfvnA/WXeCTVQpYYxyJA==",
+            "license": "MIT",
             "dependencies": {
                 "debug": "^4.1.1",
-                "env-paths": "^2.2.0",
-                "fs-extra": "^8.1.0",
-                "got": "^11.8.5",
+                "env-paths": "^3.0.0",
+                "graceful-fs": "^4.2.11",
                 "progress": "^2.0.3",
-                "semver": "^6.2.0",
+                "semver": "^7.6.3",
                 "sumchecker": "^3.0.1"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=22.12.0"
             },
             "optionalDependencies": {
-                "global-agent": "^3.0.0"
+                "undici": "^7.24.4"
             }
         },
         "node_modules/@electron/get/node_modules/debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+            "license": "MIT",
             "dependencies": {
-                "ms": "2.1.2"
+                "ms": "^2.1.3"
             },
             "engines": {
                 "node": ">=6.0"
@@ -1113,87 +1122,34 @@
                 }
             }
         },
-        "node_modules/@electron/get/node_modules/decompress-response": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-            "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-            "dependencies": {
-                "mimic-response": "^3.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/@electron/get/node_modules/fs-extra": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-            "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^4.0.0",
-                "universalify": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=6 <7 || >=8"
-            }
-        },
-        "node_modules/@electron/get/node_modules/got": {
-            "version": "11.8.6",
-            "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-            "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
-            "dependencies": {
-                "@sindresorhus/is": "^4.0.0",
-                "@szmarczak/http-timer": "^4.0.5",
-                "@types/cacheable-request": "^6.0.1",
-                "@types/responselike": "^1.0.0",
-                "cacheable-lookup": "^5.0.3",
-                "cacheable-request": "^7.0.2",
-                "decompress-response": "^6.0.0",
-                "http2-wrapper": "^1.0.0-beta.5.2",
-                "lowercase-keys": "^2.0.0",
-                "p-cancelable": "^2.0.0",
-                "responselike": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10.19.0"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/got?sponsor=1"
-            }
-        },
-        "node_modules/@electron/get/node_modules/lowercase-keys": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-            "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/@electron/get/node_modules/mimic-response": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-            "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+        "node_modules/@electron/get/node_modules/env-paths": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
+            "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
+            "license": "MIT",
             "engines": {
-                "node": ">=10"
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/@electron/get/node_modules/ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "license": "MIT"
         },
         "node_modules/@electron/get/node_modules/semver": {
-            "version": "6.3.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz",
+            "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==",
+            "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
         "node_modules/@electron/osx-sign": {
@@ -1499,22 +1455,6 @@
                 }
             }
         },
-        "node_modules/@electron/packager/node_modules/decompress-response": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-            "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "mimic-response": "^3.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/@electron/packager/node_modules/dir-compare": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-4.2.0.tgz",
@@ -1526,55 +1466,6 @@
                 "p-limit": "^3.1.0 "
             }
         },
-        "node_modules/@electron/packager/node_modules/got": {
-            "version": "11.8.6",
-            "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-            "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@sindresorhus/is": "^4.0.0",
-                "@szmarczak/http-timer": "^4.0.5",
-                "@types/cacheable-request": "^6.0.1",
-                "@types/responselike": "^1.0.0",
-                "cacheable-lookup": "^5.0.3",
-                "cacheable-request": "^7.0.2",
-                "decompress-response": "^6.0.0",
-                "http2-wrapper": "^1.0.0-beta.5.2",
-                "lowercase-keys": "^2.0.0",
-                "p-cancelable": "^2.0.0",
-                "responselike": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10.19.0"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/got?sponsor=1"
-            }
-        },
-        "node_modules/@electron/packager/node_modules/lowercase-keys": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-            "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/@electron/packager/node_modules/mimic-response": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-            "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/@electron/packager/node_modules/ms": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -2279,6 +2170,7 @@
             "version": "4.6.0",
             "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
             "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+            "dev": true,
             "engines": {
                 "node": ">=10"
             },
@@ -2873,6 +2765,7 @@
             "version": "4.0.6",
             "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
             "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+            "dev": true,
             "dependencies": {
                 "defer-to-connect": "^2.0.0"
             },
@@ -2881,9 +2774,9 @@
             }
         },
         "node_modules/@twurple/api": {
-            "version": "8.0.3",
-            "resolved": "https://registry.npmjs.org/@twurple/api/-/api-8.0.3.tgz",
-            "integrity": "sha512-vnqVi9YlNDbCqgpUUvTIq4sDitKCY0dkTw9zPluZvRNqUB1eCsuoaRNW96HQDhKtA9P4pRzwZ8xU7v/1KU2ytg==",
+            "version": "8.1.4",
+            "resolved": "https://registry.npmjs.org/@twurple/api/-/api-8.1.4.tgz",
+            "integrity": "sha512-UA2eg5lyZRB0w55NjGvdhSmWPyIBaOthFKGPjg3L/jCQVYnY/FcmUuPipe2Op9U4Ej99c29cdjsmTSQI7P7Vqg==",
             "license": "MIT",
             "dependencies": {
                 "@d-fischer/cache-decorators": "^4.0.0",
@@ -2891,9 +2784,9 @@
                 "@d-fischer/logger": "^4.2.1",
                 "@d-fischer/rate-limiter": "^1.1.0",
                 "@d-fischer/shared-utils": "^3.6.1",
-                "@d-fischer/typed-event-emitter": "^3.3.1",
-                "@twurple/api-call": "8.0.3",
-                "@twurple/common": "8.0.3",
+                "@d-fischer/typed-event-emitter": "^3.3.3",
+                "@twurple/api-call": "8.1.4",
+                "@twurple/common": "8.1.4",
                 "retry": "^0.13.1",
                 "tslib": "^2.0.3"
             },
@@ -2901,51 +2794,43 @@
                 "url": "https://github.com/sponsors/d-fischer"
             },
             "peerDependencies": {
-                "@twurple/auth": "8.0.3"
+                "@twurple/auth": "8.1.4"
             }
         },
         "node_modules/@twurple/api-call": {
-            "version": "8.0.3",
-            "resolved": "https://registry.npmjs.org/@twurple/api-call/-/api-call-8.0.3.tgz",
-            "integrity": "sha512-/5DBTqFjpYB+qqOkkFzoTWE79a7+I8uLXmBIIIYjGoq/CIPxKcHnlemXlU8cQhTr87PVa3th8zJXGYiNkpRx8w==",
+            "version": "8.1.4",
+            "resolved": "https://registry.npmjs.org/@twurple/api-call/-/api-call-8.1.4.tgz",
+            "integrity": "sha512-qh2TpdxxyiSkwadcCSes6uBHQB6l4Fz8sVfmzk+Brb12asemHMXTEyQAdrMJT7LlgtZq01nr+RASzWM3jmGtkw==",
             "license": "MIT",
             "dependencies": {
                 "@d-fischer/shared-utils": "^3.6.1",
-                "@twurple/common": "8.0.3",
+                "@twurple/common": "8.1.4",
                 "tslib": "^2.0.3"
             },
             "funding": {
                 "url": "https://github.com/sponsors/d-fischer"
             }
         },
-        "node_modules/@twurple/api/node_modules/@d-fischer/cache-decorators": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/@d-fischer/cache-decorators/-/cache-decorators-4.0.1.tgz",
-            "integrity": "sha512-HNYLBLWs/t28GFZZeqdIBqq8f37mqDIFO6xNPof94VjpKvuP6ROqCZGafx88dk5zZUlBfViV9jD8iNNlXfc4CA==",
-            "dependencies": {
-                "@d-fischer/shared-utils": "^3.6.3",
-                "tslib": "^2.6.2"
-            }
-        },
         "node_modules/@twurple/api/node_modules/retry": {
             "version": "0.13.1",
             "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
             "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 4"
             }
         },
         "node_modules/@twurple/auth": {
-            "version": "8.0.3",
-            "resolved": "https://registry.npmjs.org/@twurple/auth/-/auth-8.0.3.tgz",
-            "integrity": "sha512-Xlv+WNXmGQir4aBXYeRCqdno5XurA6jzYTIovSEHa7FZf3AMHMFqtzW7yqTCUn4iOahfUSA2TIIxmxFM0wis0g==",
+            "version": "8.1.4",
+            "resolved": "https://registry.npmjs.org/@twurple/auth/-/auth-8.1.4.tgz",
+            "integrity": "sha512-ylsJoPInCw9BwOqxKcx+1k2ce9QG3vJpKFzPdIyHh49HvM/ulQZ0CAGysydugDYXF0iO/TGryh7PluSwx5fIwA==",
             "license": "MIT",
             "dependencies": {
                 "@d-fischer/logger": "^4.2.1",
                 "@d-fischer/shared-utils": "^3.6.1",
-                "@d-fischer/typed-event-emitter": "^3.3.1",
-                "@twurple/api-call": "8.0.3",
-                "@twurple/common": "8.0.3",
+                "@d-fischer/typed-event-emitter": "^3.3.3",
+                "@twurple/api-call": "8.1.4",
+                "@twurple/common": "8.1.4",
                 "tslib": "^2.0.3"
             },
             "funding": {
@@ -2953,9 +2838,9 @@
             }
         },
         "node_modules/@twurple/chat": {
-            "version": "8.0.3",
-            "resolved": "https://registry.npmjs.org/@twurple/chat/-/chat-8.0.3.tgz",
-            "integrity": "sha512-rhm6xhWKp+4zYFimaEj5fPm6lw/yjrAOsGXXSvPDsEqFR+fc0cVXzmHmglTavkmEELRajFiqNBKZjg73JZWhTQ==",
+            "version": "8.1.4",
+            "resolved": "https://registry.npmjs.org/@twurple/chat/-/chat-8.1.4.tgz",
+            "integrity": "sha512-654LU7BwEpR7lLnWaVMgHtd7wMsaQo71GPTrFZ5ChS283d7B7GTe+9RJ5SxNliNxB5Xn0+R3R3M5HJlUOGYNeA==",
             "license": "MIT",
             "dependencies": {
                 "@d-fischer/cache-decorators": "^4.0.0",
@@ -2963,8 +2848,8 @@
                 "@d-fischer/logger": "^4.2.1",
                 "@d-fischer/rate-limiter": "^1.1.0",
                 "@d-fischer/shared-utils": "^3.6.1",
-                "@d-fischer/typed-event-emitter": "^3.3.0",
-                "@twurple/common": "8.0.3",
+                "@d-fischer/typed-event-emitter": "^3.3.3",
+                "@twurple/common": "8.1.4",
                 "ircv3": "^0.33.0",
                 "tslib": "^2.0.3"
             },
@@ -2972,22 +2857,13 @@
                 "url": "https://github.com/sponsors/d-fischer"
             },
             "peerDependencies": {
-                "@twurple/auth": "8.0.3"
-            }
-        },
-        "node_modules/@twurple/chat/node_modules/@d-fischer/cache-decorators": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/@d-fischer/cache-decorators/-/cache-decorators-4.0.1.tgz",
-            "integrity": "sha512-HNYLBLWs/t28GFZZeqdIBqq8f37mqDIFO6xNPof94VjpKvuP6ROqCZGafx88dk5zZUlBfViV9jD8iNNlXfc4CA==",
-            "dependencies": {
-                "@d-fischer/shared-utils": "^3.6.3",
-                "tslib": "^2.6.2"
+                "@twurple/auth": "8.1.4"
             }
         },
         "node_modules/@twurple/common": {
-            "version": "8.0.3",
-            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-8.0.3.tgz",
-            "integrity": "sha512-JQ2lb5qSFT21Y9qMfIouAILb94ppedLHASq49Fe/AP8oq0k3IC9Q7tX2n6tiMzGWqn+n8MnONUpMSZ6FhulMXA==",
+            "version": "8.1.4",
+            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-8.1.4.tgz",
+            "integrity": "sha512-1iN5DvOnW+g+Nl3OTI5zUJHgAfjmPCb50HpKsAFik6OYQEAHLsscQKgTOJ+KRuFBYepo/JkHsOWOmWhXxnK6lQ==",
             "license": "MIT",
             "dependencies": {
                 "@d-fischer/shared-utils": "^3.6.1",
@@ -2999,17 +2875,17 @@
             }
         },
         "node_modules/@twurple/eventsub-base": {
-            "version": "8.0.3",
-            "resolved": "https://registry.npmjs.org/@twurple/eventsub-base/-/eventsub-base-8.0.3.tgz",
-            "integrity": "sha512-59G5xJbHWLTSO6NAgwtkHPfIlmdjrABgiEumFnHhNusMbLM9qdA+kLcW5NB2NImNliytl6zZtqY92FInzUE6NA==",
+            "version": "8.1.4",
+            "resolved": "https://registry.npmjs.org/@twurple/eventsub-base/-/eventsub-base-8.1.4.tgz",
+            "integrity": "sha512-tMt44+BoepEBRDn90d+axP9F+0JH0/AT6to0Fz6O/JyIXBXMa7GiZxAkHG6pMZsFYfhKZkb4aehP1iQfc2PkFQ==",
             "license": "MIT",
             "dependencies": {
                 "@d-fischer/logger": "^4.2.1",
                 "@d-fischer/shared-utils": "^3.6.1",
-                "@d-fischer/typed-event-emitter": "^3.3.0",
-                "@twurple/api": "8.0.3",
-                "@twurple/auth": "8.0.3",
-                "@twurple/common": "8.0.3",
+                "@d-fischer/typed-event-emitter": "^3.3.3",
+                "@twurple/api": "8.1.4",
+                "@twurple/auth": "8.1.4",
+                "@twurple/common": "8.1.4",
                 "tslib": "^2.0.3"
             },
             "funding": {
@@ -3017,25 +2893,53 @@
             }
         },
         "node_modules/@twurple/eventsub-ws": {
-            "version": "8.0.3",
-            "resolved": "https://registry.npmjs.org/@twurple/eventsub-ws/-/eventsub-ws-8.0.3.tgz",
-            "integrity": "sha512-ndZ5GlekLD34updOHajNdz0p49IysBL8yNm7RvhHr0Pg/5B+TEjjg4uuxZixZ+e3i/BLSBfff1BI2GHzvEn+4Q==",
+            "version": "8.1.4",
+            "resolved": "https://registry.npmjs.org/@twurple/eventsub-ws/-/eventsub-ws-8.1.4.tgz",
+            "integrity": "sha512-fFqwkVq2/T48VVkPYlgIQCYsKN82MvOS51xMh8LPLW0PLVfau5b4v8X88JWx7wzGNZ9d9DImDhCHs+JV/efpfg==",
             "license": "MIT",
             "dependencies": {
-                "@d-fischer/connection": "^9.0.0",
+                "@d-fischer/connection": "^10.0.1",
                 "@d-fischer/logger": "^4.2.1",
                 "@d-fischer/shared-utils": "^3.6.1",
-                "@d-fischer/typed-event-emitter": "^3.3.0",
-                "@twurple/auth": "8.0.3",
-                "@twurple/common": "8.0.3",
-                "@twurple/eventsub-base": "8.0.3",
+                "@d-fischer/typed-event-emitter": "^3.3.3",
+                "@twurple/auth": "8.1.4",
+                "@twurple/common": "8.1.4",
+                "@twurple/eventsub-base": "8.1.4",
                 "tslib": "^2.0.3"
             },
             "funding": {
                 "url": "https://github.com/sponsors/d-fischer"
             },
             "peerDependencies": {
-                "@twurple/api": "8.0.3"
+                "@twurple/api": "8.1.4"
+            }
+        },
+        "node_modules/@twurple/eventsub-ws/node_modules/@d-fischer/connection": {
+            "version": "10.0.1",
+            "resolved": "https://registry.npmjs.org/@d-fischer/connection/-/connection-10.0.1.tgz",
+            "integrity": "sha512-CRP/azUPxwWpR4yT8wOQoM9XFliTVWVAJ8h1SlFnVRAgMlPNyg88/vbDEqZ+udtSB5m8uS10XafZxMUcegMBlQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@d-fischer/isomorphic-ws": "^7.0.0",
+                "@d-fischer/logger": "^4.2.1",
+                "@d-fischer/shared-utils": "^3.5.0",
+                "@d-fischer/typed-event-emitter": "^3.3.0",
+                "@types/node": "^20.19.37",
+                "@types/ws": "^8.5.4",
+                "tslib": "^2.4.1",
+                "ws": "^8.11.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/d-fischer"
+            }
+        },
+        "node_modules/@twurple/eventsub-ws/node_modules/@types/node": {
+            "version": "20.19.39",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.39.tgz",
+            "integrity": "sha512-orrrD74MBUyK8jOAD/r0+lfa1I2MO6I+vAkmAWzMYbCcgrN4lCrmK52gRFQq/JRxfYPfonkr4b0jcY7Olqdqbw==",
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~6.21.0"
             }
         },
         "node_modules/@types/angular": {
@@ -3080,6 +2984,7 @@
             "version": "6.0.3",
             "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
             "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
+            "dev": true,
             "dependencies": {
                 "@types/http-cache-semantics": "*",
                 "@types/keyv": "^3.1.4",
@@ -3148,7 +3053,8 @@
         "node_modules/@types/http-cache-semantics": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-            "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
+            "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+            "dev": true
         },
         "node_modules/@types/json-schema": {
             "version": "7.0.15",
@@ -3161,6 +3067,7 @@
             "version": "3.1.4",
             "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
             "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
+            "dev": true,
             "dependencies": {
                 "@types/node": "*"
             }
@@ -3214,6 +3121,7 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
             "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+            "dev": true,
             "dependencies": {
                 "@types/node": "*"
             }
@@ -4650,6 +4558,7 @@
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
             "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
+            "dev": true,
             "optional": true
         },
         "node_modules/bottleneck": {
@@ -4744,6 +4653,7 @@
             "version": "5.0.4",
             "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
             "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+            "dev": true,
             "engines": {
                 "node": ">=10.6.0"
             }
@@ -4752,6 +4662,7 @@
             "version": "7.0.2",
             "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
             "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+            "dev": true,
             "dependencies": {
                 "clone-response": "^1.0.2",
                 "get-stream": "^5.1.0",
@@ -4769,6 +4680,7 @@
             "version": "5.2.0",
             "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
             "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+            "dev": true,
             "dependencies": {
                 "pump": "^3.0.0"
             },
@@ -4779,14 +4691,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/cacheable-request/node_modules/lowercase-keys": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-            "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/call-bind": {
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
@@ -4926,6 +4830,7 @@
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
             "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+            "dev": true,
             "dependencies": {
                 "mimic-response": "^1.0.0"
             },
@@ -4937,6 +4842,7 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
             "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+            "dev": true,
             "engines": {
                 "node": ">=4"
             }
@@ -5459,6 +5365,22 @@
             "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
             "license": "MIT"
         },
+        "node_modules/decompress-response": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+            "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mimic-response": "^3.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/deep-is": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -5477,6 +5399,7 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
             "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+            "dev": true,
             "engines": {
                 "node": ">=10"
             }
@@ -5502,6 +5425,7 @@
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
             "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+            "dev": true,
             "optional": true,
             "dependencies": {
                 "has-property-descriptors": "^1.0.0",
@@ -5543,6 +5467,7 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
             "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+            "dev": true,
             "optional": true
         },
         "node_modules/dns-packet": {
@@ -5633,21 +5558,21 @@
             }
         },
         "node_modules/electron": {
-            "version": "39.2.4",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-39.2.4.tgz",
-            "integrity": "sha512-KxPtwpFceQKSxRtUY39piHLYhJMMyHfOhc70e6zRnKGrbRdK6hzEqssth8IGjlKOdkeT4KCvIEngnNraYk39+g==",
-            "hasInstallScript": true,
+            "version": "42.0.1",
+            "resolved": "https://registry.npmjs.org/electron/-/electron-42.0.1.tgz",
+            "integrity": "sha512-d8HnycE970DGESe91Nj30eonFBUcAI9EZ1TwUGJVzSAnJZdh0BkFEinAXjdklvDYst+bVDc8HsksCuqVLrnqdg==",
             "license": "MIT",
             "dependencies": {
-                "@electron/get": "^2.0.0",
-                "@types/node": "^22.7.7",
+                "@electron/get": "^5.0.0",
+                "@types/node": "^24.9.0",
                 "extract-zip": "^2.0.1"
             },
             "bin": {
-                "electron": "cli.js"
+                "electron": "cli.js",
+                "install-electron": "install.js"
             },
             "engines": {
-                "node": ">= 12.20.55"
+                "node": ">= 22.12.0"
             }
         },
         "node_modules/electron-installer-common": {
@@ -6059,6 +5984,21 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/electron/node_modules/@types/node": {
+            "version": "24.12.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.3.tgz",
+            "integrity": "sha512-8oljBDGun9cIsZRJR6fkihn0TSXJI0UDOOhncYaERq6M0JMDoPLxyscwruJcb4GKS6dvK/d8xebYBg27h/duaQ==",
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~7.16.0"
+            }
+        },
+        "node_modules/electron/node_modules/undici-types": {
+            "version": "7.16.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+            "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+            "license": "MIT"
+        },
         "node_modules/emoji-regex": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -6158,6 +6098,7 @@
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
             "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+            "dev": true,
             "engines": {
                 "node": ">=6"
             }
@@ -6227,6 +6168,7 @@
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
             "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+            "dev": true,
             "optional": true
         },
         "node_modules/escalade": {
@@ -6254,7 +6196,7 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
             "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-            "devOptional": true,
+            "dev": true,
             "engines": {
                 "node": ">=10"
             },
@@ -6814,9 +6756,9 @@
             "license": "MIT"
         },
         "node_modules/expressionish": {
-            "version": "0.0.4",
-            "resolved": "git+ssh://git@github.com/SReject/expressionish.git#ab800d753263d46990c8ad5ba1459c366c1acca9",
-            "integrity": "sha512-iV9aqSrXtyI8QPruX4WzpGcdChOt3mOB13DzsWKnlqijgZM4H4j64qFvJ3M5WaeiyPzHS9JtLPPsK4UA+dvqzA==",
+            "version": "0.0.5",
+            "resolved": "git+ssh://git@github.com/SReject/expressionish.git#27f38753346b60c5a09d69ebe407bf70583eec2d",
+            "integrity": "sha512-CfodJDY96u3bjKg9kSGt9h8XRwmbDiI//6RtVNXZunDkzY3xUdytnrTn31m1zp254VeTievsIGNEFC2rn6lYsA==",
             "license": "ISC"
         },
         "node_modules/extend": {
@@ -7783,6 +7725,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
             "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
+            "dev": true,
             "optional": true,
             "dependencies": {
                 "boolean": "^3.0.1",
@@ -7800,6 +7743,7 @@
             "version": "7.6.3",
             "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
             "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+            "dev": true,
             "optional": true,
             "bin": {
                 "semver": "bin/semver.js"
@@ -7855,6 +7799,7 @@
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
             "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+            "dev": true,
             "optional": true,
             "dependencies": {
                 "define-properties": "^1.1.3"
@@ -7878,10 +7823,37 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/got": {
+            "version": "11.8.6",
+            "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
+            "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@sindresorhus/is": "^4.0.0",
+                "@szmarczak/http-timer": "^4.0.5",
+                "@types/cacheable-request": "^6.0.1",
+                "@types/responselike": "^1.0.0",
+                "cacheable-lookup": "^5.0.3",
+                "cacheable-request": "^7.0.2",
+                "decompress-response": "^6.0.0",
+                "http2-wrapper": "^1.0.0-beta.5.2",
+                "lowercase-keys": "^2.0.0",
+                "p-cancelable": "^2.0.0",
+                "responselike": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10.19.0"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/got?sponsor=1"
+            }
+        },
         "node_modules/graceful-fs": {
-            "version": "4.2.10",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+            "version": "4.2.11",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+            "license": "ISC"
         },
         "node_modules/graphemer": {
             "version": "1.4.0",
@@ -8654,7 +8626,8 @@
         "node_modules/http-cache-semantics": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-            "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
+            "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+            "dev": true
         },
         "node_modules/http-errors": {
             "version": "2.0.1",
@@ -8680,6 +8653,7 @@
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
             "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+            "dev": true,
             "dependencies": {
                 "quick-lru": "^5.1.1",
                 "resolve-alpn": "^1.0.0"
@@ -9184,7 +9158,8 @@
         "node_modules/json-buffer": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
+            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+            "dev": true
         },
         "node_modules/json-schema-traverse": {
             "version": "0.4.1",
@@ -9202,6 +9177,7 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
             "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+            "dev": true,
             "optional": true
         },
         "node_modules/jsonfile": {
@@ -9237,6 +9213,7 @@
             "version": "4.5.4",
             "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
             "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "json-buffer": "3.0.1"
@@ -9453,6 +9430,16 @@
             "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
             "license": "MIT"
         },
+        "node_modules/lowercase-keys": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+            "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/lru-cache": {
             "version": "10.4.3",
             "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
@@ -9533,6 +9520,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
             "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
+            "dev": true,
             "optional": true,
             "dependencies": {
                 "escape-string-regexp": "^4.0.0"
@@ -9637,6 +9625,19 @@
                 "node": ">= 0.6"
             }
         },
+        "node_modules/mimic-response": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+            "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/minimatch": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -9893,6 +9894,7 @@
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
             "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+            "dev": true,
             "engines": {
                 "node": ">=10"
             },
@@ -9954,6 +9956,7 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
             "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+            "dev": true,
             "optional": true,
             "engines": {
                 "node": ">= 0.4"
@@ -10126,6 +10129,7 @@
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
             "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+            "dev": true,
             "engines": {
                 "node": ">=8"
             }
@@ -10677,6 +10681,7 @@
             "version": "5.1.1",
             "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
             "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+            "dev": true,
             "engines": {
                 "node": ">=10"
             },
@@ -10906,7 +10911,8 @@
         "node_modules/resolve-alpn": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-            "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
+            "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+            "dev": true
         },
         "node_modules/resolve-dir": {
             "version": "1.0.1",
@@ -10934,6 +10940,7 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
             "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+            "dev": true,
             "dependencies": {
                 "lowercase-keys": "^2.0.0"
             },
@@ -10941,14 +10948,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/responselike/node_modules/lowercase-keys": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-            "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/retry": {
             "version": "0.12.0",
             "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
@@ -10974,6 +10973,7 @@
             "version": "2.15.4",
             "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
             "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
+            "dev": true,
             "optional": true,
             "dependencies": {
                 "boolean": "^3.0.1",
@@ -11128,6 +11128,7 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
             "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
+            "dev": true,
             "optional": true
         },
         "node_modules/send": {
@@ -11200,6 +11201,7 @@
             "version": "7.0.1",
             "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
             "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
+            "dev": true,
             "optional": true,
             "dependencies": {
                 "type-fest": "^0.13.1"
@@ -11979,6 +11981,7 @@
             "version": "0.13.1",
             "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
             "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+            "dev": true,
             "optional": true,
             "engines": {
                 "node": ">=10"
@@ -12155,6 +12158,16 @@
                 "node": "*"
             }
         },
+        "node_modules/undici": {
+            "version": "7.25.0",
+            "resolved": "https://registry.npmjs.org/undici/-/undici-7.25.0.tgz",
+            "integrity": "sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==",
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">=20.18.1"
+            }
+        },
         "node_modules/undici-types": {
             "version": "6.21.0",
             "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
@@ -12172,6 +12185,7 @@
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
             "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+            "dev": true,
             "engines": {
                 "node": ">= 4.0.0"
             }
diff --git a/package.json b/package.json
index d943346f6..746cfbb18 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "firebotv5",
-    "version": "5.65.4",
+    "version": "5.66.0",
     "description": "Powerful all-in-one bot for Twitch streamers.",
     "main": "build/main.js",
     "scripts": {
@@ -35,7 +35,7 @@
         "@types/unzipper": "^0.10.11",
         "@types/yargs-parser": "^21.0.3",
         "@typescript-eslint/parser": "^8.46.0",
-        "electron": "^39.2.4",
+        "electron": "^42.0.1",
         "electron-installer-dmg": "^5.0.1",
         "electron-winstaller": "^5.4.0",
         "eslint": "^9.37.0",
@@ -54,10 +54,8 @@
     "dependencies": {
         "@aws-sdk/client-polly": "^3.26.0",
         "@seald-io/nedb": "^4.0.4",
-        "@twurple/api": "^8.0.3",
-        "@twurple/auth": "^8.0.3",
-        "@twurple/chat": "^8.0.3",
-        "@twurple/eventsub-ws": "^8.0.3",
+        "@twurple/chat": "^8.1.4",
+        "@twurple/eventsub-ws": "^8.1.4",
         "@types/tinycolor2": "^1.4.6",
         "@zunderscore/elgato-light-control": "^1.2.0",
         "angular": "^1.8.0",
@@ -93,11 +91,10 @@
         "escape-html": "^1.0.3",
         "eventsource": "^1.0.7",
         "express": "^5.1.0",
-        "expressionish": "github:SReject/expressionish#ab800d753263d46990c8ad5ba1459c366c1acca9",
+        "expressionish": "github:SReject/expressionish#27f38753346b60c5a09d69ebe407bf70583eec2d",
         "extra-life-ts": "^0.4.0",
         "firebot-nutjs": "github:crowbartools/firebot-nutjs#f52581d4c4426cf7f4dcc2b0d26cf56777e115f8",
         "form-data": "^4.0.5",
-        "fs-extra": "^11.2.0",
         "fuse.js": "^7.1.0",
         "glob": "^10.3.10",
         "he": "^1.2.0",
diff --git a/src/backend/app-management/electron/events/when-ready.ts b/src/backend/app-management/electron/events/when-ready.ts
index edb4d07c0..46c620ead 100644
--- a/src/backend/app-management/electron/events/when-ready.ts
+++ b/src/backend/app-management/electron/events/when-ready.ts
@@ -3,7 +3,6 @@ import frontendCommunicator from "../../../common/frontend-communicator";
 import logger from "../../../logwrapper";
 
 export async function whenReady() {
-
     logger.debug("...Applying IPC events");
     const { setupIpcEvents } = await import("./ipc-events");
     setupIpcEvents();
@@ -23,6 +22,10 @@ export async function whenReady() {
     const { ensureRequiredFoldersExist } = await import("../../data-tasks");
     await ensureRequiredFoldersExist();
 
+    windowManagement.updateSplashScreenStatus("Loading pronoun cache...");
+    const { FirebotPronounManager } = await import("../../../pronouns/pronoun-manager");
+    await FirebotPronounManager.cachePronouns();
+
     // load twitch auth
     windowManagement.updateSplashScreenStatus("Loading Twitch login system...");
     await import("../../../auth/auth-manager");
@@ -52,8 +55,7 @@ export async function whenReady() {
 
     windowManagement.updateSplashScreenStatus("Refreshing Twitch account data...");
 
-    // Loading these first so that the refresh caches the account avatar URLs
-    const _chatHelpers = await import("../../../chat/chat-helpers");
+    // Loading this first so that the refresh caches the account avatar URLs
     const _eventSubChatHelpers = await import("../../../streaming-platforms/twitch/api/eventsub/eventsub-chat-helpers");
 
     const { TwitchApi } = await import("../../../streaming-platforms/twitch/api");
@@ -263,6 +265,10 @@ export async function whenReady() {
     const channelRewardManager = (await import("../../../channel-rewards/channel-reward-manager")).default;
     await channelRewardManager.loadChannelRewards();
 
+    windowManagement.updateSplashScreenStatus("Loading power-ups...");
+    const powerUpsManager = (await import("../../../power-ups/power-ups-manager")).default;
+    await powerUpsManager.loadPowerUps();
+
     // load activity feed manager
     await import("../../../events/activity-feed-manager");
 
@@ -283,7 +289,8 @@ export async function whenReady() {
     // start crowbar relay websocket
     await import("../../../crowbar-relay/crowbar-relay-websocket");
 
-    const countdownManager = (await import("../../../overlay-widgets/builtin-types/countdown/countdown-manager")).default;
+    const countdownManager = (await import("../../../overlay-widgets/builtin-types/countdown/countdown-manager"))
+        .default;
     countdownManager.startTimer();
 
     logger.debug("...loading main window");
@@ -291,11 +298,7 @@ export async function whenReady() {
     await windowManagement.createMainWindow();
 
     // Receive log messages from frontend
-    frontendCommunicator.on("logging", (data: {
-        level: string;
-        message: string;
-        meta?: unknown[];
-    }) => {
+    frontendCommunicator.on("logging", (data: { level: string, message: string, meta?: unknown[] }) => {
         logger.log(data.level, data.message, ...(data.meta ?? []));
     });
-};
\ No newline at end of file
+}
diff --git a/src/backend/channel-rewards/channel-reward-manager.ts b/src/backend/channel-rewards/channel-reward-manager.ts
index 262c5a3b3..ffc005310 100644
--- a/src/backend/channel-rewards/channel-reward-manager.ts
+++ b/src/backend/channel-rewards/channel-reward-manager.ts
@@ -24,6 +24,7 @@ class ChannelRewardManager {
             TwitchApi.channelRewards.getTotalChannelRewardCount);
 
         frontendCommunicator.on("get-channel-rewards", () => Object.values(this.channelRewards));
+        frontendCommunicator.onAsync("get-channel-rewards", async () => Object.values(this.channelRewards));
 
         frontendCommunicator.on("get-channel-rewards-eligibility", () => this._eligible);
 
@@ -432,10 +433,6 @@ class ChannelRewardManager {
     }
 
     async refreshChannelRewardRedemptions(): Promise<void> {
-        if (AccountAccess.getAccounts().streamer.broadcasterType === "") {
-            return;
-        }
-
         this._channelRewardRedemptions = await TwitchApi.channelRewards.getOpenChannelRewardRedemptions();
 
         frontendCommunicator.send("channel-reward-redemptions-updated", this.getChannelRewardRedemptions());
diff --git a/src/backend/chat/active-user-handler.ts b/src/backend/chat/active-user-handler.ts
index 8b6ddac3c..4dbc94ef3 100644
--- a/src/backend/chat/active-user-handler.ts
+++ b/src/backend/chat/active-user-handler.ts
@@ -4,7 +4,7 @@ import type { HelixChatChatter } from "@twurple/api";
 
 import { SettingsManager } from "../common/settings-manager";
 import { TwitchApi } from "../streaming-platforms/twitch/api";
-import chatHelpers from "./chat-helpers";
+import { TwitchEventSubChatHelpers } from "../streaming-platforms/twitch/api/eventsub/eventsub-chat-helpers";
 import chatRolesManager from "../roles/chat-roles-manager";
 import viewerDatabase from "../viewers/viewer-database";
 import frontendCommunicator from "../common/frontend-communicator";
@@ -202,7 +202,7 @@ class ActiveUserHandler extends TypedEmitter<Events> {
                     disableViewerList: false
                 };
 
-                chatHelpers.setUserProfilePicUrl(twitchUser.id, twitchUser.profilePictureUrl);
+                TwitchEventSubChatHelpers.setUserProfilePicUrl(twitchUser.id, twitchUser.profilePictureUrl);
 
                 await viewerDatabase.addNewViewerFromChat(userDetails, true);
 
@@ -242,7 +242,7 @@ class ActiveUserHandler extends TypedEmitter<Events> {
                 ...(chatUser.isMod || chatUser.badges?.has("lead_moderator") ? ['mod'] : []),
                 ...(chatUser.isVip ? ['vip'] : [])
             ],
-            profilePicUrl: (await chatHelpers.getUserProfilePicUrl(chatUser.userId)),
+            profilePicUrl: (await TwitchEventSubChatHelpers.getUserProfilePicUrl(chatUser.userId)),
             disableViewerList: !!user?.disableViewerList
         };
 
diff --git a/src/backend/chat/chat-helpers.ts b/src/backend/chat/chat-helpers.ts
index 66d964249..2e7788d66 100644
--- a/src/backend/chat/chat-helpers.ts
+++ b/src/backend/chat/chat-helpers.ts
@@ -1,194 +1,40 @@
-import { HelixChatBadgeSet, HelixCheermoteList, HelixEmoteScale } from "@twurple/api";
-import { ChatMessage, ParsedMessageCheerPart, ParsedMessagePart, findCheermotePositions, parseChatMessage } from "@twurple/chat";
-import { EventSubAutoModMessageHoldV2Event } from "@twurple/eventsub-base";
-
 import {
+    type ChatMessage,
+    type ParsedMessageCheerPart,
+    type ParsedMessagePart,
+    parseChatMessage
+} from "@twurple/chat";
+import type { EventSubAutoModMessageHoldV2Event } from "@twurple/eventsub-base";
+
+import type {
     FirebotChatMessage,
     FirebotCheermoteInstance,
     FirebotParsedMessagePart
-} from "../../types/chat";
-import { FirebotAccount } from "../../types/accounts";
+} from "../../types";
 
 import { AccountAccess } from "../common/account-access";
-import { SettingsManager } from "../common/settings-manager";
+import { FirebotPronounManager } from "../pronouns/pronoun-manager";
 import { SharedChatCache } from "../streaming-platforms/twitch/chat/shared-chat-cache";
-import { TwitchApi } from "../streaming-platforms/twitch/api";
-import rankManager from "../ranks/rank-manager";
-import roleManager from "../roles/custom-roles-manager";
-import viewerDatabase from "../viewers/viewer-database";
-import frontendCommunicator from "../common/frontend-communicator";
+import { type ChatBadge, TwitchEventSubChatHelpers } from "../streaming-platforms/twitch/api/eventsub/eventsub-chat-helpers";
 import logger from "../logwrapper";
 import { getUrlRegex } from "../utils";
 
-import { ThirdPartyEmote, ThirdPartyEmoteProvider } from "./third-party/third-party-emote-provider";
-import { BTTVEmoteProvider } from "./third-party/bttv";
-import { FFZEmoteProvider } from "./third-party/ffz";
-import { SevenTVEmoteProvider } from "./third-party/7tv";
-
 interface ExtensionBadge {
     id: string;
     version: string;
 }
 
-// Yoinked from Twurple
-interface HelixEmoteBase {
-    id: string;
-    name: string;
-    getStaticImageUrl(scale?: HelixEmoteScale): string;
-    getAnimatedImageUrl(scale?: HelixEmoteScale): string;
-}
-
 class FirebotChatHelpers {
-    private _badgeCache: HelixChatBadgeSet[] = [];
-
-    private _getAllTwitchEmotes = false;
-    private _twitchEmotes: {
-        streamer: HelixEmoteBase[];
-        bot: HelixEmoteBase[];
-    } = { streamer: [], bot: [] };
-
-    private _thirdPartyEmotes: ThirdPartyEmote[] = [];
-    private _thirdPartyEmoteProviders: ThirdPartyEmoteProvider<unknown, unknown>[] = [
-        new BTTVEmoteProvider(),
-        new FFZEmoteProvider(),
-        new SevenTVEmoteProvider()
-    ];
-
-    private _twitchCheermotes: HelixCheermoteList;
-
-    private _profilePicUrlCache: Record<string, string> = {};
-
     private readonly URL_REGEX = getUrlRegex(false);
 
-    constructor() {
-        AccountAccess.on("account-update",
-            (cache) => {
-                if (cache.streamer?.loggedIn) {
-                    this.setUserProfilePicUrl(
-                        cache.streamer.userId,
-                        cache.streamer.avatar,
-                        false
-                    );
-                }
-
-                if (cache.bot?.loggedIn) {
-                    this.setUserProfilePicUrl(
-                        cache.bot.userId,
-                        cache.bot.avatar,
-                        false
-                    );
-                }
-            }
-        );
-
-        viewerDatabase.on("updated-viewer-avatar",
-            ({ userId, url }) => {
-                this.setUserProfilePicUrl(userId, url);
-            }
-        );
-    }
-
-    async cacheBadges(): Promise<void> {
-        logger.debug("Caching Twitch badges");
-        const streamer = AccountAccess.getAccounts().streamer;
-        const client = TwitchApi.streamerClient;
-        if (streamer.loggedIn && client) {
-            try {
-                const channelBadges = await client.chat.getChannelBadges(streamer.userId);
-                const globalBadges = await client.chat.getGlobalBadges();
-
-                this._badgeCache = [
-                    ...channelBadges,
-                    ...globalBadges
-                ];
-            } catch (error) {
-                logger.error("Failed to get channel chat badges", error);
-            }
-        }
-    }
-
-    async cacheTwitchEmotes(): Promise<void> {
-        logger.debug("Caching Twitch emotes");
-
-        // Cache this setting so it's consistent during the chat connection
-        this._getAllTwitchEmotes = SettingsManager.getSetting("ChatGetAllEmotes") === true;
-        const client = TwitchApi.streamerClient;
-
-        const { streamer, bot } = AccountAccess.getAccounts();
-
-        if (client == null || !streamer.loggedIn) {
-            return;
-        }
-
-        try {
-            let streamerEmotes: HelixEmoteBase[] = [];
-
-            if (this._getAllTwitchEmotes) {
-                logger.debug(`Caching all available Twitch emotes for streamer ${streamer.username}`);
-
-                // This includes: global, streamer channel, all channels streamer is subscribed to, etc.
-                // This may take SEVERAL calls so it can take several seconds to complete
-                streamerEmotes = await TwitchApi.chat.getAllUserEmotes();
-
-                if (!streamerEmotes) {
-                    return;
-                }
-            } else {
-                logger.debug(`Caching Twitch channel emotes for ${streamer.username}`);
-                const channelEmotes = await client.chat.getChannelEmotes(streamer.userId);
-
-                logger.debug("Caching Twitch global emotes");
-                const globalEmotes = await client.chat.getGlobalEmotes();
-
-                if (!channelEmotes && !globalEmotes) {
-                    return;
-                }
-
-                streamerEmotes = [
-                    ...channelEmotes,
-                    ...globalEmotes
-                ];
-            }
-
-            this._twitchEmotes.streamer = streamerEmotes;
-
-            if (this._getAllTwitchEmotes) {
-                if (bot.loggedIn) {
-                    logger.debug(`Caching all available Twitch emotes for bot ${bot.username}`);
-
-                    this._twitchEmotes.bot = await TwitchApi.chat.getAllUserEmotes("bot") ?? [];
-                } else {
-                    logger.debug("Bot account not logged in; Skipping Twitch bot emotes");
-                }
-            }
-        } catch (err) {
-            logger.error("Failed to get Twitch chat emotes", err);
-            return null;
-        }
-    }
-
-    async cacheThirdPartyEmotes() {
-        logger.debug("Caching third-party emotes");
-        this._thirdPartyEmotes = [];
-        for (const provider of this._thirdPartyEmoteProviders) {
-            logger.debug(`Caching ${provider.providerName} emotes`);
-            this._thirdPartyEmotes.push(...await provider.getAllEmotes());
-        }
-    }
-
-    async cacheCheermotes() {
-        logger.debug("Caching Twitch cheermotes");
-        this._twitchCheermotes = await TwitchApi.bits.getChannelCheermotes();
-    }
-
     parseCheermote(part: ParsedMessageCheerPart | FirebotParsedMessagePart): FirebotCheermoteInstance {
-        const displayInfo = this._twitchCheermotes.getCheermoteDisplayInfo(part.name, part.amount, {
+        const displayInfo = TwitchEventSubChatHelpers.twitchCheermotes.getCheermoteDisplayInfo(part.name, part.amount, {
             background: "light",
             state: "animated",
             scale: "4"
         });
 
-        const staticDisplayInfo = this._twitchCheermotes.getCheermoteDisplayInfo(part.name, part.amount, {
+        const staticDisplayInfo = TwitchEventSubChatHelpers.twitchCheermotes.getCheermoteDisplayInfo(part.name, part.amount, {
             background: "light",
             state: "static",
             scale: "4"
@@ -203,92 +49,12 @@ class FirebotChatHelpers {
         };
     }
 
-    async getCheermoteData(message: string): Promise<FirebotCheermoteInstance[]> {
-        const cheermotes: FirebotCheermoteInstance[] = [];
-        if (!(message?.length > 0)) {
-            return cheermotes;
-        }
-
-        const parsedCheermotes = findCheermotePositions(message, this._twitchCheermotes.getPossibleNames());
-
-        return parsedCheermotes.map(this.parseCheermote);
-    }
-
-    async cacheChatAssets(): Promise<void> {
-        await this.cacheBadges();
-        await this.cacheCheermotes();
-        await this.cacheThirdPartyEmotes();
-        await this.cacheTwitchEmotes();
-
-        // If the all emotes setting is disabled, just send the standard global/channel list for both accounts
-        frontendCommunicator.send("all-emotes", {
-            streamer: this._mapCachedEmotesForFrontend(this._twitchEmotes.streamer),
-            bot: this._mapCachedEmotesForFrontend(this._getAllTwitchEmotes ? this._twitchEmotes.bot : this._twitchEmotes.streamer),
-            thirdParty: this._thirdPartyEmotes
-        });
-    }
-
-    private _mapCachedEmotesForFrontend(emoteList: HelixEmoteBase[]) {
-        return emoteList.map(e => ({
-            url: e.getStaticImageUrl("3.0"),
-            animatedUrl: e.getAnimatedImageUrl("3.0"),
-            origin: "Twitch",
-            code: e.name
-        }));
-    }
-
-    private _updateAccountAvatar(
-        accountType: "streamer" | "bot",
-        account: FirebotAccount,
-        url: string
-    ): void {
-        account.avatar = url;
-        AccountAccess.updateAccount(accountType, account, false);
-    }
-
-    async getUserProfilePicUrl(userId: string): Promise<string> {
-        if (userId == null) {
-            return null;
-        }
-
-        if (this._profilePicUrlCache[userId]) {
-            return this._profilePicUrlCache[userId];
-        }
-
-        const streamer = AccountAccess.getAccounts().streamer;
-        const client = TwitchApi.streamerClient;
-        if (streamer.loggedIn && client) {
-            const user = await TwitchApi.users.getUserById(userId);
-            if (user) {
-                this._profilePicUrlCache[userId] = user.profilePictureUrl;
-                return user.profilePictureUrl;
-            }
-        }
-        return null;
-    }
-
-    setUserProfilePicUrl(userId: string, url: string, updateAccountAvatars = true) {
-        if (userId == null || url == null) {
-            return;
-        }
-
-        this._profilePicUrlCache[userId] = url;
-
-        if (updateAccountAvatars) {
-            if (userId === AccountAccess.getAccounts().streamer.userId) {
-                this._updateAccountAvatar("streamer", AccountAccess.getAccounts().streamer, url);
-            } else if (userId === AccountAccess.getAccounts().bot.userId) {
-                this._updateAccountAvatar("bot", AccountAccess.getAccounts().bot, url);
-            }
-        }
-    }
-
     private _parseMessageParts(firebotChatMessage: FirebotChatMessage, parts: ParsedMessagePart[] | FirebotParsedMessagePart[]) {
         if (firebotChatMessage == null || parts == null) {
             return [];
         }
         const { streamer, bot } = AccountAccess.getAccounts();
-        return parts.flatMap((p) => {
+        return parts.flatMap((p: ParsedMessagePart | FirebotParsedMessagePart) => {
             if (p.type === "text" && p.text != null) {
 
                 if (firebotChatMessage.username !== streamer.username &&
@@ -314,7 +80,7 @@ class FirebotChatHelpers {
                     }
 
                     // check for third party emotes
-                    const thirdPartyEmote = this._thirdPartyEmotes.find(e => e.code === word);
+                    const thirdPartyEmote = TwitchEventSubChatHelpers.thirdPartyEmotes.find(e => e.code === word);
                     if (thirdPartyEmote) {
                         subParts.push({
                             type: "third-party-emote",
@@ -332,7 +98,7 @@ class FirebotChatHelpers {
                         subParts.push({
                             type: "text",
                             text: `${word} `,
-                            flagged: p.flagged
+                            flagged: (p as FirebotParsedMessagePart).flagged
                         });
                     }
                 }
@@ -360,9 +126,9 @@ class FirebotChatHelpers {
             if (part.type === "emote") {
                 part.origin = "Twitch";
 
-                let emote = this._twitchEmotes.streamer.find(e => e.name === part.name);
+                let emote = TwitchEventSubChatHelpers.twitchEmotes.streamer.find(e => e.name === part.name);
                 if (emote == null) {
-                    emote = this._twitchEmotes.bot.find(e => e.name === part.name);
+                    emote = TwitchEventSubChatHelpers.twitchEmotes.bot.find(e => e.name === part.name);
                 }
 
                 part.url = emote ? emote.getStaticImageUrl("3.0") : `https://static-cdn.jtvnw.net/emoticons/v2/${part.id}/default/dark/3.0`;
@@ -381,16 +147,16 @@ class FirebotChatHelpers {
         });
     }
 
-    private _getChatBadges(badges: Map<string, string>) {
-        if (this._badgeCache == null) {
+    private _getChatBadges(badges: Map<string, string>): ChatBadge[] {
+        if (TwitchEventSubChatHelpers.badges == null) {
             return [];
         }
 
-        const chatBadges = [];
+        const chatBadges: ChatBadge[] = [];
 
         for (const [setName, version] of badges.entries()) {
 
-            const set = this._badgeCache.find(b => b.id === setName);
+            const set = TwitchEventSubChatHelpers.badges.find(b => b.id === setName);
             if (set == null) {
                 continue;
             }
@@ -414,7 +180,7 @@ class FirebotChatHelpers {
     }
 
     private _getMessageParts(text: string): FirebotParsedMessagePart[] {
-        if (!this._twitchEmotes) {
+        if (!TwitchEventSubChatHelpers.twitchEmotes) {
             const part: FirebotParsedMessagePart = {
                 type: "text",
                 text: text
@@ -424,11 +190,11 @@ class FirebotChatHelpers {
 
         const words = text.split(" ");
         return words.map((word) => {
-            let emoteId = null;
+            let emoteId: string = null;
             let url = "";
             let animatedUrl = "";
             try {
-                const foundEmote = Object.values(this._twitchEmotes || {})
+                const foundEmote = Object.values(TwitchEventSubChatHelpers.twitchEmotes || {})
                     .flat()
                     .find(e => e.name === word);
                 if (foundEmote) {
@@ -436,9 +202,7 @@ class FirebotChatHelpers {
                     url = foundEmote.getStaticImageUrl("3.0");
                     animatedUrl = foundEmote.getAnimatedImageUrl("3.0");
                 }
-            } catch (err) {
-                //logger.silly(`Failed to find emote id for ${word}`, err);
-            }
+            } catch { }
 
             let part: FirebotParsedMessagePart;
             if (emoteId != null) {
@@ -485,12 +249,11 @@ class FirebotChatHelpers {
             username: msg.userInfo.userName,
             userId: msg.userInfo.userId,
             userDisplayName: msg.userInfo.displayName,
+            pronouns: await FirebotPronounManager.getUserFriendlyPronounString(msg.userInfo.userName),
             customRewardId: msg.tags.get("custom-reward-id") || undefined,
             isHighlighted: msg.tags.get("msg-id") === "highlighted-message",
             isAnnouncement: false,
             isHiddenFromChatFeed: false,
-            isFirstChat: msg.isFirst ?? false,
-            isReturningChatter: msg.isReturningChatter ?? false,
             isReply: msg.tags.has("reply-parent-msg-id"),
             isGigantified: isGigantified,
             replyParentMessageId: msg.tags.get("reply-parent-msg-id"),
@@ -501,7 +264,9 @@ class FirebotChatHelpers {
             threadParentMessageSenderUserId: msg.tags.get("reply-thread-parent-user-id"),
             threadParentMessageSenderDisplayName: msg.tags.get("reply-thread-parent-display-name"),
 
-            //TODO: Waiting for EventSub to supply these 3 fields
+            //TODO: Waiting for EventSub to supply these fields
+            isFirstChat: msg.isFirst ?? false,
+            isReturningChatter: msg.isReturningChatter ?? false,
             isRaider: false,
             raidingFrom: "",
             isSuspiciousUser: false,
@@ -524,10 +289,10 @@ class FirebotChatHelpers {
             sharedChatRoomProfilePicUrl: sharedChatRoom?.profilePictureUrl
         };
 
-        const profilePicUrl = await this.getUserProfilePicUrl(firebotChatMessage.userId);
+        const profilePicUrl = await TwitchEventSubChatHelpers.getUserProfilePicUrl(firebotChatMessage.userId);
         firebotChatMessage.profilePicUrl = profilePicUrl;
 
-        await this.enrichMessageWithRanksAndRoles(firebotChatMessage);
+        await TwitchEventSubChatHelpers.enrichMessageWithRanksAndRoles(firebotChatMessage);
 
         const { streamer, bot } = AccountAccess.getAccounts();
 
@@ -544,7 +309,7 @@ class FirebotChatHelpers {
         }
 
         const messageParts = this._parseMessageParts(firebotChatMessage,
-            parseChatMessage(msgText, msg.emoteOffsets, this._twitchCheermotes?.getPossibleNames()));
+            parseChatMessage(msgText, msg.emoteOffsets, TwitchEventSubChatHelpers.twitchCheermotes?.getPossibleNames()));
 
         firebotChatMessage.parts = messageParts;
 
@@ -564,7 +329,7 @@ class FirebotChatHelpers {
             }
         }
 
-        if (this._badgeCache != null) {
+        if (TwitchEventSubChatHelpers.badges != null) {
             firebotChatMessage.badges = this._getChatBadges(msg.userInfo.badges);
         }
 
@@ -600,7 +365,7 @@ class FirebotChatHelpers {
 
         firebotChatMessage.isCheer = msg.isCheer === true;
 
-        firebotChatMessage.color = msg.userInfo.color;
+        firebotChatMessage.color = TwitchEventSubChatHelpers.cacheUserColor(msg.userInfo.userId, msg.userInfo.color);
 
         return firebotChatMessage;
     }
@@ -626,7 +391,7 @@ class FirebotChatHelpers {
             )) : [],
             parts: this._getMessageParts(text),
             roles: [],
-            isSharedChatMessage: false // todo: check if extension messages pass through Shared Chat, and if we can listen for it
+            isSharedChatMessage: false
         };
 
         firebotChatMessage.parts = this._parseMessageParts(firebotChatMessage, firebotChatMessage.parts);
@@ -635,7 +400,7 @@ class FirebotChatHelpers {
     }
 
     async buildViewerFirebotChatMessageFromAutoModMessage(msg: EventSubAutoModMessageHoldV2Event) {
-        const profilePicUrl = await this.getUserProfilePicUrl(msg.userId);
+        const profilePicUrl = await TwitchEventSubChatHelpers.getUserProfilePicUrl(msg.userId);
 
         const viewerFirebotChatMessage: FirebotChatMessage = {
             id: msg.messageId,
@@ -644,6 +409,8 @@ class FirebotChatHelpers {
             userDisplayName: msg.userDisplayName,
             rawText: msg.messageText,
             profilePicUrl: profilePicUrl,
+            pronouns: await FirebotPronounManager.getUserFriendlyPronounString(msg.userName),
+            color: TwitchEventSubChatHelpers.cacheUserColor(msg.userId),
             whisper: false,
             action: false,
             tagged: false,
@@ -659,7 +426,7 @@ class FirebotChatHelpers {
             isSharedChatMessage: false // todo: check if automod messages have a way to associate them with shared chat
         };
 
-        await this.enrichMessageWithRanksAndRoles(viewerFirebotChatMessage);
+        await TwitchEventSubChatHelpers.enrichMessageWithRanksAndRoles(viewerFirebotChatMessage);
 
         const { streamer, bot } = AccountAccess.getAccounts();
         if ((streamer.loggedIn && (msg.messageText.includes(streamer.username) || msg.messageText.includes(streamer.displayName)))
@@ -709,22 +476,6 @@ class FirebotChatHelpers {
 
         return viewerFirebotChatMessage;
     }
-
-    private async enrichMessageWithRanksAndRoles(firebotChatMessage: FirebotChatMessage) {
-        const viewer = await viewerDatabase.getViewerById(firebotChatMessage.userId);
-        firebotChatMessage.viewerRanks = Object.entries(viewer?.ranks || {}).reduce((obj, [ladderId, rankId]) => {
-            const ladder = rankManager.getItem(ladderId);
-            if (ladder && ladder.settings.showBadgeInChat && rankId) {
-                obj[ladder.name] = ladder.ranks.find(r => r.id === rankId)?.name || "Unknown";
-            }
-            return obj;
-        }, {} as Record<string, string>);
-
-        const customRoles = roleManager.getAllCustomRolesForViewer(firebotChatMessage.userId);
-        firebotChatMessage.viewerCustomRoles = customRoles
-            .filter(r => r.showBadgeInChat)
-            .map(r => r.name);
-    }
 }
 
 const chatHelpers = new FirebotChatHelpers();
diff --git a/src/backend/chat/chat-listeners/twitch-chat-listeners.js b/src/backend/chat/chat-listeners/twitch-chat-listeners.js
index e38aaf7e5..32a4f7f47 100644
--- a/src/backend/chat/chat-listeners/twitch-chat-listeners.js
+++ b/src/backend/chat/chat-listeners/twitch-chat-listeners.js
@@ -1,11 +1,11 @@
 "use strict";
 
-const frontendCommunicator = require("../../common/frontend-communicator");
 const chatCommandHandler = require("../commands/chat-command-handler");
 const chatHelpers = require("../chat-helpers");
 const { AccountAccess } = require("../../common/account-access");
 const { ActiveUserHandler } = require("../active-user-handler");
 const { ChatModerationManager } = require("../moderation/chat-moderation-manager");
+const { FirebotFrontendChatHelpers } = require("../frontend-chat-helpers");
 const { TwitchEventHandlers } = require("../../streaming-platforms/twitch/events");
 const twitchRolesManager = require("../../roles/twitch-roles-manager");
 const raidMessageChecker = require(".././moderation/raid-message-checker");
@@ -38,7 +38,7 @@ exports.setupChatListeners = (streamerChatClient, botChatClient) => {
         firebotChatMessage.isAnnouncement = true;
         firebotChatMessage.announcementColor = announcementInfo.color ?? "PRIMARY";
 
-        frontendCommunicator.send("twitch:chat:message", firebotChatMessage);
+        FirebotFrontendChatHelpers.sendChatMessageToFrontend(firebotChatMessage);
 
         TwitchEventHandlers.announcement.triggerAnnouncement(
             firebotChatMessage.username,
@@ -75,7 +75,7 @@ exports.setupChatListeners = (streamerChatClient, botChatClient) => {
                 imageUrl: "https://static-cdn.jtvnw.net/automatic-reward-images/highlight-4.png"
             };
         }
-        frontendCommunicator.send("twitch:chat:message", firebotChatMessage);
+        FirebotFrontendChatHelpers.sendChatMessageToFrontend(firebotChatMessage);
         exports.events.emit("chat-message", firebotChatMessage);
 
         const { ranCommand, command, userCommand } = await chatCommandHandler.handleChatMessage(firebotChatMessage);
@@ -116,7 +116,7 @@ exports.setupChatListeners = (streamerChatClient, botChatClient) => {
 
         chatCommandHandler.handleChatMessage(firebotChatMessage);
 
-        frontendCommunicator.send("twitch:chat:message", firebotChatMessage);
+        FirebotFrontendChatHelpers.sendChatMessageToFrontend(firebotChatMessage);
 
         TwitchEventHandlers.whisper.triggerWhisper(
             msg.userInfo.userName,
@@ -143,7 +143,7 @@ exports.setupChatListeners = (streamerChatClient, botChatClient) => {
             twitchRolesManager.removeVipFromVipList(msg.userInfo.userId);
         }
 
-        frontendCommunicator.send("twitch:chat:message", firebotChatMessage);
+        FirebotFrontendChatHelpers.sendChatMessageToFrontend(firebotChatMessage);
 
         const { ranCommand, command, userCommand } = await chatCommandHandler.handleChatMessage(firebotChatMessage);
 
@@ -173,7 +173,7 @@ exports.setupChatListeners = (streamerChatClient, botChatClient) => {
             if (subInfo.message != null && subInfo.message.length > 0) {
                 const firebotChatMessage = await chatHelpers.buildFirebotChatMessage(msg, subInfo.message);
 
-                frontendCommunicator.send("twitch:chat:message", firebotChatMessage);
+                FirebotFrontendChatHelpers.sendChatMessageToFrontend(firebotChatMessage);
 
                 exports.events.emit("chat-message", firebotChatMessage);
             }
diff --git a/src/backend/chat/frontend-chat-helpers.ts b/src/backend/chat/frontend-chat-helpers.ts
new file mode 100644
index 000000000..35cc94669
--- /dev/null
+++ b/src/backend/chat/frontend-chat-helpers.ts
@@ -0,0 +1,200 @@
+import { encode } from "he";
+import type {
+    FirebotChatMessage,
+    FirebotChatMessagePart,
+    FirebotParsedMessagePart,
+    OverlayWidgetConfig
+} from "../../types";
+import type { ChatWidgetSettings, ChatWidgetState } from "../overlay-widgets/builtin-types/chat/chat";
+import type { AdvancedChatWidgetSettings } from "../overlay-widgets/builtin-types/chat/chat-advanced";
+import overlayWidgetsManager from "../overlay-widgets/overlay-widgets-manager";
+import overlayWidgetConfigManager from "../overlay-widgets/overlay-widget-config-manager";
+import frontendCommunicator from "../common/frontend-communicator";
+import logger from "../logwrapper";
+
+class FirebotFrontendChatHelpers {
+    private _pendingMessageCache: Record<string, string[]> = { };
+
+    private sendChatMessageToChatWidget(
+        chatWidget: OverlayWidgetConfig<ChatWidgetSettings | AdvancedChatWidgetSettings, ChatWidgetState>,
+        chatMessage: FirebotChatMessage
+    ): void {
+        if (chatWidget.settings.delayMessages === true) {
+            if (this._pendingMessageCache[chatWidget.id].some(m => m === chatMessage.id)) {
+                // Remove it from the pending list so we know we've taken care of it
+                this._pendingMessageCache[chatWidget.id] = this._pendingMessageCache[chatWidget.id]
+                    .filter(m => m !== chatMessage.id);
+            } else {
+                logger.info(`Chat message ${chatMessage.id} not in pending cache for widget ${chatWidget.id}; ignoring`);
+                return;
+            }
+        }
+
+        const frontendChatMessage = {
+            ...chatMessage
+        };
+
+        frontendChatMessage.parts = chatMessage.parts.map((p: FirebotParsedMessagePart | FirebotChatMessagePart) => {
+            const part = { ...p };
+
+            if (part.type === "text" || part.type === "link") {
+                part.text = encode(part.text);
+            }
+
+            return part;
+        });
+
+        const existingChatMessages = chatWidget.state?.chatMessages ?? [];
+        overlayWidgetConfigManager.setWidgetStateById<ChatWidgetState>(chatWidget.id, {
+            chatMessages: [...existingChatMessages.slice(-99), frontendChatMessage]
+        });
+
+        void overlayWidgetsManager.sendWidgetEventToOverlay(
+            "message",
+            chatWidget,
+            {
+                messageName: "chat-message",
+                messageData: {
+                    chatMessage: frontendChatMessage
+                }
+            }
+        );
+
+        const messageTimeout = chatWidget.settings.messageTimeout;
+        if (chatWidget.settings.autoRemoveMessages === true && messageTimeout != null && messageTimeout > 0) {
+            setTimeout(() => {
+                this.deleteMessageFromChatWidget(chatWidget, chatMessage.id, true);
+            }, messageTimeout * 1000);
+        }
+    }
+
+    sendChatMessageToFrontend(chatMessage: FirebotChatMessage): void {
+        frontendCommunicator.send("twitch:chat:message", chatMessage);
+
+        if (chatMessage.whisper === true
+            || chatMessage.isAutoModHeld === true
+            || chatMessage.autoModStatus === "denied"
+            || chatMessage.autoModStatus === "expired"
+        ) {
+            return;
+        }
+
+        chatMessage.timestamp = new Date().getTime();
+
+        const chatWidgets = overlayWidgetConfigManager.getConfigsOfType<OverlayWidgetConfig<ChatWidgetSettings, ChatWidgetState>>("firebot:chat");
+        const advancedChatWidgets = overlayWidgetConfigManager.getConfigsOfType<OverlayWidgetConfig<AdvancedChatWidgetSettings, ChatWidgetState>>("firebot:chat-advanced");
+
+        for (const chatWidget of [...chatWidgets, ...advancedChatWidgets]) {
+            if (chatWidget.settings.delayMessages === true && chatWidget.settings.messageDelay) {
+                this._pendingMessageCache[chatWidget.id] ??= [];
+
+                this._pendingMessageCache[chatWidget.id].push(chatMessage.id);
+
+                setTimeout(() => {
+                    this.sendChatMessageToChatWidget(chatWidget, chatMessage);
+                }, chatWidget.settings.messageDelay * 1000);
+            } else {
+                this.sendChatMessageToChatWidget(chatWidget, chatMessage);
+            }
+        }
+    }
+
+    private deleteMessageFromChatWidget(
+        chatWidget: OverlayWidgetConfig<ChatWidgetSettings | AdvancedChatWidgetSettings, ChatWidgetState>,
+        messageId: string,
+        animate = false
+    ): void {
+        this._pendingMessageCache[chatWidget.id] = (this._pendingMessageCache[chatWidget.id] ?? [])
+            .filter(m => m !== messageId) ?? [];
+
+        const chatMessages = (chatWidget.state?.chatMessages ?? [])
+            .filter(m => m.id !== messageId);
+
+        overlayWidgetConfigManager.setWidgetStateById<ChatWidgetState>(chatWidget.id, {
+            chatMessages: chatMessages
+        });
+
+        void overlayWidgetsManager.sendWidgetEventToOverlay(
+            "message",
+            chatWidget,
+            {
+                messageName: "delete-message",
+                messageData: {
+                    messageId,
+                    animate
+                }
+            }
+        );
+    }
+
+    deleteMessageFromFrontend(messageId: string, animate = false): void {
+        frontendCommunicator.send("twitch:chat:message:deleted", messageId);
+
+        const chatWidgets = overlayWidgetConfigManager.getConfigsOfType<OverlayWidgetConfig<ChatWidgetSettings, ChatWidgetState>>("firebot:chat");
+        const advancedChatWidgets = overlayWidgetConfigManager.getConfigsOfType<OverlayWidgetConfig<AdvancedChatWidgetSettings, ChatWidgetState>>("firebot:chat-advanced");
+
+        for (const chatWidget of [...chatWidgets, ...advancedChatWidgets]) {
+            this.deleteMessageFromChatWidget(chatWidget, messageId, animate);
+        }
+    }
+
+    deleteUserMessagesFromFrontend(username: string) {
+        frontendCommunicator.send("twitch:chat:user:delete-messages", username);
+
+        const chatWidgets = overlayWidgetConfigManager.getConfigsOfType<OverlayWidgetConfig<ChatWidgetSettings, ChatWidgetState>>("firebot:chat");
+        const advancedChatWidgets = overlayWidgetConfigManager.getConfigsOfType<OverlayWidgetConfig<AdvancedChatWidgetSettings, ChatWidgetState>>("firebot:chat-advanced");
+
+        for (const chatWidget of [...chatWidgets, ...advancedChatWidgets]) {
+            const chatMessages = (chatWidget.state?.chatMessages ?? [])
+                .filter(m => m.username !== username);
+
+            overlayWidgetConfigManager.setWidgetStateById<ChatWidgetState>(chatWidget.id, {
+                chatMessages: chatMessages
+            });
+
+            void overlayWidgetsManager.sendWidgetEventToOverlay(
+                "message",
+                chatWidget,
+                {
+                    messageName: "delete-user-messages",
+                    messageData: {
+                        username
+                    }
+                }
+            );
+        }
+    }
+
+    clearChatFeed(moderatorName: string): void {
+        frontendCommunicator.send("twitch:chat:clear-feed", moderatorName);
+
+        const chatWidgets = overlayWidgetConfigManager.getConfigsOfType<OverlayWidgetConfig<ChatWidgetSettings, ChatWidgetState>>("firebot:chat");
+        const advancedChatWidgets = overlayWidgetConfigManager.getConfigsOfType<OverlayWidgetConfig<AdvancedChatWidgetSettings, ChatWidgetState>>("firebot:chat-advanced");
+
+        for (const chatWidget of [...chatWidgets, ...advancedChatWidgets]) {
+            overlayWidgetConfigManager.setWidgetStateById<ChatWidgetState>(chatWidget.id, {
+                chatMessages: null
+            });
+        }
+    }
+
+    updateMessageAutomodStatus(
+        messageId: string,
+        newStatus: FirebotChatMessage["autoModStatus"],
+        resolverName: string,
+        resolverId: string,
+        flaggedPhrases: string[]
+    ): void {
+        frontendCommunicator.send("twitch:chat:automod-update", {
+            messageId,
+            newStatus,
+            resolverName,
+            resolverId,
+            flaggedPhrases
+        });
+    }
+}
+
+const frontendChatHelpers = new FirebotFrontendChatHelpers();
+
+export { frontendChatHelpers as FirebotFrontendChatHelpers };
\ No newline at end of file
diff --git a/src/backend/chat/third-party/bttv.ts b/src/backend/chat/third-party/bttv.ts
index cb74da677..0b68c95dc 100644
--- a/src/backend/chat/third-party/bttv.ts
+++ b/src/backend/chat/third-party/bttv.ts
@@ -21,7 +21,7 @@ export class BTTVEmoteProvider extends ThirdPartyEmoteProvider<BTTVEmotesRespons
 
     private emoteMapper(response: BTTVEmotesResponse): ThirdPartyEmote[] {
         return response?.map(e => ({
-            url: `https://cdn.betterttv.net/emote/${e.id}/1x`,
+            url: `https://cdn.betterttv.net/emote/${e.id}/3x`,
             code: e.code,
             animated: e.imageType && e.imageType.toLowerCase() === "gif",
             origin: this.providerName
diff --git a/src/backend/chat/third-party/ffz.ts b/src/backend/chat/third-party/ffz.ts
index d8c89fc82..927aeb854 100644
--- a/src/backend/chat/third-party/ffz.ts
+++ b/src/backend/chat/third-party/ffz.ts
@@ -3,6 +3,8 @@ import { ThirdPartyEmote, ThirdPartyEmoteProvider } from "./third-party-emote-pr
 type FFZEmotesResponse = Array<{
     images: {
         "1x": string;
+        "2x": string;
+        "4x": string;
     };
     code: string;
     imageType: string;
@@ -18,7 +20,7 @@ export class FFZEmoteProvider extends ThirdPartyEmoteProvider<FFZEmotesResponse>
 
     private emoteMapper = (response: FFZEmotesResponse): ThirdPartyEmote[] =>
         response?.map(e => ({
-            url: e.images && e.images["1x"],
+            url: e.images && e.images["4x"] || e.images["2x"] || e.images["1x"] || "",
             code: e.code,
             animated: e.imageType?.toLowerCase() === "gif",
             origin: this.providerName
diff --git a/src/backend/chat/twitch-chat.ts b/src/backend/chat/twitch-chat.ts
index e5c06fb04..d220c09c2 100644
--- a/src/backend/chat/twitch-chat.ts
+++ b/src/backend/chat/twitch-chat.ts
@@ -6,7 +6,7 @@ import { ActiveUserHandler } from "./active-user-handler";
 import { FirebotDeviceAuthProvider } from "../auth/firebot-device-auth-provider";
 import { SharedChatCache } from "../streaming-platforms/twitch/chat/shared-chat-cache";
 import { TwitchApi } from "../streaming-platforms/twitch/api";
-import chatHelpers from "./chat-helpers";
+import { TwitchEventSubChatHelpers } from "../streaming-platforms/twitch/api/eventsub/eventsub-chat-helpers";
 import chatRolesManager from "../roles/chat-roles-manager";
 import twitchRolesManager from "../roles/twitch-roles-manager";
 import chatterPoll from "../streaming-platforms/twitch/chatter-poll";
@@ -112,7 +112,7 @@ class TwitchChat extends EventEmitter {
              * This is just to cache badges/emotes/cheermotes
              * Fire and forget this so we can get everything else setup
             */
-            void chatHelpers.cacheChatAssets();
+            void TwitchEventSubChatHelpers.cacheChatAssets();
 
             // Attempt to reload the known bot list in case it failed on start
             await chatRolesManager.cacheViewerListBots();
diff --git a/src/backend/common/EffectType.js b/src/backend/common/EffectType.js
index 323a6ce16..dab900e57 100644
--- a/src/backend/common/EffectType.js
+++ b/src/backend/common/EffectType.js
@@ -10,6 +10,7 @@ const Trigger = {
     SCHEDULED_TASK: "scheduled_task",
     COUNTER: "counter",
     CHANNEL_REWARD: "channel_reward",
+    POWER_UP: "power_up",
     MANUAL: "manual"
 };
 
diff --git a/src/backend/common/handlers/custom-scripts/custom-script-helpers.js b/src/backend/common/handlers/custom-scripts/custom-script-helpers.js
index 411b59d83..bffcda73f 100644
--- a/src/backend/common/handlers/custom-scripts/custom-script-helpers.js
+++ b/src/backend/common/handlers/custom-scripts/custom-script-helpers.js
@@ -102,7 +102,6 @@ function buildModules(scriptManifest) {
     return {
         spawn: require("child_process").spawn,
         childProcess: require("child_process"),
-        fs: require("fs-extra"),
         path: require("path"),
         JsonDb: require("node-json-db").JsonDB,
         moment: require("moment"),
diff --git a/src/backend/common/settings-manager.ts b/src/backend/common/settings-manager.ts
index 624b2b873..3ebda974a 100644
--- a/src/backend/common/settings-manager.ts
+++ b/src/backend/common/settings-manager.ts
@@ -60,7 +60,7 @@ class SettingsManager extends EventEmitter {
     private handleCorruptSettingsFile() {
         logger.warn("settings.json file appears to be corrupt. Resetting file...");
 
-        const settingsPath = this.getLoggedInProfilePath("settings.json");
+        const settingsPath = path.join(dataAccess.getUserDataPath(), this.getLoggedInProfilePath("settings.json"));
         fs.writeFileSync(settingsPath, JSON.stringify({
             settings: {
                 firstTimeUse: false
diff --git a/src/backend/crowbar-relay/crowbar-relay-websocket.ts b/src/backend/crowbar-relay/crowbar-relay-websocket.ts
index ec9f4d0ab..c7b3b68bf 100644
--- a/src/backend/crowbar-relay/crowbar-relay-websocket.ts
+++ b/src/backend/crowbar-relay/crowbar-relay-websocket.ts
@@ -52,16 +52,33 @@ class CrowbarRelayWebSocket extends TypedEmitter<{
             }
         });
 
+        let pingTimeout: NodeJS.Timeout;
+
+        function setPingTimeout() {
+            clearTimeout(pingTimeout);
+            pingTimeout = setTimeout(() => {
+                logger.warn("Crowbar Relay WebSocket ping timeout, reconnecting...");
+                this.ws.reconnect();
+            }, 75_000);
+        }
+
+        setPingTimeout();
+
         this.ws.addEventListener("open", () => {
             logger.info("Crowbar Relay WebSocket connected!");
             this.emit("ready");
         });
 
+        this.ws.addEventListener("ping", () => {
+            setPingTimeout();
+        });
+
         this.ws.addEventListener("error", (err) => {
             logger.error("Crowbar Relay WebSocket errored", err);
         });
 
         this.ws.addEventListener("close", (closedEvent) => {
+            clearTimeout(pingTimeout);
             const unauthorized = closedEvent.target?._ws?._req?.res?.statusCode === 401;
             if (unauthorized) {
                 logger.error("Crowbar Relay WebSocket unauthorized!");
diff --git a/src/backend/effects/builtin-effect-loader.js b/src/backend/effects/builtin-effect-loader.js
index eb3086a15..2dc9b6bee 100644
--- a/src/backend/effects/builtin-effect-loader.js
+++ b/src/backend/effects/builtin-effect-loader.js
@@ -44,7 +44,6 @@ exports.loadEffects = () => {
         'play-sound',
         'play-video', // No migration needed.
         'overlay-alert',
-        'random-effect',
         'random-reddit-image',
         'remove-user-metadata',
         'reset-timer',
@@ -52,7 +51,6 @@ exports.loadEffects = () => {
         'run-command',
         'run-program',
         'send-custom-websocket-event',
-        'sequential-effect',
         'set-output',
         'set-user-metadata',
         'shoutout',
@@ -80,7 +78,14 @@ exports.loadEffects = () => {
         'overlay-widgets/update-progress-bar',
         'overlay-widgets/update-dynamic-countdown',
         'overlay-widgets/set-custom-widget-state',
-        'overlay-widgets/send-message-to-custom-widget'
+        'overlay-widgets/send-message-to-custom-widget',
+
+        // Deprecated - remove after min 90 days post-release
+        'deprecated/show-text',
+
+        // Deprecated (no remove date)
+        'deprecated/random-effect',
+        'deprecated/sequential-effect',
     ].forEach((filename) => {
         const definition = require(`./builtin/${filename}`);
         EffectManager.registerEffect(definition);
diff --git a/src/backend/effects/builtin/clips.js b/src/backend/effects/builtin/clips.js
index 185d19d83..8d4faeea2 100644
--- a/src/backend/effects/builtin/clips.js
+++ b/src/backend/effects/builtin/clips.js
@@ -35,7 +35,29 @@ const clip = {
     },
     globalSettings: {},
     optionsTemplate: `
-        <eos-container>
+        <eos-container header="Creation Options">
+            <firebot-input
+                input-title="Clip Duration (secs)"
+                title-tooltip="Duration must be between 5 and 60 seconds."
+                model="effect.clipDuration"
+                placeholder-text="Enter Value"
+                menu-position="under"
+            />
+            <firebot-checkbox
+                label="Set custom clip title"
+                model="effect.useCustomTitle"
+                style="margin-top: 15px"
+            />
+            <firebot-input
+                ng-show="effect.useCustomTitle === true"
+                input-title="Title"
+                model="effect.title"
+                placeholder-text="Enter Value"
+                menu-position="under"
+            />
+        </eos-container>
+
+        <eos-container header="After Clip is Created" pad-top="true">
             <div style="padding-top:15px">
                 <label class="control-fb control--checkbox"> Post clip link in chat
                     <input type="checkbox" ng-model="effect.postLink">
@@ -136,12 +158,22 @@ const clip = {
             }
         };
 
+        if ($scope.effect.clipDuration == null || $scope.effect.clipDuration.length === 0) {
+            $scope.effect.clipDuration = 30;
+        }
+
+        if ($scope.effect.useCustomTitle == null) {
+            $scope.effect.useCustomTitle = false;
+        }
+
         if ($scope.effect.options == null) {
             $scope.effect.options = { };
         }
+
         if ($scope.effect.embedColor == null) {
             $scope.effect.embedColor = "#21b9ed";
         }
+
         if ($scope.effect.wait == null) {
             $scope.effect.wait = true;
         }
@@ -161,10 +193,6 @@ const clip = {
             }
         };
 
-        if ($scope.effect.clipDuration == null) {
-            $scope.effect.clipDuration = 30;
-        }
-
         $scope.hasChannels = false;
         $scope.channelOptions = {};
         $q.when(backendCommunicator.fireEventAsync("getDiscordChannels"))
@@ -189,6 +217,12 @@ const clip = {
     },
     optionsValidator: (effect) => {
         const errors = [];
+        if (!!effect.clipDuration?.length === false) {
+            errors.push("Please specify a clip duration.");
+        }
+        if (effect.useCustomTitle === true && !!effect.title?.length === false) {
+            errors.push("Please specify a clip title.");
+        }
         if (effect.postInDiscord && effect.discordChannelId == null) {
             errors.push("Please select Discord channel.");
         }
@@ -204,7 +238,24 @@ const clip = {
             await TwitchApi.chat.sendChatMessage("Creating clip...", null, true);
         }
 
-        const clip = await TwitchApi.clips.createClip();
+        let clipDuration = Number(effect.clipDuration);
+        if (isNaN(clipDuration) || clipDuration === 0) {
+            clipDuration = 30;
+        } else {
+            if (clipDuration < 5) {
+                clipDuration = 5;
+            }
+
+            if (clipDuration > 60) {
+                clipDuration = 60;
+            }
+        }
+
+        const title = effect.useCustomTitle === true && !!effect.title?.length
+            ? effect.title
+            : undefined;
+
+        const clip = await TwitchApi.clips.createClip(clipDuration, title);
 
         if (clip != null) {
             if (effect.postLink) {
diff --git a/src/backend/effects/builtin/random-effect.ts b/src/backend/effects/builtin/deprecated/random-effect.ts
similarity index 86%
rename from src/backend/effects/builtin/random-effect.ts
rename to src/backend/effects/builtin/deprecated/random-effect.ts
index e7977398e..5a4565a6b 100644
--- a/src/backend/effects/builtin/random-effect.ts
+++ b/src/backend/effects/builtin/deprecated/random-effect.ts
@@ -1,6 +1,6 @@
-import type { EffectList, EffectType } from "../../../types/effects";
+import type { EffectList, EffectType } from "../../../../types/effects";
 
-import effectRunner from "../../common/effect-runner";
+import effectRunner from "../../../common/effect-runner";
 
 const effect: EffectType<{
     effectList: EffectList;
@@ -11,13 +11,21 @@ const effect: EffectType<{
 }> = {
     definition: {
         id: "firebot:randomeffect",
-        name: "Run Random Effect",
+        name: "Run Random Effect (deprecated)",
         description: "Run a random effect from a list of effects",
         icon: "fad fa-random",
-        categories: ["advanced", "scripting"]
+        categories: ["advanced", "scripting"],
+        hidden: true,
+        deprecated: true
     },
     optionsTemplate: `
         <eos-container>
+            <div class="effect-info alert alert-warning">
+                WARNING: This effect has been deprecated. Instead, you can now use the <strong>Random</strong> run mode on any effect list.
+            </div>
+        </eos-container>
+
+        <eos-container pad-top="true">
             <p>This effect will run a random effect from the list below.</p>
 
             <div style="padding-top: 10px;">
diff --git a/src/backend/effects/builtin/sequential-effect.ts b/src/backend/effects/builtin/deprecated/sequential-effect.ts
similarity index 78%
rename from src/backend/effects/builtin/sequential-effect.ts
rename to src/backend/effects/builtin/deprecated/sequential-effect.ts
index 450057dc9..e5b53ea87 100644
--- a/src/backend/effects/builtin/sequential-effect.ts
+++ b/src/backend/effects/builtin/deprecated/sequential-effect.ts
@@ -1,5 +1,5 @@
-import type { EffectList, EffectType } from "../../../types/effects";
-import effectRunner from "../../common/effect-runner";
+import type { EffectList, EffectType } from "../../../../types/effects";
+import effectRunner from "../../../common/effect-runner";
 
 const effect: EffectType<{
     id: string;
@@ -8,14 +8,22 @@ const effect: EffectType<{
 }> = {
     definition: {
         id: "firebot:sequentialeffect",
-        name: "Run Sequential Effect",
+        name: "Run Sequential Effect (deprecated)",
         description: "Run a single effect sequentially from a list of effects",
         icon: "fad fa-list-ol",
         categories: ["advanced", "scripting"],
-        dependencies: []
+        dependencies: [],
+        hidden: true,
+        deprecated: true
     },
     optionsTemplate: `
     <eos-container>
+            <div class="effect-info alert alert-warning">
+                WARNING: This effect has been deprecated. Instead, you can now use the <strong>Sequential (Single)</strong> run mode on any effect list.
+            </div>
+        </eos-container>
+
+    <eos-container pad-top="true">
         <p>This effect will run a single effect sequentially from the list below. Particularly useful in Timers!</p>
     </eos-container>
 
diff --git a/src/backend/effects/builtin/show-text.js b/src/backend/effects/builtin/deprecated/show-text.js
similarity index 92%
rename from src/backend/effects/builtin/show-text.js
rename to src/backend/effects/builtin/deprecated/show-text.js
index f4e9aa0cc..b720fbee2 100644
--- a/src/backend/effects/builtin/show-text.js
+++ b/src/backend/effects/builtin/deprecated/show-text.js
@@ -1,9 +1,11 @@
 "use strict";
 
-const { SettingsManager } = require("../../common/settings-manager");
-const webServer = require("../../../server/http-server-manager");
-const logger = require("../../logwrapper");
-const mediaProcessor = require("../../common/handlers/mediaProcessor");
+const escapeHTML = require("escape-html");
+const { ReplaceVariableManager } = require("../../../variables/replace-variable-manager");
+const { SettingsManager } = require("../../../common/settings-manager");
+const webServer = require("../../../../server/http-server-manager");
+const logger = require("../../../logwrapper");
+const mediaProcessor = require("../../../common/handlers/mediaProcessor");
 
 /**
  * The Show Text effect
@@ -14,11 +16,14 @@ const showText = {
    */
     definition: {
         id: "firebot:showtext",
-        name: "Show Text",
+        name: "Show Text (DEPRECATED)",
         description: "Shows specified text in the overlay.",
         icon: "fad fa-text",
         categories: ["common", "overlay"],
-        dependencies: []
+        dependencies: [],
+        hidden: true,
+        deprecated: true,
+        keysExemptFromAutoVariableReplacement: ["text"]
     },
     /**
    * Global settings that will be available in the Settings tab
@@ -29,6 +34,12 @@ const showText = {
    * You can alternatively supply a url to a html file via optionTemplateUrl
    */
     optionsTemplate: `
+    <eos-container>
+        <div class="effect-info alert alert-warning">
+            WARNING: This version of the <strong>Show Text</strong> effect has been deprecated and will be removed in a future update. Either create a new <strong>Show Text</strong> effect, or if you want advanced HTML capability, create a new <strong>Show HTML</strong> effect.
+        </div>
+    </eos-container>
+
     <eos-container header="Text">
         <div ng-class="editorClass" replace-variables on-variable-insert="onVariableInsert(text)" menu-position="bottom">
             <summernote on-editor-ready="editorReady(editor)" ng-model="effect.text" config="editorOptions" editor="editor" editable="editable"></summernote>
@@ -236,6 +247,15 @@ const showText = {
         // What should this do when triggered.
         const effect = event.effect;
 
+        effect.text = await ReplaceVariableManager.populateStringWithTriggerData(
+            effect.text,
+            {
+                ...event.trigger,
+                effectOutputs: event.outputs
+            },
+            token => escapeHTML(token)
+        );
+
         //data transfer object
         const dto = {
             text: effect.text,
diff --git a/src/backend/effects/builtin/overlay-alert.ts b/src/backend/effects/builtin/overlay-alert.ts
index dfc340208..c77db155d 100644
--- a/src/backend/effects/builtin/overlay-alert.ts
+++ b/src/backend/effects/builtin/overlay-alert.ts
@@ -4,6 +4,7 @@
 
 import fs from "fs/promises";
 import path from "path";
+import escapeHTML from "escape-html";
 
 import type { EffectType, FirebotAudioDevice } from "../../../types";
 
@@ -664,10 +665,14 @@ const effect: EffectType<OverlayAlertEffect> = {
                 );
             }
 
-            effect.text = await ReplaceVariableManager.populateStringWithTriggerData(effect.text, {
-                ...event.trigger,
-                effectOutputs: event.outputs
-            });
+            effect.text = await ReplaceVariableManager.populateStringWithTriggerData(
+                effect.text,
+                {
+                    ...event.trigger,
+                    effectOutputs: event.outputs
+                },
+                (token: string) => escapeHTML(token)
+            );
         }
 
         const data: OverlayData = {
diff --git a/src/backend/effects/builtin/play-sound.ts b/src/backend/effects/builtin/play-sound.ts
index 317eae10a..f9ac6e610 100644
--- a/src/backend/effects/builtin/play-sound.ts
+++ b/src/backend/effects/builtin/play-sound.ts
@@ -158,9 +158,7 @@ const model: EffectType<{
             onOverlayEvent: (event) => {
                 const data = event;
                 const token = encodeURIComponent(data.resourceToken);
-                const resourcePath = `http://${
-                    window.location.hostname
-                }:7472/resource/${token}`;
+                const resourcePath = `//${baseUrl}/resource/${token}`;
 
                 // Generate UUID to use as class name.
 
diff --git a/src/backend/effects/builtin/play-video.js b/src/backend/effects/builtin/play-video.js
index 5106b8431..e14f3a73d 100644
--- a/src/backend/effects/builtin/play-video.js
+++ b/src/backend/effects/builtin/play-video.js
@@ -658,7 +658,8 @@ const playVideo = {
                 const loop = data.loop;
 
                 const token = encodeURIComponent(data.resourceToken);
-                const filepathNew = `http://${window.location.hostname}:7472/resource/${token}`;
+                // eslint-disable-next-line no-undef
+                const filepathNew = `//${baseUrl}/resource/${token}`;
 
                 // Generate UUID to use as id
 
diff --git a/src/backend/effects/builtin/show-image.js b/src/backend/effects/builtin/show-image.js
index 44cff0a77..e3496b152 100644
--- a/src/backend/effects/builtin/show-image.js
+++ b/src/backend/effects/builtin/show-image.js
@@ -247,7 +247,8 @@ const showImage = {
                     filepathNew = data.url;
                 } else {
                     const token = encodeURIComponent(data.resourceToken);
-                    filepathNew = `http://${window.location.hostname}:7472/resource/${token}`;
+                    // eslint-disable-next-line no-undef
+                    filepathNew = `//${baseUrl}/resource/${token}`;
                 }
 
                 // NEW WAY EXAMPLE:
diff --git a/src/backend/effects/builtin/show-text.ts b/src/backend/effects/builtin/show-text.ts
new file mode 100644
index 000000000..ee367f468
--- /dev/null
+++ b/src/backend/effects/builtin/show-text.ts
@@ -0,0 +1,352 @@
+import type {
+    EffectType,
+    OverlayPosition,
+    OverlayRotation,
+    OverlayEnterExitAnimations,
+    OverlayInstance,
+    FontOptions,
+} from "../../../types";
+import { SettingsManager } from "../../common/settings-manager";
+import mediaProcessor from "../../common/handlers/mediaProcessor";
+import webServer from "../../../server/http-server-manager";
+import logger from "../../logwrapper";
+
+type ShowTextEffectModel = {
+    text: string;
+    fontOptions: FontOptions;
+    addDropShadow: boolean;
+    duration: number;
+    height: number;
+    width: number;
+    wrapText: boolean;
+    showDebugBorder: boolean;
+    justify: "flex-start" | "center" | "flex-end";
+    align: "flex-start" | "center" | "flex-end";
+}
+& OverlayPosition
+& OverlayRotation
+& OverlayEnterExitAnimations
+& OverlayInstance;
+
+type ShowTextEffectOverlayData = {
+    text: string;
+    fontOptions: FontOptions;
+    addDropShadow: boolean;
+    inbetweenAnimation: string;
+    inbetweenDelay: number;
+    inbetweenDuration: number;
+    inbetweenRepeat: number;
+    enterAnimation: string;
+    enterDuration: number;
+    exitAnimation: string;
+    exitDuration: number;
+    customCoords: {
+        top: number;
+        bottom: number;
+        left: number;
+        right: number;
+    };
+    position: string;
+    duration: number;
+    height: number;
+    width: number;
+    justify: "flex-start" | "center" | "flex-end";
+    align: "flex-start" | "center" | "flex-end";
+    wrapText: boolean;
+    showDebugBorder: boolean;
+    overlayInstance: string;
+    rotation: string;
+    zIndex: number;
+}
+
+const ShowTextEffect: EffectType<ShowTextEffectModel, ShowTextEffectOverlayData> = {
+    definition: {
+        id: "firebot:show-text",
+        name: "Show Text",
+        description: "Shows specified text in the overlay",
+        icon: "fad fa-text",
+        categories: ["common", "overlay"],
+        dependencies: []
+    },
+    getDefaultLabel: (effect) => {
+        return effect.text;
+    },
+    optionsTemplate: `
+        <eos-container header="Text">
+            <firebot-input
+                model="effect.text"
+                use-text-area="true"
+            />
+        </eos-container>
+
+        <eos-container header="Style" pad-top="true">
+            <font-options
+                ng-model="effect.fontOptions"
+                allow-alpha="true"
+            />
+            <firebot-checkbox
+                model="effect.addDropShadow"
+                label="Drop Shadow"
+                style="margin-top: 10px;"
+            />
+        </eos-container>
+
+        <eos-container header="Duration" pad-top="true">
+            <firebot-input
+                model="effect.duration"
+                input-title="Seconds"
+                data-type="number"
+            />
+        </eos-container>
+
+        <eos-container header="Container Settings" pad-top="true">
+            <p>This defines the size of the (invisible) box that the above text will be placed in.</p>
+            <div class="form-group">
+                <firebot-input
+                    model="effect.width"
+                    input-title="Width (in pixels)"
+                    input-type="number"
+                    disable-variables="true"
+                />
+                <firebot-input
+                    model="effect.height"
+                    input-title="Height (in pixels)"
+                    input-type="number"
+                    disable-variables="true"
+                />
+            </div>
+
+            <firebot-checkbox
+                model="effect.wrapText"
+                label="Wrap Text"
+                style="margin-top: 10px;"
+            />
+
+            <firebot-checkbox
+                model="effect.showDebugBorder"
+                label="Show Debug Border"
+                tooltip="Show a red border around the text box to make it easier to see its position"
+                style="margin-top: 10px;"
+            />
+
+            <p style="margin-top: 5px;">Justification</p>
+            <firebot-radio-cards
+                options="justifyOptions"
+                ng-model="effect.justify"
+                grid-columns="3"
+            />
+
+            <p style="margin-top: 5px;">Alignment</p>
+            <firebot-radio-cards
+                options="alignOptions"
+                ng-model="effect.align"
+                grid-columns="3"
+            />
+        </eos-container>
+
+        <eos-overlay-position effect="effect" pad-top="true"></eos-overlay-position>
+
+        <eos-overlay-rotation effect="effect" pad-top="true"></eos-overlay-rotation>
+
+        <eos-enter-exit-animations effect="effect" pad-top="true"></eos-enter-exit-animations>
+
+        <eos-overlay-instance effect="effect" pad-top="true"></eos-overlay-instance>
+
+        <eos-container pad-top="true">
+            <div class="effect-info alert alert-warning">
+                This effect requires the Firebot overlay to be loaded in your broadcasting software. <a href ng-click="showOverlayInfoModal(effect.overlayInstance)" style="text-decoration:underline">Learn more</a>
+            </div>
+        </eos-container>
+    `,
+    optionsController: ($scope, utilityService) => {
+        $scope.justifyOptions = [
+            { value: "flex-start", label: "Left", iconClass: "fa-align-left"},
+            { value: "center", label: "Center", iconClass: "fa-align-center" },
+            { value: "flex-end", label: "Right", iconClass: "fa-align-right" }
+        ];
+
+        $scope.alignOptions = [
+            { value: "flex-start", label: "Top", iconClass: "fa-arrow-to-top"},
+            { value: "center", label: "Center", iconClass: "fa-border-center-h" },
+            { value: "flex-end", label: "Bottom", iconClass: "fa-arrow-to-bottom" }
+        ];
+
+        if ($scope.effect.fontOptions == null) {
+            $scope.effect.fontOptions = {
+                family: "Inter",
+                size: 24,
+                weight: 400,
+                italic: false
+            }
+        }
+
+        if ($scope.effect.height == null || $scope.effect.height < 1) {
+            $scope.effect.height = 200;
+        }
+
+        if ($scope.effect.width == null || $scope.effect.width < 1) {
+            $scope.effect.width = 400;
+        }
+
+        if ($scope.effect.justify == null) {
+            $scope.effect.justify = "center";
+        }
+
+        if ($scope.effect.align == null) {
+            $scope.effect.align = "center";
+        }
+
+        if ($scope.effect.wrapText == null) {
+            $scope.effect.wrapText = true;
+        }
+
+        $scope.showOverlayInfoModal = function(overlayInstance) {
+            utilityService.showOverlayInfoModal(overlayInstance);
+        };
+    },
+    optionsValidator: (effect) => {
+        const errors: string[] = [];
+        if (!effect.text?.length) {
+            errors.push("Please enter some text to show.");
+        }
+        return errors;
+    },
+    onTriggerEvent: async ({ effect }) => {
+        const dto: ShowTextEffectOverlayData = {
+            text: effect.text,
+            fontOptions: effect.fontOptions,
+            inbetweenAnimation: effect.inbetweenAnimation,
+            inbetweenDelay: effect.inbetweenDelay,
+            inbetweenDuration: effect.inbetweenDuration,
+            inbetweenRepeat: effect.inbetweenRepeat,
+            enterAnimation: effect.enterAnimation,
+            enterDuration: effect.enterDuration,
+            exitAnimation: effect.exitAnimation,
+            exitDuration: effect.exitDuration,
+            customCoords: effect.customCoords,
+            position: !!effect.position?.length ? effect.position : "Middle",
+            duration: effect.duration > 0 ? effect.duration : 5,
+            height: effect.height == null || effect.height < 1 ? 200 : effect.height,
+            width: effect.width == null || effect.width < 1 ? 400 : effect.width,
+            justify: effect.justify ?? "center",
+            align: effect.align ?? "center",
+            wrapText: effect.wrapText,
+            showDebugBorder: effect.showDebugBorder,
+            addDropShadow: effect.addDropShadow,
+            overlayInstance: effect.overlayInstance,
+            rotation: effect.rotation ? effect.rotation + effect.rotType : "0deg",
+            zIndex: effect.zIndex
+        };
+
+        const position = dto.position;
+        if (position === "Random") {
+            logger.debug("Getting random preset location");
+            dto.position = mediaProcessor.randomLocation();
+        }
+
+        if (SettingsManager.getSetting("UseOverlayInstances")) {
+            if (dto.overlayInstance != null) {
+                //reset overlay if it doesnt exist
+                if (!SettingsManager.getSetting("OverlayInstances").includes(dto.overlayInstance)) {
+                    dto.overlayInstance = null;
+                }
+            }
+        }
+
+        webServer.sendToOverlay("show-text", dto);
+        return true;
+    },
+    overlayExtension: {
+        event: {
+            name: "show-text",
+            onOverlayEvent: (event) => {
+                const data = event;
+
+                const positionData = {
+                    position: data.position,
+                    customCoords: data.customCoords
+                };
+
+                const animationData = {
+                    enterAnimation: data.enterAnimation,
+                    enterDuration: data.enterDuration,
+                    inbetweenAnimation: data.inbetweenAnimation,
+                    inbetweenDelay: data.inbetweenDelay,
+                    inbetweenDuration: data.inbetweenDuration,
+                    inbetweenRepeat: data.inbetweenRepeat,
+                    exitAnimation: data.exitAnimation,
+                    exitDuration: data.exitDuration,
+                    // @ts-ignore
+                    totalDuration: parseFloat(data.duration) * 1000
+                };
+
+                // @ts-ignore
+                const params = new URL(location).searchParams;
+
+                let textAlign: string = data.justify;
+                if (data.justify === "flex-start") {
+                    textAlign = "left";
+                } else if (data.justify === "flex-end") {
+                    textAlign = "right";
+                }
+
+                const textContainer = document.createElement("div");
+                textContainer.classList.add("text-container");
+
+                textContainer.style.height = `${data.height}px`;
+                textContainer.style.width = `${data.width}px`;
+                textContainer.style.justifyContent = data.justify;
+                textContainer.style.alignItems = data.align;
+                textContainer.style.textAlign = textAlign;
+
+                if (data.rotation) {
+                    textContainer.style.transform = `rotate(${data.rotation})`;
+                }
+
+                let borderColor = params.get("borderColor");
+                if ((borderColor == null || borderColor.length > 1) && data.showDebugBorder) {
+                    borderColor = "red";
+                }
+
+                if (borderColor) {
+                    textContainer.style.border = `2px solid ${borderColor}`;
+                }
+
+                if (data.zIndex) {
+                    textContainer.style.position = "relative";
+                    textContainer.style.zIndex = `${data.zIndex}`;
+                }
+
+                const textElement = document.createElement("div");
+                textElement.innerText = data.text;
+                textElement.style.width = "100%";
+                textElement.style.fontFamily = data.fontOptions.family;
+                textElement.style.fontSize = `${data.fontOptions.size}px`;
+                textElement.style.fontWeight = `${data.fontOptions.weight}`;
+                textElement.style.color = data.fontOptions.color ?? "#FFFFFF";
+
+                if (data.fontOptions.italic === true) {
+                    textElement.style.fontStyle = "italic";
+                }
+
+                if (data.addDropShadow) {
+                    textElement.style.textShadow = "2px 1px 3px rgb(2 2 2 / 33%)";
+                }
+
+                if (data.wrapText) {
+                    textElement.style.whiteSpace = "normal";
+                    textElement.style.wordWrap = "break-word";
+                } else {
+                    textElement.style.overflow = "hidden";
+                    textElement.style.whiteSpace = "nowrap";
+                }
+
+                textContainer.appendChild(textElement);
+
+                showElement(textContainer.outerHTML, positionData, animationData); // eslint-disable-line no-undef
+            }
+        }
+    }
+}
+
+export = ShowTextEffect;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/channel-live.ts b/src/backend/events/filters/builtin/twitch/channel-live.ts
index 8720e9974..dec8ae120 100644
--- a/src/backend/events/filters/builtin/twitch/channel-live.ts
+++ b/src/backend/events/filters/builtin/twitch/channel-live.ts
@@ -12,6 +12,7 @@ const filter: EventFilter = {
         { eventSourceId: "twitch", eventId: "bits-badge-unlocked" },
         { eventSourceId: "twitch", eventId: "category-changed" },
         { eventSourceId: "twitch", eventId: "channel-reward-redemption" },
+        { eventSourceId: "twitch", eventId: "power-up-redemption" },
         { eventSourceId: "twitch", eventId: "chat-message" },
         { eventSourceId: "twitch", eventId: "chat-mode-changed" },
         { eventSourceId: "twitch", eventId: "cheer" },
@@ -50,4 +51,4 @@ const filter: EventFilter = {
     }
 };
 
-export default filter;
\ No newline at end of file
+export default filter;
diff --git a/src/backend/events/filters/builtin/twitch/index.ts b/src/backend/events/filters/builtin/twitch/index.ts
index 67d7f05fc..b2b8e9002 100644
--- a/src/backend/events/filters/builtin/twitch/index.ts
+++ b/src/backend/events/filters/builtin/twitch/index.ts
@@ -10,6 +10,7 @@ import goldenKappaTrain from "./golden-kappa-train";
 import isAnonymous from "./is-anonymous";
 import lifetimeGiftCount from "./lifetime-gift-count";
 import message from "./message";
+import powerUp from "./power-up";
 import raidViewerCount from "./raid-viewer-count";
 import reward from "./reward";
 import rewardName from "./reward-name";
@@ -34,6 +35,7 @@ export default [
     isAnonymous,
     lifetimeGiftCount,
     message,
+    powerUp,
     raidViewerCount,
     rewardName,
     reward,
@@ -44,4 +46,4 @@ export default [
     subType,
     treasureTrain,
     username
-];
\ No newline at end of file
+];
diff --git a/src/backend/events/filters/builtin/twitch/power-up.ts b/src/backend/events/filters/builtin/twitch/power-up.ts
new file mode 100644
index 000000000..21345d6d0
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/power-up.ts
@@ -0,0 +1,20 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:power-up",
+    name: "Power-up",
+    description: "Filter to a Custom Power-up",
+    events: [{ eventSourceId: "twitch", eventId: "power-up-redemption" }],
+    eventMetaKey: "powerUpId",
+    allowIsNot: true,
+    presetValues: async (backendCommunicator: any) => {
+        const powerUps = await backendCommunicator.fireEventAsync("power-ups:get-all");
+        return powerUps.map(p => ({ value: p.id, display: p.twitchData.title }));
+    },
+    valueIsStillValid: async (filterSettings, backendCommunicator: any) => {
+        const powerUps = await backendCommunicator.fireEventAsync("power-ups:get-all");
+        return powerUps.some(p => p.id === filterSettings.value);
+    }
+});
+
+export default filter;
diff --git a/src/backend/events/filters/builtin/twitch/reward.ts b/src/backend/events/filters/builtin/twitch/reward.ts
index f34ebff6e..02f7b264f 100644
--- a/src/backend/events/filters/builtin/twitch/reward.ts
+++ b/src/backend/events/filters/builtin/twitch/reward.ts
@@ -4,14 +4,12 @@ const filter = createPresetFilter({
     id: "firebot:reward",
     name: "Reward",
     description: "Filter to a Custom Channel Reward",
-    events: [
-        { eventSourceId: "twitch", eventId: "channel-reward-redemption" }
-    ],
+    events: [{ eventSourceId: "twitch", eventId: "channel-reward-redemption" }],
     eventMetaKey: "rewardId",
     allowIsNot: true,
     presetValues: async (backendCommunicator: any) => {
         const rewards = await backendCommunicator.fireEventAsync("get-channel-rewards");
-        return rewards.map(r => ({value: r.id, display: r.twitchData.title}));
+        return rewards.map(r => ({ value: r.id, display: r.twitchData.title }));
     },
     valueIsStillValid: async (filterSettings, backendCommunicator: any) => {
         const rewards = await backendCommunicator.fireEventAsync("get-channel-rewards");
@@ -19,4 +17,4 @@ const filter = createPresetFilter({
     }
 });
 
-export default filter;
\ No newline at end of file
+export default filter;
diff --git a/src/backend/events/filters/builtin/twitch/username.ts b/src/backend/events/filters/builtin/twitch/username.ts
index 2019d2a8f..10c0aa5c4 100644
--- a/src/backend/events/filters/builtin/twitch/username.ts
+++ b/src/backend/events/filters/builtin/twitch/username.ts
@@ -18,6 +18,7 @@ const filter = createTextFilter({
         { eventSourceId: "twitch", eventId: "viewer-arrived" },
         { eventSourceId: "twitch", eventId: "community-subs-gifted" },
         { eventSourceId: "twitch", eventId: "channel-reward-redemption" },
+        { eventSourceId: "twitch", eventId: "power-up-redemption" },
         { eventSourceId: "twitch", eventId: "viewer-arrived" },
         { eventSourceId: "twitch", eventId: "chat-message" },
         { eventSourceId: "twitch", eventId: "announcement" },
diff --git a/src/backend/hotkeys/hotkey-manager.ts b/src/backend/hotkeys/hotkey-manager.ts
index ff5ee0089..0dc27a36b 100644
--- a/src/backend/hotkeys/hotkey-manager.ts
+++ b/src/backend/hotkeys/hotkey-manager.ts
@@ -1,4 +1,4 @@
-import { globalShortcut } from "electron";
+import { app, globalShortcut } from "electron";
 
 import { FirebotHotkey } from "../../types/hotkeys";
 import { Trigger } from "../../types/triggers";
@@ -15,6 +15,9 @@ class HotkeyManager extends JsonDbManager<FirebotHotkey> {
     constructor() {
         super("Hotkey", "hotkeys");
 
+        // Enable usage of Portal's globalShortcuts which improves capability with Wayland on Linux
+        app.commandLine.appendSwitch('enable-features', 'GlobalShortcutsPortal');
+
         frontendCommunicator.on("hotkeys:get-hotkeys",
             () => this.getAllItems());
 
diff --git a/src/backend/integrations/builtin/obs/constants.ts b/src/backend/integrations/builtin/obs/constants.ts
index a889577b0..d3fb84c8d 100644
--- a/src/backend/integrations/builtin/obs/constants.ts
+++ b/src/backend/integrations/builtin/obs/constants.ts
@@ -5,6 +5,7 @@ export const OBS_STREAM_STOPPED_EVENT_ID = "stream-stopped";
 export const OBS_RECORDING_STARTED_EVENT_ID = "recording-started";
 export const OBS_RECORDING_STOPPED_EVENT_ID = "recording-stopped";
 export const OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID = "scene-item-enable-state-changed";
+export const OBS_SCENE_ITEM_LIST_REINDEXED_EVENT_ID = "scene-item-list-reindexed";
 export const OBS_SCENE_TRANSITION_STARTED_EVENT_ID = "scene-transition-started";
 export const OBS_SCENE_TRANSITION_ENDED_EVENT_ID = "scene-transition-ended";
 export const OBS_CURRENT_PROGRAM_SCENE_CHANGED_EVENT_ID = "current-program-scene-changed";
@@ -28,3 +29,4 @@ export const OBS_INPUT_AUDIO_TRACKS_CHANGED_EVENT_ID = "input-audio-tracks-chang
 export const OBS_INPUT_AUDIO_MONITOR_TYPE_CHANGED_EVENT_ID = "input-audio-monitor-type-changed";
 export const OBS_CONNECTED_EVENT_ID = "connected";
 export const OBS_DISCONNECTED_EVENT_ID = "disconnected";
+export const OBS_EXITING_EVENT_ID = "exiting";
diff --git a/src/backend/integrations/builtin/obs/events/obs-event-source.ts b/src/backend/integrations/builtin/obs/events/obs-event-source.ts
index 0dc76095c..f1da9caf1 100644
--- a/src/backend/integrations/builtin/obs/events/obs-event-source.ts
+++ b/src/backend/integrations/builtin/obs/events/obs-event-source.ts
@@ -13,6 +13,7 @@ import {
     OBS_REPLAY_BUFFER_SAVED_EVENT_ID,
     OBS_SCENE_CHANGED_EVENT_ID,
     OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID,
+    OBS_SCENE_ITEM_LIST_REINDEXED_EVENT_ID,
     OBS_SCENE_TRANSITION_ENDED_EVENT_ID,
     OBS_SCENE_TRANSITION_STARTED_EVENT_ID,
     OBS_STREAM_STARTED_EVENT_ID,
@@ -29,7 +30,8 @@ import {
     OBS_INPUT_AUDIO_BALANCE_CHANGED_EVENT_ID,
     OBS_INPUT_AUDIO_SYNC_OFFSET_CHANGED_EVENT_ID,
     OBS_INPUT_AUDIO_MONITOR_TYPE_CHANGED_EVENT_ID,
-    OBS_INPUT_AUDIO_TRACKS_CHANGED_EVENT_ID
+    OBS_INPUT_AUDIO_TRACKS_CHANGED_EVENT_ID,
+    OBS_EXITING_EVENT_ID
 } from "../constants";
 
 export const OBSEventSource: EventSource = {
@@ -92,6 +94,14 @@ export const OBSEventSource: EventSource = {
                 sceneName: "Test Scene Name"
             }
         },
+        {
+            id: OBS_SCENE_ITEM_LIST_REINDEXED_EVENT_ID,
+            name: "OBS Scene Item List Reindexed",
+            description: "When the items in a scene have been re-ordered",
+            manualMetadata: {
+                sceneName: "Test Scene Name"
+            }
+        },
         {
             id: OBS_SCENE_TRANSITION_STARTED_EVENT_ID,
             name: "OBS Scene Transition Started",
@@ -288,6 +298,11 @@ export const OBSEventSource: EventSource = {
                     value: "OBS_MONITORING_TYPE_NONE"
                 }
             }
+        },
+        {
+            id: OBS_EXITING_EVENT_ID,
+            name: "OBS Exiting",
+            description: "When OBS signals that it is exiting/closing"
         }
     ]
 };
\ No newline at end of file
diff --git a/src/backend/integrations/builtin/obs/filters/scene-name-filter.ts b/src/backend/integrations/builtin/obs/filters/scene-name-filter.ts
index 7a8ab41ca..8f9b641a2 100644
--- a/src/backend/integrations/builtin/obs/filters/scene-name-filter.ts
+++ b/src/backend/integrations/builtin/obs/filters/scene-name-filter.ts
@@ -3,7 +3,8 @@ import { EventFilter } from "../../../../../types/events";
 import {
     OBS_EVENT_SOURCE_ID,
     OBS_SCENE_CHANGED_EVENT_ID,
-    OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID
+    OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID,
+    OBS_SCENE_ITEM_LIST_REINDEXED_EVENT_ID
 } from "../constants";
 
 const filter: EventFilter = createPresetFilter({
@@ -12,7 +13,8 @@ const filter: EventFilter = createPresetFilter({
     description: "Filter on the name of the now active OBS scene",
     events: [
         { eventSourceId: OBS_EVENT_SOURCE_ID, eventId: OBS_SCENE_CHANGED_EVENT_ID },
-        { eventSourceId: OBS_EVENT_SOURCE_ID, eventId: OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID }
+        { eventSourceId: OBS_EVENT_SOURCE_ID, eventId: OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID },
+        { eventSourceId: OBS_EVENT_SOURCE_ID, eventId: OBS_SCENE_ITEM_LIST_REINDEXED_EVENT_ID }
     ],
     eventMetaKey: "sceneName",
     allowIsNot: true,
diff --git a/src/backend/integrations/builtin/obs/obs-remote.ts b/src/backend/integrations/builtin/obs/obs-remote.ts
index 2a6aa408e..bc9d19983 100644
--- a/src/backend/integrations/builtin/obs/obs-remote.ts
+++ b/src/backend/integrations/builtin/obs/obs-remote.ts
@@ -12,6 +12,7 @@ import {
     OBS_REPLAY_BUFFER_SAVED_EVENT_ID,
     OBS_SCENE_CHANGED_EVENT_ID,
     OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID,
+    OBS_SCENE_ITEM_LIST_REINDEXED_EVENT_ID,
     OBS_SCENE_TRANSITION_ENDED_EVENT_ID,
     OBS_SCENE_TRANSITION_STARTED_EVENT_ID,
     OBS_STREAM_STARTED_EVENT_ID,
@@ -30,7 +31,8 @@ import {
     OBS_INPUT_AUDIO_MONITOR_TYPE_CHANGED_EVENT_ID,
     OBS_INPUT_AUDIO_TRACKS_CHANGED_EVENT_ID,
     OBS_CONNECTED_EVENT_ID,
-    OBS_DISCONNECTED_EVENT_ID
+    OBS_DISCONNECTED_EVENT_ID,
+    OBS_EXITING_EVENT_ID
 } from "./constants";
 import logger from "../../../logwrapper";
 
@@ -402,6 +404,14 @@ async function setupRemoteListeners() {
         );
     });
 
+    obs.on("ExitStarted", () => {
+        eventManager?.triggerEvent(
+            OBS_EVENT_SOURCE_ID,
+            OBS_EXITING_EVENT_ID,
+            { }
+        );
+    });
+
     obs.on("CurrentSceneCollectionChanged", async () => {
         await refreshGroupsAndScenes();
     });
@@ -519,6 +529,14 @@ async function setupRemoteListeners() {
                 groupInfos[gidx].scenes[sidx].itemId = gis.id;
             }
         });
+
+        eventManager.triggerEvent(
+            OBS_EVENT_SOURCE_ID,
+            OBS_SCENE_ITEM_LIST_REINDEXED_EVENT_ID,
+            {
+                sceneName
+            }
+        );
     });
 
     obs.on("StudioModeStateChanged", async ({ studioModeEnabled }) => {
diff --git a/src/backend/overlay-widgets/builtin-types/chat/chat-advanced.ts b/src/backend/overlay-widgets/builtin-types/chat/chat-advanced.ts
new file mode 100644
index 000000000..eaab50896
--- /dev/null
+++ b/src/backend/overlay-widgets/builtin-types/chat/chat-advanced.ts
@@ -0,0 +1,750 @@
+import type {
+    FirebotChatMessage,
+    OverlayWidgetType,
+    IOverlayWidgetEventUtils,
+    WidgetOverlayEvent,
+    Animation
+} from "../../../../types";
+
+import type {
+    ChatWidgetState,
+    ChatMessageMessageData,
+    DeleteMessageMessageData,
+    DeleteUserMessagesMessageData
+} from "./chat";
+
+export type AdvancedChatWidgetSettings = {
+    cssTemplate: string;
+
+    defaultMessageHtmlTemplate: string;
+
+    useSeparateTemplateForActions: boolean;
+    actionHtmlTemplate?: string;
+
+    useSeparateTemplateForHighlightedMessages: boolean;
+    highlightedMessageHtmlTemplate?: string;
+
+    showSharedChatMessages: boolean;
+    useSeparateTemplateForSharedMessages?: boolean;
+    sharedChatMessageHtmlTemplate?: string;
+
+    showAnnouncements: boolean;
+    useSeparateTemplateForAnnouncements?: boolean;
+    announcementHtmlTemplate?: string;
+
+    delayMessages: boolean;
+    messageDelay?: number;
+    newMessageEntryAnimation: Animation;
+    autoRemoveMessages: boolean;
+    messageTimeout?: number;
+    messageExitAnimation?: Animation;
+    thirdPartyEmotes: string[];
+    hiddenUsers: string[];
+};
+
+
+export const chatAdvanced: OverlayWidgetType<AdvancedChatWidgetSettings, ChatWidgetState> = {
+    id: "firebot:chat-advanced",
+    name: "Chat (Advanced)",
+    description: "An advanced chat feed for the overlay where you provide the HTML and CSS used to generate the widget content.",
+    icon: "fa fa-comments-alt-dollar",
+    userCanConfigure: {
+        entryAnimation: false,
+        exitAnimation: false
+    },
+    settingsSchema: [
+        {
+            name: "cssTemplate",
+            title: "CSS Template",
+            description: `Any CSS styles, along with custom CSS classes, that you want to use in your widget. This value will automatically be put inside of a \`<style>\` tag.
+
+The following fields will automatically get replaced with their corresponding CSS class names:
+- \`{{messageContainerClass}}\`: The \`<div>\` element automatically created by the widget that contains all the chat messages in this widget. Any new messages will be added as a child of this element.
+- \`{{messageClass}}\`: A \`<div>\` element automatically created by the widget that contains a single message.`,
+            type: "codemirror",
+            default: "",
+            settings: {
+                mode: "css",
+                theme: "blackboard"
+            }
+        },
+        {
+            name: "defaultMessageHtmlTemplate",
+            title: "Default Message HTML Template",
+            description: `The default message HTML template to use when generating the widget.
+
+The following fields are available in messages:
+- \`{{avatarUrl}}\`: URL for the chatter's avatar
+- \`{{badges}}\`: HTML snippet for badges (i.e. each badge is converted to an \`<img>\` tag)
+- \`{{chatMessage}}\`: Chat message with formatted emotes and cheermotes (e.g. emotes are converted to \`<img>\` tags)
+- \`{{chatMessageRawText}}\`: Raw text of the chat message with no formatting for emotes, cheermotes, etc.
+- \`{{pronouns}}\`: Chatter's pronouns, if set
+- \`{{timestamp}}\`: Timestamp of when the message
+- \`{{username}}\`: Chatter's display name
+- \`{{usernameColor}}\`: Hex format of chatter's username color (e.g. \`#0066FF\`)`,
+            type: "codemirror",
+            default: "",
+            settings: {
+                mode: "htmlmixed",
+                theme: "blackboard"
+            },
+            showBottomHr: true
+        },
+        {
+            name: "useSeparateTemplateForActions",
+            title: "Use Separate Template for Actions",
+            description: "Whether or not to use a different HTML template for `/me` actions",
+            type: "boolean",
+            default: true
+        },
+        {
+            name: "actionHtmlTemplate",
+            title: "Action HTML Template",
+            description: "HTML template to use for `/me` actions. The same fields in the default message template are available here.",
+            type: "codemirror",
+            default: "",
+            settings: {
+                mode: "htmlmixed",
+                theme: "blackboard"
+            },
+            showIf: {
+                useSeparateTemplateForActions: true
+            },
+            showBottomHr: true
+        },
+        {
+            name: "useSeparateTemplateForHighlightedMessages",
+            title: "Use Separate Template for Highlighted Messages",
+            description: "Whether or not to use a different HTML template for messages sent using the \"Highlight My Message\" channel point reward.",
+            type: "boolean",
+            default: true
+        },
+        {
+            name: "highlightedMessageHtmlTemplate",
+            title: "Highlighted Message HTML Template",
+            description: "HTML template to use for messages sent using the \"Highlight My Message\" channel point reward. The same fields in the default message template are available here.",
+            type: "codemirror",
+            default: "",
+            settings: {
+                mode: "htmlmixed",
+                theme: "blackboard"
+            },
+            showIf: {
+                useSeparateTemplateForHighlightedMessages: true
+            },
+            showBottomHr: true
+        },
+        {
+            name: "showSharedChatMessages",
+            title: "Show Shared Chat Messages",
+            description: "Display chat messages sent from other channels during a shared chat session",
+            type: "boolean",
+            default: false
+        },
+        {
+            name: "useSeparateTemplateForSharedMessages",
+            title: "Use Separate Template for Shared Chat Messages",
+            description: "Whether or not to use a different HTML template for messages sent from other channels during a shared chat session.",
+            type: "boolean",
+            default: true,
+            showIf: {
+                showSharedChatMessages: true
+            }
+        },
+        {
+            name: "sharedChatMessageHtmlTemplate",
+            title: "Shared Chat Message HTML Template",
+            description: `HTML template to use for messages sent from other channels during a shared chat session.
+
+ The same fields in the default message template are available here, plus these additional fields:
+ - \`{{sharedChatRoomChannel}}\`: The display name of the external channel where the message was sent.
+ - \`{{sharedChatRoomAvatarUrl}}\`: The avatar URL of the external channel where the message was sent.`,
+            type: "codemirror",
+            default: "",
+            settings: {
+                mode: "htmlmixed",
+                theme: "blackboard"
+            },
+            showIf: {
+                showSharedChatMessages: true,
+                useSeparateTemplateForSharedMessages: true
+            },
+            showBottomHr: true
+        },
+        {
+            name: "showAnnouncements",
+            title: "Show Announcements",
+            description: "Display chat announcements sent from the streamer or moderators",
+            type: "boolean",
+            default: false
+        },
+        {
+            name: "useSeparateTemplateForAnnouncements",
+            title: "Use Separate Template for Announcements",
+            description: "Whether or not to use a different HTML template for announcements.",
+            type: "boolean",
+            default: true,
+            showIf: {
+                showAnnouncements: true
+            }
+        },
+        {
+            name: "announcementHtmlTemplate",
+            title: "Announcement HTML Template",
+            description: `HTML template to use for announcements.
+
+The same fields in the default message template are available here, plus these additional fields:
+- \`{{announcementColor}}\`: The name of the announcement color. It will be one of the following values: \`PRIMARY\`, \`BLUE\`, \`GREEN\`, \`ORANGE\`, or \`PURPLE\`.`,
+            type: "codemirror",
+            default: "",
+            settings: {
+                mode: "htmlmixed",
+                theme: "blackboard"
+            },
+            showIf: {
+                showAnnouncements: true,
+                useSeparateTemplateForAnnouncements: true
+            },
+            showBottomHr: true
+        },
+        {
+            name: "delayMessages",
+            title: "Add Message Delay",
+            description: "Adds a delay between when a message arrives and when it is sent to the widget. Useful for moderation.",
+            type: "boolean",
+            default: false
+        },
+        {
+            name: "messageDelay",
+            title: "Message Delay",
+            description: "How long (in seconds) to wait before sending a chat message to the widget",
+            type: "number",
+            default: 0,
+            showIf: {
+                delayMessages: true
+            }
+        },
+        {
+            name: "newMessageEntryAnimation",
+            title: "New Message Entry Animation",
+            description: "Animation to use when new messages arrive",
+            type: "animation-select",
+            animationType: "enter"
+        },
+        {
+            name: "autoRemoveMessages",
+            title: "Automatically Remove Messages",
+            description: "Removes messages from the chat widget after a specified amount of time",
+            type: "boolean",
+            default: false
+        },
+        {
+            name: "messageTimeout",
+            title: "Message Timeout",
+            description: "Amount of time (in seconds) to automatically remove chat messages from the widget",
+            type: "number",
+            default: 10,
+            showIf: {
+                autoRemoveMessages: true
+            }
+        },
+        {
+            name: "messageExitAnimation",
+            title: "Message Exit Animation",
+            description: "Animation to use when messages are automatically removed from the widget",
+            type: "animation-select",
+            animationType: "exit",
+            showIf: {
+                autoRemoveMessages: true
+            }
+        },
+        {
+            name: "thirdPartyEmotes",
+            title: "Enabled Third-Party Emote Providers",
+            description: "NOTE: Any third-party emote services enabled here must also be enabled in Dashboard settings in order to show emotes from those services.",
+            type: "multiselect",
+            default: [],
+            settings: {
+                options: [
+                    {
+                        id: "BTTV",
+                        name: "BTTV"
+                    },
+                    {
+                        id: "7TV",
+                        name: "7TV"
+                    },
+                    {
+                        id: "FFZ",
+                        name: "FFZ"
+                    }
+                ]
+            }
+        },
+        {
+            name: "hiddenUsers",
+            title: "Hidden Users",
+            description: "List of usernames whose messages will not be displayed in the chat widget",
+            type: "editable-list",
+            default: [],
+            settings: {
+                useTextArea: false,
+                sortable: true,
+                addLabel: "Add Username",
+                editLabel: "Edit Username",
+                noneAddedText: "No users hidden in chat widget"
+            }
+        }
+    ],
+    initialState: {
+        chatMessages: []
+    },
+    supportsLivePreview: true,
+    livePreviewState: {
+        chatMessages: [
+            {
+                id: "",
+                timestamp: 1777003200000,
+                username: "firebot",
+                userId: "0",
+                userDisplayName: "Firebot",
+                profilePicUrl: "https://firebot.app/_next/image?url=%2Ffirebot-logo.png&w=96&q=75",
+                color: "#FFCA03",
+                rawText: "thinks chat widgets are neat",
+                badges: [
+                    {
+                        title: "moderator",
+                        url: "https://static-cdn.jtvnw.net/badges/v1/3267646d-33f0-4b17-b3df-f923a41db1d0/1"
+                    }
+                ],
+                parts: [
+                    {
+                        type: "text",
+                        text: "thinks chat widgets are neat"
+                    }
+                ],
+                action: true,
+                whisper: false,
+                tagged: false,
+                isSharedChatMessage: false,
+                sharedChatRoomProfilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/4fe04c1f-8390-4ded-bcb0-cae9b1d7cb9c-profile_image-70x70.png",
+                roles: []
+            },
+            {
+                id: "",
+                timestamp: 1777003260000,
+                username: "zunderscore",
+                userId: "0",
+                userDisplayName: "zunderscore",
+                profilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/4fe04c1f-8390-4ded-bcb0-cae9b1d7cb9c-profile_image-70x70.png",
+                pronouns: "He/Him",
+                color: "#0066FF",
+                rawText: "Wow, this IS really neat! zunder2Wow",
+                badges: [
+                    {
+                        title: "broadcaster",
+                        url: "https://static-cdn.jtvnw.net/badges/v1/5527c58c-fb7d-422d-b71b-f309dcb85cc1/2"
+                    }
+                ],
+                parts: [
+                    {
+                        type: "text",
+                        text: "Wow, this IS really neat! "
+                    },
+                    {
+                        type: "emote",
+                        url: "https://static-cdn.jtvnw.net/emoticons/v2/emotesv2_ad007f2d2f77444295c883b0a6eaf572/static/light/3.0",
+                        name: "zunder2Wow"
+                    }
+                ],
+                action: false,
+                whisper: false,
+                tagged: false,
+                isSharedChatMessage: false,
+                sharedChatRoomProfilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/4fe04c1f-8390-4ded-bcb0-cae9b1d7cb9c-profile_image-70x70.png",
+                roles: []
+            },
+            {
+                id: "",
+                timestamp: 1777003260000,
+                username: "ebiggz",
+                userId: "0",
+                userDisplayName: "ebiggz",
+                profilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/5545fe76-a341-4ffb-bc79-7ca8075588a1-profile_image-70x70.png",
+                pronouns: "He/Him",
+                color: "#00d1ff",
+                rawText: "Yo, what's going on over there?",
+                badges: [
+                    {
+                        title: "glhf",
+                        url: "https://static-cdn.jtvnw.net/badges/v1/3158e758-3cb4-43c5-94b3-7639810451c5/2"
+                    }
+                ],
+                parts: [
+                    {
+                        type: "text",
+                        text: "Yo, what's going on over there?"
+                    }
+                ],
+                action: false,
+                whisper: false,
+                tagged: false,
+                isSharedChatMessage: true,
+                sharedChatRoomDisplayName: "ebiggz",
+                sharedChatRoomProfilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/5545fe76-a341-4ffb-bc79-7ca8075588a1-profile_image-70x70.png",
+                roles: []
+            },
+            {
+                id: "",
+                timestamp: 1777003320000,
+                username: "zunderscore",
+                userId: "0",
+                userDisplayName: "zunderscore",
+                profilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/4fe04c1f-8390-4ded-bcb0-cae9b1d7cb9c-profile_image-70x70.png",
+                pronouns: "He/Him",
+                color: "#0066FF",
+                rawText: "Super cool stuff!",
+                badges: [
+                    {
+                        title: "broadcaster",
+                        url: "https://static-cdn.jtvnw.net/badges/v1/5527c58c-fb7d-422d-b71b-f309dcb85cc1/2"
+                    }
+                ],
+                parts: [
+                    {
+                        type: "text",
+                        text: "Super cool stuff!"
+                    }
+                ],
+                action: false,
+                whisper: false,
+                tagged: false,
+                isSharedChatMessage: false,
+                sharedChatRoomProfilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/4fe04c1f-8390-4ded-bcb0-cae9b1d7cb9c-profile_image-70x70.png",
+                isHighlighted: true,
+                roles: []
+            },
+            {
+                id: "",
+                timestamp: 1777003320000,
+                username: "firebot",
+                userId: "0",
+                userDisplayName: "Firebot",
+                profilePicUrl: "https://firebot.app/_next/image?url=%2Ffirebot-logo.png&w=96&q=75",
+                color: "#FFCA03",
+                rawText: "Don't forget to show love to your fellow Firebot users! <3",
+                badges: [
+                    {
+                        title: "moderator",
+                        url: "https://static-cdn.jtvnw.net/badges/v1/3267646d-33f0-4b17-b3df-f923a41db1d0/1"
+                    }
+                ],
+                parts: [
+                    {
+                        type: "text",
+                        text: "Don't forget to show love to your fellow Firebot users! "
+                    },
+                    {
+                        type: "emote",
+                        url: "https://static-cdn.jtvnw.net/emoticons/v2/9/default/dark/2.0#e=0",
+                        name: "<3"
+                    }
+                ],
+                action: false,
+                isAnnouncement: true,
+                announcementColor: "ORANGE",
+                whisper: false,
+                tagged: false,
+                isSharedChatMessage: false,
+                sharedChatRoomProfilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/4fe04c1f-8390-4ded-bcb0-cae9b1d7cb9c-profile_image-70x70.png",
+                roles: []
+            }
+        ]
+    },
+    uiActions: [
+        {
+            id: "clear",
+            label: "Clear Chat Widget",
+            icon: "fa-minus-circle",
+            click: () => {
+                return {
+                    newState: {
+                        chatMessages: null
+                    }
+                };
+            }
+        }
+    ],
+    overlayExtension: {
+        eventHandler: (event: WidgetOverlayEvent<AdvancedChatWidgetSettings, ChatWidgetState>, utils: IOverlayWidgetEventUtils) => {
+            const generateChatMessageHtml = (
+                chatMessage: FirebotChatMessage,
+                config: typeof event["data"]["widgetConfig"]
+            ): string | undefined => {
+                // Ignore AutoModded messages that aren't approved
+                if (chatMessage.autoModStatus === "pending"
+                        || chatMessage.autoModStatus === "denied"
+                        || chatMessage.autoModStatus === "expired") {
+                    return;
+                }
+
+                // Check the ignore list
+                if (config.settings.hiddenUsers?.some(u =>
+                    u.toLowerCase() === chatMessage.username.toLowerCase() || u.toLowerCase() === chatMessage.userDisplayName?.toLowerCase()
+                )) {
+                    return;
+                }
+
+                let templateBase = config.settings.defaultMessageHtmlTemplate;
+
+                // Don't render announcements unless we specifically want them
+                if (chatMessage.isAnnouncement === true) {
+                    if (config.settings.showAnnouncements !== true) {
+                        return;
+                    } else if (config.settings.useSeparateTemplateForAnnouncements === true) {
+                        templateBase = (config.settings.announcementHtmlTemplate ?? "")
+                            .replaceAll("{{announcementColor}}", chatMessage.announcementColor ?? "PRIMARY");
+                    }
+                }
+
+                // Same with shared chat messages
+                if (chatMessage.isSharedChatMessage === true) {
+                    if (config.settings.showSharedChatMessages !== true) {
+                        return;
+                    } else if (config.settings.useSeparateTemplateForSharedMessages === true) {
+                        templateBase = (config.settings.sharedChatMessageHtmlTemplate ?? "")
+                            .replaceAll("{{sharedChatRoomChannel}}", chatMessage.sharedChatRoomDisplayName ?? chatMessage.sharedChatRoomUsername ?? "")
+                            .replaceAll("{{sharedChatRoomAvatarUrl}}", chatMessage.sharedChatRoomProfilePicUrl ?? "");
+                    }
+                }
+
+                if (chatMessage.action === true
+                    && config.settings.useSeparateTemplateForActions === true
+                ) {
+                    templateBase = config.settings.actionHtmlTemplate ?? "";
+                }
+
+                if (chatMessage.isHighlighted === true
+                    && config.settings.useSeparateTemplateForHighlightedMessages === true
+                ) {
+                    templateBase = config.settings.highlightedMessageHtmlTemplate ?? "";
+                }
+
+                const messageClass = `chat-message-${config.id}`;
+
+                templateBase = `<div
+                    class="${messageClass}"
+                    data-message-id="${chatMessage.id}"
+                    data-username="${chatMessage.username}"
+                >${templateBase}</div>`;
+
+                let timestampString: string;
+                if (chatMessage.timestamp) {
+                    const timestampAsDate = new Date(chatMessage.timestamp);
+                    const hours = timestampAsDate.getHours() % 12 === 0
+                        ? "12"
+                        : timestampAsDate.getHours() % 12;
+                    const minutes = String(timestampAsDate.getMinutes()).padStart(2, "0");
+
+                    timestampString = `${hours}:${minutes}`;
+                }
+
+                let badgeHtml = "";
+                for (const badge of chatMessage.badges) {
+                    const badgeElem = document.createElement("img");
+                    badgeElem.src = badge.url;
+                    badgeElem.alt = badge.title;
+
+                    badgeHtml += badgeElem.outerHTML;
+                }
+
+                const chatMessagePartsHtml: Array<string> = [];
+
+                for (const part of chatMessage.parts) {
+                    switch (part.type) {
+                        case "emote":
+                            {
+                                const emoteElem = document.createElement("img");
+                                emoteElem.src = (part.animatedUrl ?? part.url)!;
+                                emoteElem.alt = part.name!;
+
+                                chatMessagePartsHtml.push(emoteElem.outerHTML);
+                            }
+                            break;
+
+                        case "third-party-emote":
+                            if (config.settings.thirdPartyEmotes.some(e => e === part.origin)) {
+                                const emoteElem = document.createElement("img");
+                                emoteElem.src = (part.animatedUrl ?? part.url)!;
+                                emoteElem.alt = part.name!;
+
+                                chatMessagePartsHtml.push(emoteElem.outerHTML);
+                            } else {
+                                chatMessagePartsHtml.push(part.name);
+                            }
+                            break;
+
+                        case "cheermote":
+                            {
+                                const cheermoteElem = document.createElement("img");
+                                cheermoteElem.src = (part.animatedUrl ?? part.url)!;
+                                cheermoteElem.alt = part.name!;
+
+                                const cheerAmountElem = document.createElement("strong");
+                                cheerAmountElem.style.color = part.color!;
+                                cheerAmountElem.innerText = `${part.amount}`;
+
+                                chatMessagePartsHtml.push(cheermoteElem.outerHTML);
+                                chatMessagePartsHtml.push(cheerAmountElem.outerHTML);
+                            }
+                            break;
+
+                        case "link":
+                            chatMessagePartsHtml.push(part.url);
+                            break;
+
+                        default:
+                            chatMessagePartsHtml.push(part.text);
+                    }
+                }
+
+                return templateBase
+                    .replaceAll("{{timestamp}}", timestampString)
+                    .replaceAll("{{avatarUrl}}", chatMessage.profilePicUrl ?? "")
+                    .replaceAll("{{badges}}", badgeHtml)
+                    .replaceAll("{{username}}", chatMessage.userDisplayName ?? chatMessage.username)
+                    .replaceAll("{{usernameColor}}", chatMessage.color ?? "")
+                    .replaceAll("{{pronouns}}", chatMessage.pronouns ?? "")
+                    .replaceAll("{{chatMessage}}", chatMessagePartsHtml.join(""))
+                    .replaceAll("{{chatMessageRawText}}", chatMessage.rawText);
+            };
+
+            const generateWidgetHtml = (config: typeof event["data"]["widgetConfig"]) => {
+                const messageContainerClass = `chat-${event.data.widgetConfig.id}`;
+                const messageClass = `chat-message-${event.data.widgetConfig.id}`;
+
+                const cssTemplate = (config.settings.cssTemplate ?? "")
+                    .replaceAll("{{messageContainerClass}}", `.${messageContainerClass}`)
+                    .replaceAll("{{messageClass}}", `.${messageClass}`);
+
+                const styleMarkup = `<style>${cssTemplate}</style>`;
+
+                const messages: string[] = [];
+
+                for (const chatMessage of config.state?.chatMessages ?? []) {
+                    const messageHtml = generateChatMessageHtml(chatMessage, config);
+
+                    if (!!messageHtml?.length) {
+                        messages.push(messageHtml);
+                    }
+                }
+
+                return `${styleMarkup}<div class="${messageContainerClass}">${messages.join("\n")}</div>`;
+            };
+
+            switch (event.name) {
+                case "show":
+                    utils.initializeWidget(generateWidgetHtml(event.data.widgetConfig));
+                    break;
+
+                case "settings-update":
+                    utils.updateWidgetContent(generateWidgetHtml(event.data.widgetConfig));
+                    utils.updateWidgetPosition();
+                    break;
+
+                case "message":
+                    switch (event.data.messageName) {
+                        case "chat-message":
+                            {
+                                const chatMessage = (event.data.messageData as ChatMessageMessageData).chatMessage;
+                                const newMessageHtml = generateChatMessageHtml(
+                                    chatMessage,
+                                    event.data.widgetConfig
+                                );
+
+                                try {
+                                    if (newMessageHtml) {
+                                        const chatContainer = document.getElementsByClassName(`chat-${event.data.widgetConfig.id}`)[0];
+                                        chatContainer.insertAdjacentHTML("beforeend", newMessageHtml);
+
+                                        const animationClass = event.data.widgetConfig.settings.newMessageEntryAnimation?.class;
+                                        const animationDuration = event.data.widgetConfig.settings.newMessageEntryAnimation?.duration;
+
+                                        if (animationClass != null && animationClass !== "" && animationClass !== "none") {
+                                            const duration = animationDuration ? `${animationDuration}s` : undefined;
+                                            // @ts-ignore
+                                            // eslint-disable-next-line
+                                            $(`.chat-${event.data.widgetConfig.id}`).find(`[data-message-id="${chatMessage.id}"]`).animateCss(animationClass, duration);
+                                        }
+
+                                        // Trim excess
+                                        while (chatContainer.childElementCount > 100) {
+                                            chatContainer.removeChild(chatContainer.firstElementChild);
+                                        }
+                                    }
+                                } catch { }
+                            }
+                            break;
+
+                        case "delete-message":
+                            {
+                                const messageId = (event.data.messageData as DeleteMessageMessageData).messageId;
+                                const animate = (event.data.messageData as DeleteMessageMessageData).animate;
+
+                                try {
+                                    const messageToRemove = document.querySelector(`[data-message-id="${messageId}"]`);
+                                    const chatContainer = document.getElementsByClassName(`chat-${event.data.widgetConfig.id}`)[0];
+
+                                    if (messageToRemove) {
+                                        if (animate === true) {
+                                            const animationClass = event.data.widgetConfig.settings.messageExitAnimation?.class;
+                                            const animationDuration = event.data.widgetConfig.settings.messageExitAnimation?.duration;
+
+                                            if (animationClass != null && animationClass !== "" && animationClass !== "none") {
+                                                const duration = animationDuration ? `${animationDuration}s` : undefined;
+
+                                                // @ts-ignore
+                                                // eslint-disable-next-line
+                                                $(`.chat-${event.data.widgetConfig.id}`).find(`[data-message-id="${messageId}"]`).animateCss(animationClass, duration, null, null, () => {
+                                                    chatContainer.removeChild(messageToRemove);
+                                                });
+                                            } else {
+                                                chatContainer.removeChild(messageToRemove);
+                                            }
+                                        } else {
+                                            chatContainer.removeChild(messageToRemove);
+                                        }
+                                    }
+                                } catch { }
+                            }
+                            break;
+
+                        case "delete-user-messages":
+                            try {
+                                const messagesToRemove = document.querySelectorAll(`[data-username="${(event.data.messageData as DeleteUserMessagesMessageData).username}"]`);
+                                const chatContainer = document.getElementsByClassName(`chat-${event.data.widgetConfig.id}`)[0];
+                                for (const messageToRemove of messagesToRemove) {
+                                    chatContainer.removeChild(messageToRemove);
+                                }
+                            } catch { }
+                            break;
+                    }
+                    break;
+
+                case "remove":
+                    utils.removeWidget();
+                    break;
+
+                case "state-update":
+                    // If we've set the chat message state to null, we're clearing the widget
+                    if (event.data.widgetConfig.state?.chatMessages == null) {
+                        utils.updateWidgetContent(generateWidgetHtml(event.data.widgetConfig));
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+    }
+};
\ No newline at end of file
diff --git a/src/backend/overlay-widgets/builtin-types/chat/chat.ts b/src/backend/overlay-widgets/builtin-types/chat/chat.ts
new file mode 100644
index 000000000..afce75f60
--- /dev/null
+++ b/src/backend/overlay-widgets/builtin-types/chat/chat.ts
@@ -0,0 +1,1187 @@
+import type {
+    FirebotChatMessage,
+    OverlayWidgetType,
+    IOverlayWidgetEventUtils,
+    WidgetOverlayEvent,
+    FontOptions,
+    Animation
+} from "../../../../types";
+
+export type ChatWidgetSettings = {
+    showTimestamps: boolean;
+    showAvatars: boolean;
+    showBadges: boolean;
+    showPronouns: boolean;
+    showSharedChatMessages: boolean;
+    sharedChatInfoStyle?: "none" | "avatar" | "banner";
+    showAnnouncements: boolean;
+    delayMessages: boolean;
+    messageDelay?: number;
+    newMessageEntryAnimation: Animation;
+    autoRemoveMessages: boolean;
+    messageTimeout?: number;
+    messageExitAnimation?: Animation;
+    messageStyle: "compact" | "modern";
+    chatOrder: "normal" | "reversed";
+    actionDisplayFormat: "modern" | "classic";
+    highlightStyle: "normal" | "highlighted";
+    highlightColor?: string;
+    thirdPartyEmotes: string[];
+    hiddenUsers: string[];
+    horizontalAlignment: "left" | "right";
+    verticalAlignment: "top" | "bottom";
+    spaceBetweenMessages: number;
+    usernameFontOptions: FontOptions;
+    messageFontOptions: FontOptions;
+};
+
+export type ChatWidgetState = {
+    chatMessages: Array<FirebotChatMessage>;
+};
+
+export type ChatMessageMessageData = {
+    chatMessage: FirebotChatMessage;
+};
+
+export type DeleteMessageMessageData = {
+    messageId: string;
+    animate: boolean;
+};
+
+export type DeleteUserMessagesMessageData = {
+    username: string;
+};
+
+export const chat: OverlayWidgetType<ChatWidgetSettings, ChatWidgetState> = {
+    id: "firebot:chat",
+    name: "Chat",
+    description: "A basic chat feed for the overlay",
+    icon: "fa fa-comments-alt",
+    userCanConfigure: {
+        entryAnimation: false,
+        exitAnimation: false
+    },
+    settingsSchema: [
+        {
+            name: "showTimestamps",
+            title: "Show Timestamps",
+            type: "boolean",
+            default: false
+        },
+        {
+            name: "showAvatars",
+            title: "Show Viewer Avatars",
+            type: "boolean",
+            default: true
+        },
+        {
+            name: "showBadges",
+            title: "Show Chat Badges",
+            description: "Show chat badges (sub, bits tiers, etc.) next to usernames",
+            type: "boolean",
+            default: true
+        },
+        {
+            name: "showPronouns",
+            title: "Show Pronouns",
+            description: "Show chatter pronouns (provided by [https://pr.alejo.io/](https://pr.alejo.io/))",
+            type: "boolean",
+            default: false
+        },
+        {
+            name: "showSharedChatMessages",
+            title: "Show Shared Chat Messages",
+            description: "Display chat messages sent from other channels during a shared chat session",
+            type: "boolean",
+            default: false
+        },
+        {
+            name: "sharedChatInfoStyle",
+            title: "Shared Chat Info Style",
+            description: "Optionally display info about the channel a chat message was sent in during a shared chat session",
+            type: "radio-cards",
+            default: "none",
+            options: [
+                {
+                    value: "none",
+                    label: "None",
+                    description: "Don't show any info about the shared chat source channel",
+                    iconClass: "fa-times"
+                },
+                {
+                    value: "avatar",
+                    label: "Avatar",
+                    description: "Show the avatar for the source channel next to the message",
+                    iconClass: "fa-user-circle"
+                },
+                {
+                    value: "banner",
+                    label: "Banner",
+                    description: `Show a banner above the message (e.g. "Sent from Firebot's chat")`,
+                    iconClass: "fa-grip-lines"
+                }
+            ],
+            settings: {
+                gridColumns: 3
+            },
+            showIf: {
+                showSharedChatMessages: true
+            }
+        },
+        {
+            name: "showAnnouncements",
+            title: "Show Announcements",
+            description: "Display chat announcements sent from the streamer or moderators",
+            type: "boolean",
+            default: false
+        },
+        {
+            name: "delayMessages",
+            title: "Add Message Delay",
+            description: "Adds a delay between when a message arrives and when it is sent to the widget. Useful for moderation.",
+            type: "boolean",
+            default: false
+        },
+        {
+            name: "messageDelay",
+            title: "Message Delay",
+            description: "How long (in seconds) to wait before sending a chat message to the widget",
+            type: "number",
+            default: 0,
+            showIf: {
+                delayMessages: true
+            }
+        },
+        {
+            name: "newMessageEntryAnimation",
+            title: "New Message Entry Animation",
+            description: "Animation to use when new messages arrive",
+            type: "animation-select",
+            animationType: "enter"
+        },
+        {
+            name: "autoRemoveMessages",
+            title: "Automatically Remove Messages",
+            description: "Removes messages from the chat widget after a specified amount of time",
+            type: "boolean",
+            default: false
+        },
+        {
+            name: "messageTimeout",
+            title: "Message Timeout",
+            description: "Amount of time (in seconds) to automatically remove chat messages from the widget",
+            type: "number",
+            default: 10,
+            showIf: {
+                autoRemoveMessages: true
+            }
+        },
+        {
+            name: "messageExitAnimation",
+            title: "Message Exit Animation",
+            description: "Animation to use when messages are automatically removed from the widget",
+            type: "animation-select",
+            animationType: "exit",
+            showIf: {
+                autoRemoveMessages: true
+            }
+        },
+        {
+            name: "messageStyle",
+            title: "Message Style",
+            type: "radio-cards",
+            default: "compact",
+            options: [
+                {
+                    value: "compact",
+                    label: "Compact",
+                    description: "Username and chat message are displayed on the same line",
+                    iconClass: "fa-horizontal-rule"
+                },
+                {
+                    value: "modern",
+                    label: "Modern (Expanded)",
+                    description: "Username and chat message are displayed on separate lines",
+                    iconClass: "fa-line-height"
+                }
+            ]
+        },
+        {
+            name: "chatOrder",
+            title: "Chat Order",
+            type: "radio-cards",
+            default: "normal",
+            options: [
+                {
+                    value: "normal",
+                    label: "Normal",
+                    description: "New messages will appear at the bottom of the chat feed",
+                    iconClass: "fa-sort-amount-down-alt"
+                },
+                {
+                    value: "reversed",
+                    label: "Reversed",
+                    description: "New messages will appear at the top of the chat feed",
+                    iconClass: "fa-sort-amount-up"
+                }
+            ]
+        },
+        {
+            name: "actionDisplayFormat",
+            title: "Action Display Format",
+            description: "The style used to display `/me` actions",
+            type: "radio-cards",
+            default: "modern",
+            options: [
+                {
+                    value: "modern",
+                    label: "Modern",
+                    description: "Action text is the same color as normal chat messages but italicized, like Twitch does today",
+                    iconClass: "fa-italic"
+                },
+                {
+                    value: "classic",
+                    label: "Classic",
+                    description: "Action text is the same color as the username but not italicized, like Twitch used to do",
+                    iconClass: "fa-palette"
+                }
+            ]
+        },
+        {
+            name: "highlightStyle",
+            title: "Highlighted Message Style",
+            type: "radio-cards",
+            default: "normal",
+            options: [
+                {
+                    value: "normal",
+                    label: "Normal",
+                    description: "Highlighted messages will look just like regular messages",
+                    iconClass: "fa-tint-slash"
+                },
+                {
+                    value: "highlighted",
+                    label: "Highlighted",
+                    description: "Highlighted messages will have a different background color, similar to how Twitch displays them",
+                    iconClass: "fa-tint"
+                }
+            ]
+        },
+        {
+            name: "highlightColor",
+            title: "Highlighted Message Background Color",
+            type: "hexcolor",
+            default: "#755ebc",
+            allowAlpha: true,
+            validation: {
+                required: true,
+                pattern: "^#[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?$"
+            },
+            showIf: {
+                highlightStyle: "highlighted"
+            }
+        },
+        {
+            name: "thirdPartyEmotes",
+            title: "Enabled Third-Party Emote Providers",
+            description: "NOTE: Any third-party emote services enabled here must also be enabled in Dashboard settings in order to show emotes from those services.",
+            type: "multiselect",
+            default: [],
+            settings: {
+                options: [
+                    {
+                        id: "BTTV",
+                        name: "BTTV"
+                    },
+                    {
+                        id: "7TV",
+                        name: "7TV"
+                    },
+                    {
+                        id: "FFZ",
+                        name: "FFZ"
+                    }
+                ]
+            }
+        },
+        {
+            name: "hiddenUsers",
+            title: "Hidden Users",
+            description: "List of usernames whose messages will not be displayed in the chat widget",
+            type: "editable-list",
+            default: [],
+            settings: {
+                useTextArea: false,
+                sortable: true,
+                addLabel: "Add Username",
+                editLabel: "Edit Username",
+                noneAddedText: "No users hidden in chat widget"
+            }
+        },
+        {
+            name: "horizontalAlignment",
+            title: "Horizontal Alignment",
+            description: "Horizontal alignment of the chat messages within the widget area.",
+            type: "radio-cards",
+            default: "left",
+            options: [{
+                value: "left", label: "Left", iconClass: "fa-align-left"
+            }, {
+                value: "right", label: "Right", iconClass: "fa-align-right"
+            }],
+            settings: {
+                gridColumns: 2
+            }
+        },
+        {
+            name: "verticalAlignment",
+            title: "Vertical Alignment",
+            description: "Vertical alignment of the chat messages within the widget area.",
+            type: "radio-cards",
+            default: "top",
+            options: [{
+                value: "top", label: "Top", iconClass: "fa-arrow-to-top"
+            }, {
+                value: "bottom", label: "Bottom", iconClass: "fa-arrow-to-bottom"
+            }],
+            settings: {
+                gridColumns: 2
+            }
+        },
+        {
+            name: "spaceBetweenMessages",
+            title: "Space Between Messages",
+            description: "How much space (in pixels) to put between messages in the feed",
+            type: "number",
+            default: 5
+        },
+        {
+            name: "usernameFontOptions",
+            title: "Username Font Options",
+            type: "font-options",
+            default: {
+                family: "Inter",
+                weight: 700,
+                size: 24,
+                italic: false
+            },
+            allowAlpha: true,
+            hideColor: true
+        },
+        {
+            name: "messageFontOptions",
+            title: "Chat Message Font Options",
+            type: "font-options",
+            default: {
+                family: "Inter",
+                weight: 400,
+                size: 24,
+                italic: false,
+                color: "#FFFFFF"
+            },
+            allowAlpha: true
+        }
+    ],
+    initialState: {
+        chatMessages: []
+    },
+    supportsLivePreview: true,
+    livePreviewState: {
+        chatMessages: [
+            {
+                id: "",
+                timestamp: 1777003200000,
+                username: "firebot",
+                userId: "0",
+                userDisplayName: "Firebot",
+                profilePicUrl: "https://firebot.app/_next/image?url=%2Ffirebot-logo.png&w=96&q=75",
+                color: "#FFCA03",
+                rawText: "thinks chat widgets are neat",
+                badges: [
+                    {
+                        title: "moderator",
+                        url: "https://static-cdn.jtvnw.net/badges/v1/3267646d-33f0-4b17-b3df-f923a41db1d0/1"
+                    }
+                ],
+                parts: [
+                    {
+                        type: "text",
+                        text: "thinks chat widgets are neat"
+                    }
+                ],
+                action: true,
+                whisper: false,
+                tagged: false,
+                isSharedChatMessage: false,
+                sharedChatRoomProfilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/4fe04c1f-8390-4ded-bcb0-cae9b1d7cb9c-profile_image-70x70.png",
+                roles: []
+            },
+            {
+                id: "",
+                timestamp: 1777003260000,
+                username: "zunderscore",
+                userId: "0",
+                userDisplayName: "zunderscore",
+                profilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/4fe04c1f-8390-4ded-bcb0-cae9b1d7cb9c-profile_image-70x70.png",
+                pronouns: "He/Him",
+                color: "#0066FF",
+                rawText: "Wow, this IS really neat! zunder2Wow",
+                badges: [
+                    {
+                        title: "broadcaster",
+                        url: "https://static-cdn.jtvnw.net/badges/v1/5527c58c-fb7d-422d-b71b-f309dcb85cc1/2"
+                    }
+                ],
+                parts: [
+                    {
+                        type: "text",
+                        text: "Wow, this IS really neat! "
+                    },
+                    {
+                        type: "emote",
+                        url: "https://static-cdn.jtvnw.net/emoticons/v2/emotesv2_ad007f2d2f77444295c883b0a6eaf572/static/light/3.0",
+                        name: "zunder2Wow"
+                    }
+                ],
+                action: false,
+                whisper: false,
+                tagged: false,
+                isSharedChatMessage: false,
+                sharedChatRoomProfilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/4fe04c1f-8390-4ded-bcb0-cae9b1d7cb9c-profile_image-70x70.png",
+                roles: []
+            },
+            {
+                id: "",
+                timestamp: 1777003260000,
+                username: "ebiggz",
+                userId: "0",
+                userDisplayName: "ebiggz",
+                profilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/5545fe76-a341-4ffb-bc79-7ca8075588a1-profile_image-70x70.png",
+                pronouns: "He/Him",
+                color: "#00d1ff",
+                rawText: "Yo, what's going on over there?",
+                badges: [
+                    {
+                        title: "glhf",
+                        url: "https://static-cdn.jtvnw.net/badges/v1/3158e758-3cb4-43c5-94b3-7639810451c5/2"
+                    }
+                ],
+                parts: [
+                    {
+                        type: "text",
+                        text: "Yo, what's going on over there?"
+                    }
+                ],
+                action: false,
+                whisper: false,
+                tagged: false,
+                isSharedChatMessage: true,
+                sharedChatRoomDisplayName: "ebiggz",
+                sharedChatRoomProfilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/5545fe76-a341-4ffb-bc79-7ca8075588a1-profile_image-70x70.png",
+                roles: []
+            },
+            {
+                id: "",
+                timestamp: 1777003320000,
+                username: "zunderscore",
+                userId: "0",
+                userDisplayName: "zunderscore",
+                profilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/4fe04c1f-8390-4ded-bcb0-cae9b1d7cb9c-profile_image-70x70.png",
+                pronouns: "He/Him",
+                color: "#0066FF",
+                rawText: "Super cool stuff!",
+                badges: [
+                    {
+                        title: "broadcaster",
+                        url: "https://static-cdn.jtvnw.net/badges/v1/5527c58c-fb7d-422d-b71b-f309dcb85cc1/2"
+                    }
+                ],
+                parts: [
+                    {
+                        type: "text",
+                        text: "Super cool stuff!"
+                    }
+                ],
+                action: false,
+                whisper: false,
+                tagged: false,
+                isSharedChatMessage: false,
+                sharedChatRoomProfilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/4fe04c1f-8390-4ded-bcb0-cae9b1d7cb9c-profile_image-70x70.png",
+                isHighlighted: true,
+                roles: []
+            },
+            {
+                id: "",
+                timestamp: 1777003320000,
+                username: "firebot",
+                userId: "0",
+                userDisplayName: "Firebot",
+                profilePicUrl: "https://firebot.app/_next/image?url=%2Ffirebot-logo.png&w=96&q=75",
+                color: "#FFCA03",
+                rawText: "Don't forget to show love to your fellow Firebot users! <3",
+                badges: [
+                    {
+                        title: "moderator",
+                        url: "https://static-cdn.jtvnw.net/badges/v1/3267646d-33f0-4b17-b3df-f923a41db1d0/1"
+                    }
+                ],
+                parts: [
+                    {
+                        type: "text",
+                        text: "Don't forget to show love to your fellow Firebot users! "
+                    },
+                    {
+                        type: "emote",
+                        url: "https://static-cdn.jtvnw.net/emoticons/v2/9/default/dark/2.0#e=0",
+                        name: "<3"
+                    }
+                ],
+                action: false,
+                isAnnouncement: true,
+                announcementColor: "ORANGE",
+                whisper: false,
+                tagged: false,
+                isSharedChatMessage: false,
+                sharedChatRoomProfilePicUrl: "https://static-cdn.jtvnw.net/jtv_user_pictures/4fe04c1f-8390-4ded-bcb0-cae9b1d7cb9c-profile_image-70x70.png",
+                roles: []
+            }
+        ]
+    },
+    uiActions: [
+        {
+            id: "clear",
+            label: "Clear Chat Widget",
+            icon: "fa-minus-circle",
+            click: () => {
+                return {
+                    newState: {
+                        chatMessages: null
+                    }
+                };
+            }
+        }
+    ],
+    overlayExtension: {
+        eventHandler: (event: WidgetOverlayEvent<ChatWidgetSettings, ChatWidgetState>, utils: IOverlayWidgetEventUtils) => {
+            const generateAnnouncementBarStyle = (
+                announcementColor: FirebotChatMessage["announcementColor"]
+            ): Record<string, string> => {
+                let announcementBackgroundColor: string;
+
+                switch (announcementColor) {
+                    case "BLUE":
+                        announcementBackgroundColor = "linear-gradient(#00d6d6,#9146ff)";
+                        break;
+
+                    case "GREEN":
+                        announcementBackgroundColor = "linear-gradient(#00db84,#57bee6)";
+                        break;
+
+                    case "ORANGE":
+                        announcementBackgroundColor = "linear-gradient(#ffb31a,#e0e000)";
+                        break;
+
+                    case "PURPLE":
+                        announcementBackgroundColor = "linear-gradient(#9146ff,#ff75e6)";
+                        break;
+
+                    default:
+                        announcementBackgroundColor = "rgb(31, 105, 255)";
+                        break;
+                }
+
+                const individualAnnouncementBarStyles: Record<string, string> = {
+                    "background": announcementBackgroundColor
+                };
+
+                return individualAnnouncementBarStyles;
+            };
+
+            const generateChatMessageHtml = (
+                chatMessage: FirebotChatMessage,
+                config: typeof event["data"]["widgetConfig"]
+            ): string | undefined => {
+                // Ignore AutoModded messages that aren't approved
+                if (chatMessage.autoModStatus === "pending"
+                        || chatMessage.autoModStatus === "denied"
+                        || chatMessage.autoModStatus === "expired") {
+                    return;
+                }
+
+                // Check the ignore list
+                if (config.settings.hiddenUsers?.some(u =>
+                    u.toLowerCase() === chatMessage.username.toLowerCase() || u.toLowerCase() === chatMessage.userDisplayName?.toLowerCase()
+                )) {
+                    return;
+                }
+
+                // Don't render announcements unless we specifically want them
+                if (chatMessage.isAnnouncement === true && config.settings.showAnnouncements !== true) {
+                    return;
+                }
+
+                // Same with shared chat messages
+                if (chatMessage.isSharedChatMessage === true && config.settings.showSharedChatMessages !== true) {
+                    return;
+                }
+
+                const rootMessageElem = document.createElement("div");
+                rootMessageElem.classList.add(`chat-message-root-container-${config.id}`);
+                rootMessageElem.setAttribute("data-message-id", chatMessage.id);
+                rootMessageElem.setAttribute("data-username", chatMessage.username);
+
+                let messageHeaderText = "";
+
+                const showSharedChatAvatar = config.settings.sharedChatInfoStyle === "avatar"
+                    && chatMessage.sharedChatRoomProfilePicUrl;
+
+                if (showSharedChatAvatar) {
+                    const sharedChatAvatarContainerElem = document.createElement("div");
+
+                    const sharedChatAvatarElem = document.createElement("img");
+                    sharedChatAvatarElem.classList.add(`chat-avatar-${config.id}`);
+                    sharedChatAvatarElem.src = chatMessage.sharedChatRoomProfilePicUrl!;
+
+                    sharedChatAvatarContainerElem.appendChild(sharedChatAvatarElem);
+                    rootMessageElem.appendChild(sharedChatAvatarContainerElem);
+                }
+
+                if (chatMessage.isAnnouncement === true) {
+                    messageHeaderText = "Announcement";
+
+                    if (chatMessage.isSharedChatMessage && config.settings.sharedChatInfoStyle === "banner") {
+                        messageHeaderText += `, sent from ${chatMessage.sharedChatRoomDisplayName}'s chat`;
+                    }
+
+                    const individualAnnouncementBarStyles = generateAnnouncementBarStyle(
+                        chatMessage.announcementColor
+                    );
+
+                    const announcementBarElem = document.createElement("div");
+                    announcementBarElem.classList.add(`chat-announcement-bar-${config.id}`);
+                    announcementBarElem.setAttribute("style", utils.stylesToString(individualAnnouncementBarStyles));
+
+                    rootMessageElem.appendChild(announcementBarElem);
+                } else {
+                    if (chatMessage.isSharedChatMessage && config.settings.sharedChatInfoStyle === "banner") {
+                        messageHeaderText = `Sent from ${chatMessage.sharedChatRoomDisplayName}'s chat`;
+                    }
+                }
+
+                const messageContainerElem = document.createElement("div");
+                messageContainerElem.classList.add(`chat-message-container-${config.id}`);
+
+                if (messageHeaderText.length > 0) {
+                    const messageHeaderElem = document.createElement("div");
+                    messageHeaderElem.classList.add(`chat-message-header-${config.id}`);
+                    messageHeaderElem.innerText = messageHeaderText;
+
+                    messageContainerElem.appendChild(messageHeaderElem);
+                }
+
+                const messageContentContainerElem = document.createElement("div");
+                messageContentContainerElem.classList.add(`chat-message-content-container-${config.id}`);
+
+                const messageInfoElem = document.createElement("span");
+
+                let timestampString: string | undefined = undefined;
+                if (config.settings.showTimestamps === true && chatMessage.timestamp) {
+                    const timestampAsDate = new Date(chatMessage.timestamp);
+                    const hours = timestampAsDate.getHours() % 12 === 0
+                        ? "12"
+                        : timestampAsDate.getHours() % 12;
+                    const minutes = String(timestampAsDate.getMinutes()).padStart(2, "0");
+
+                    timestampString = `[${hours}:${minutes}]`;
+                }
+
+                if (!!timestampString?.length && config.settings.messageStyle === "compact") {
+                    const timestampSpan = document.createElement("span");
+                    timestampSpan.classList.add(`chat-message-${config.id}`);
+                    timestampSpan.innerText = `${timestampString} `;
+
+                    messageInfoElem.appendChild(timestampSpan);
+                }
+
+                if (config.settings.showAvatars === true) {
+                    const avatarElem = document.createElement("img");
+                    avatarElem.classList.add(`chat-avatar-${config.id}`);
+                    avatarElem.src = chatMessage.profilePicUrl!;
+                    avatarElem.alt = "avatar";
+
+                    messageInfoElem.appendChild(avatarElem);
+                }
+
+                if (config.settings.showBadges === true && !!chatMessage.badges?.length) {
+                    const badgeContainerElem = document.createElement("span");
+                    badgeContainerElem.classList.add(`chat-badge-container-${config.id}`);
+
+                    for (const badge of chatMessage.badges) {
+                        const badgeElem = document.createElement("img");
+                        badgeElem.classList.add(`chat-badge-${config.id}`);
+                        badgeElem.src = badge.url;
+                        badgeElem.alt = badge.title;
+
+                        badgeContainerElem.appendChild(badgeElem);
+                    }
+
+                    messageInfoElem.appendChild(badgeContainerElem);
+                }
+
+                if (config.settings.showPronouns === true && !!chatMessage.pronouns?.length) {
+                    const pronounElem = document.createElement("span");
+                    pronounElem.classList.add(`chat-pronouns-${config.id}`);
+                    pronounElem.innerText = chatMessage.pronouns;
+
+                    messageInfoElem.appendChild(pronounElem);
+                }
+
+                const individualUsernameStyles: Record<string, string> = {
+                    "color": `${chatMessage.color}`
+                };
+
+                const usernameElem = document.createElement("span");
+                usernameElem.classList.add(`chat-username-${config.id}`);
+                usernameElem.setAttribute("style", utils.stylesToString(individualUsernameStyles));
+                usernameElem.innerText = chatMessage.userDisplayName ?? chatMessage.username;
+
+                messageInfoElem.appendChild(usernameElem);
+
+                if (!!timestampString?.length && config.settings.messageStyle === "modern") {
+                    const timestampSpan = document.createElement("span");
+                    timestampSpan.classList.add(`chat-message-${config.id}`);
+                    timestampSpan.innerText = ` ${timestampString}`;
+
+                    messageInfoElem.appendChild(timestampSpan);
+                }
+
+                messageContentContainerElem.appendChild(messageInfoElem);
+
+                const messageTextElem = document.createElement("span");
+                messageTextElem.classList.add(`chat-message-${config.id}`);
+
+                let messageText: string;
+
+                if (chatMessage.action === true) {
+                    const individualActionStyles: Record<string, string> = { };
+
+                    if (config.settings.actionDisplayFormat === "classic") {
+                        individualActionStyles["color"] = chatMessage.color!;
+                    }
+
+                    messageTextElem.classList.add(`chat-action-${config.id}`);
+                    messageTextElem.setAttribute("style", utils.stylesToString(individualActionStyles));
+
+                    messageText = config.settings.messageStyle === "modern" ? "" : " ";
+                } else {
+                    messageText = config.settings.messageStyle === "modern" ? "" : ": ";
+                }
+
+                if (!!messageText?.length) {
+                    messageTextElem.innerText = messageText;
+                }
+
+                const innerMessageElem = document.createElement("span");
+                if (chatMessage.isHighlighted === true && config.settings.highlightStyle === "highlighted") {
+                    innerMessageElem.classList.add(`chat-highlighted-message-${config.id}`);
+                }
+
+                const chatMessagePartsHtml: Array<string> = [];
+
+                for (const part of chatMessage.parts) {
+                    switch (part.type) {
+                        case "emote":
+                            {
+                                const emoteElem = document.createElement("img");
+                                emoteElem.src = (part.animatedUrl ?? part.url)!;
+                                emoteElem.alt = part.name!;
+
+                                chatMessagePartsHtml.push(emoteElem.outerHTML);
+                            }
+                            break;
+
+                        case "third-party-emote":
+                            if (config.settings.thirdPartyEmotes.some(e => e === part.origin)) {
+                                const emoteElem = document.createElement("img");
+                                emoteElem.src = (part.animatedUrl ?? part.url)!;
+                                emoteElem.alt = part.name!;
+
+                                chatMessagePartsHtml.push(emoteElem.outerHTML);
+                            } else {
+                                chatMessagePartsHtml.push(part.name);
+                            }
+                            break;
+
+                        case "cheermote":
+                            {
+                                const cheermoteElem = document.createElement("img");
+                                cheermoteElem.src = (part.animatedUrl ?? part.url)!;
+                                cheermoteElem.alt = part.name!;
+
+                                const cheerAmountElem = document.createElement("strong");
+                                cheerAmountElem.style.color = part.color!;
+                                cheerAmountElem.innerText = `${part.amount}`;
+
+                                chatMessagePartsHtml.push(cheermoteElem.outerHTML);
+                                chatMessagePartsHtml.push(cheerAmountElem.outerHTML);
+                            }
+                            break;
+
+                        case "link":
+                            chatMessagePartsHtml.push(part.url);
+                            break;
+
+                        default:
+                            chatMessagePartsHtml.push(part.text);
+                    }
+                }
+
+                innerMessageElem.innerHTML = chatMessagePartsHtml.join("");
+
+                messageTextElem.appendChild(innerMessageElem);
+
+                messageContentContainerElem.appendChild(messageTextElem);
+                messageContainerElem.appendChild(messageContentContainerElem);
+
+                rootMessageElem.appendChild(messageContainerElem);
+
+                return rootMessageElem.outerHTML;
+            };
+
+            const generateWidgetHtml = (config: typeof event["data"]["widgetConfig"]) => {
+                const usernameFontSize = (config.settings?.usernameFontOptions?.size ? `${config.settings.usernameFontOptions.size}px` : "12px");
+                const messageFontSize = (config.settings?.messageFontOptions?.size ? `${config.settings.messageFontOptions.size}px` : "12px");
+
+                let height = "auto";
+                let maxHeight: string | undefined = "100%";
+                let justifyContent = "end";
+                let anchorToBottom = false;
+
+                switch (config.settings.chatOrder) {
+                    case "reversed":
+                        switch (config.settings.verticalAlignment) {
+                            case "bottom":
+                                // Special snowflake
+                                anchorToBottom = true;
+                                height = "auto";
+                                maxHeight = "100%";
+                                justifyContent = "start";
+                                break;
+
+                            case "top":
+                            default:
+                                height = "auto";
+                                maxHeight = undefined;
+                                justifyContent = "start";
+                                break;
+                        }
+                        break;
+
+                    case "normal":
+                    default:
+                        switch (config.settings.verticalAlignment) {
+                            case "bottom":
+                                height = "100%";
+                                maxHeight = "100%";
+                                justifyContent = "end";
+                                break;
+
+                            case "top":
+                            default:
+                                // Use default values
+                                break;
+                        }
+                        break;
+                }
+
+                const chatContainerStyles: Record<string, string> = {
+                    "display": "flex",
+                    "flex-direction": config.settings.chatOrder === "reversed" ? "column-reverse" : "column",
+                    "align-items": config.settings.horizontalAlignment === "right" ? "end" : "start",
+                    "justify-content": justifyContent,
+                    "height": height,
+                    "width": "100%",
+                    "text-align": config.settings.horizontalAlignment
+                };
+
+                if (!!maxHeight?.length) {
+                    chatContainerStyles["max-height"] = maxHeight;
+                }
+
+                if (anchorToBottom) {
+                    chatContainerStyles["position"] = "absolute";
+                    chatContainerStyles["bottom"] = "0";
+                }
+
+                const messageRootContainerStyles: Record<string, string> = {
+                    "display": "flex",
+                    "gap": "10px",
+                    "flex-direction": config.settings.horizontalAlignment === "right"
+                        ? "row-reverse"
+                        : "row"
+                };
+
+                const announcementBarStyles: Record<string, string> = {
+                    "width": "10px"
+                };
+
+                const announcementMessageContainerStyles: Record<string, string> = {
+                    "display": "flex",
+                    "flex-direction": "column"
+                };
+
+                const messageHeaderStyles: Record<string, string> = {
+                    "font-family": (config.settings?.messageFontOptions?.family ? `"${config.settings?.messageFontOptions?.family}"` : "Inter, sans-serif"),
+                    "font-size": `calc(${messageFontSize} * 0.75)`,
+                    "font-weight": config.settings?.messageFontOptions?.weight?.toString() || "400",
+                    "font-style": config.settings?.messageFontOptions?.italic ? "italic" : "normal",
+                    "color": config.settings?.messageFontOptions?.color || "#FFFFFF",
+                    "margin-bottom": "5px"
+                };
+
+                const messageContentContainerStyles: Record<string, string> = {
+                    "display": "inline"
+                };
+
+                if (config.settings.messageStyle === "modern") {
+                    messageContentContainerStyles["display"] = "flex";
+                    messageContentContainerStyles["flex-direction"] = config.settings.messageStyle === "modern" ? "column" : "row";
+                }
+
+                const avatarStyles: Record<string, string> = {
+                    "height": usernameFontSize,
+                    "border-radius": "50%",
+                    "margin-right": "5px"
+                };
+
+                const badgeStyles: Record<string, string> = {
+                    "height": usernameFontSize
+                };
+
+                const pronounStyles: Record<string, string> = {
+                    "border": `solid calc(${messageFontSize} * 0.05) ${config.settings?.messageFontOptions?.color || "#FFFFFF"}`,
+                    "border-radius": `calc(${messageFontSize} * 0.25)`,
+                    "font-family": (config.settings?.messageFontOptions?.family ? `"${config.settings?.messageFontOptions?.family}"` : "Inter, sans-serif"),
+                    "font-size": `calc(${messageFontSize} * 0.75)`,
+                    "font-weight": config.settings?.messageFontOptions?.weight?.toString() || "400",
+                    "font-style": config.settings?.messageFontOptions?.italic ? "italic" : "normal",
+                    "color": config.settings?.messageFontOptions?.color || "#FFFFFF",
+                    "padding": `calc(${messageFontSize} * 0.15)`,
+                    "margin-right": "5px"
+                };
+
+                const usernameStyles: Record<string, string> = {
+                    "font-family": (config.settings?.usernameFontOptions?.family ? `"${config.settings?.usernameFontOptions?.family}"` : "Inter, sans-serif"),
+                    "font-size": usernameFontSize,
+                    "font-weight": config.settings?.usernameFontOptions?.weight?.toString() || "700",
+                    "font-style": config.settings?.usernameFontOptions?.italic ? "italic" : "normal"
+                };
+
+                const messageStyles: Record<string, string> = {
+                    "font-family": (config.settings?.messageFontOptions?.family ? `"${config.settings?.messageFontOptions?.family}"` : "Inter, sans-serif"),
+                    "font-size": messageFontSize,
+                    "font-weight": config.settings?.messageFontOptions?.weight?.toString() || "400",
+                    "font-style": config.settings?.messageFontOptions?.italic ? "italic" : "normal",
+                    "color": config.settings?.messageFontOptions?.color || "#FFFFFF"
+                };
+
+                const highlightedMessageStyles: Record<string, string> = {
+                    "background-color": `${config.settings.highlightColor}`
+                };
+
+                const actionStyles: Record<string, string> = {
+                    "font-style": config.settings?.actionDisplayFormat === "classic" ? "normal" : "italic"
+                };
+
+                const styleMarkup = `
+                    <style>
+                        .chat-${config.id} {
+                            ${utils.stylesToString(chatContainerStyles)}
+                        }
+
+                        .chat-${config.id} * {
+                            vertical-align: middle;
+                        }
+
+                        .chat-${config.id} > div + div {
+                            ${config.settings.chatOrder === "reversed" ? "margin-bottom" : "margin-top"}: ${config.settings.spaceBetweenMessages ?? 5}px;
+                        }
+
+                        .chat-message-root-container-${config.id} {
+                            ${utils.stylesToString(messageRootContainerStyles)}
+                        }
+
+                        .chat-announcement-bar-${config.id} {
+                            ${utils.stylesToString(announcementBarStyles)}
+                        }
+
+                        .chat-message-container-${config.id} {
+                            ${utils.stylesToString(announcementMessageContainerStyles)}
+                        }
+
+                        .chat-highlighted-message-${config.id} {
+                            ${utils.stylesToString(highlightedMessageStyles)}
+                        }
+
+                        .chat-message-header-${config.id} {
+                            ${utils.stylesToString(messageHeaderStyles)}
+                        }
+
+                        .chat-message-content-container-${config.id} {
+                            ${utils.stylesToString(messageContentContainerStyles)}
+                        }
+
+                        .chat-avatar-${config.id} {
+                            ${utils.stylesToString(avatarStyles)}
+                        }
+
+                        .chat-badge-container-${config.id} {
+                            margin-right: 5px;
+                        }
+
+                        .chat-badge-${config.id} {
+                            ${utils.stylesToString(badgeStyles)}
+                        }
+
+                        .chat-pronouns-${config.id} {
+                            ${utils.stylesToString(pronounStyles)}
+                        }
+
+                        .chat-username-${config.id} {
+                            ${utils.stylesToString(usernameStyles)}
+                        }
+
+                        .chat-message-${config.id} {
+                            ${utils.stylesToString(messageStyles)}
+                        }
+
+                        .chat-action-${config.id} {
+                            ${utils.stylesToString(actionStyles)}
+                        }
+
+                        .chat-message-${config.id} img,
+                        .chat-action-${config.id} img {
+                            height: ${messageFontSize};
+                        }
+                    </style>
+                `;
+
+                const messageDivs: string[] = [];
+
+                for (const chatMessage of config.state?.chatMessages ?? []) {
+                    const messageHtml = generateChatMessageHtml(chatMessage, config);
+
+                    if (!!messageHtml?.length) {
+                        messageDivs.push(messageHtml);
+                    }
+                }
+
+                return `${styleMarkup}<div class="chat-${config.id}">${messageDivs.join("\n")}</div>`;
+            };
+
+            switch (event.name) {
+                case "show":
+                    utils.initializeWidget(generateWidgetHtml(event.data.widgetConfig));
+                    break;
+
+                case "settings-update":
+                    utils.updateWidgetContent(generateWidgetHtml(event.data.widgetConfig));
+                    utils.updateWidgetPosition();
+                    break;
+
+                case "message":
+                    switch (event.data.messageName) {
+                        case "chat-message":
+                            {
+                                const chatMessage = (event.data.messageData as ChatMessageMessageData).chatMessage;
+                                const newMessageHtml = generateChatMessageHtml(
+                                    chatMessage,
+                                    event.data.widgetConfig
+                                );
+
+                                try {
+                                    if (newMessageHtml) {
+                                        const chatContainer = document.getElementsByClassName(`chat-${event.data.widgetConfig.id}`)[0];
+                                        chatContainer.insertAdjacentHTML("beforeend", newMessageHtml);
+
+                                        const animationClass = event.data.widgetConfig.settings.newMessageEntryAnimation?.class;
+                                        const animationDuration = event.data.widgetConfig.settings.newMessageEntryAnimation?.duration;
+
+                                        if (animationClass != null && animationClass !== "" && animationClass !== "none") {
+                                            const duration = animationDuration ? `${animationDuration}s` : undefined;
+                                            // @ts-ignore
+                                            // eslint-disable-next-line
+                                            $(`.chat-${event.data.widgetConfig.id}`).find(`[data-message-id="${chatMessage.id}"]`).animateCss(animationClass, duration);
+                                        }
+
+                                        // Trim excess
+                                        while (chatContainer.childElementCount > 100) {
+                                            chatContainer.removeChild(chatContainer.firstElementChild);
+                                        }
+                                    }
+                                } catch { }
+                            }
+                            break;
+
+                        case "delete-message":
+                            {
+                                const messageId = (event.data.messageData as DeleteMessageMessageData).messageId;
+                                const animate = (event.data.messageData as DeleteMessageMessageData).animate;
+
+                                try {
+                                    const messageToRemove = document.querySelector(`[data-message-id="${messageId}"]`);
+                                    const chatContainer = document.getElementsByClassName(`chat-${event.data.widgetConfig.id}`)[0];
+
+                                    if (messageToRemove) {
+                                        if (animate === true) {
+                                            const animationClass = event.data.widgetConfig.settings.messageExitAnimation?.class;
+                                            const animationDuration = event.data.widgetConfig.settings.messageExitAnimation?.duration;
+
+                                            if (animationClass != null && animationClass !== "" && animationClass !== "none") {
+                                                const duration = animationDuration ? `${animationDuration}s` : undefined;
+
+                                                // @ts-ignore
+                                                // eslint-disable-next-line
+                                                $(`.chat-${event.data.widgetConfig.id}`).find(`[data-message-id="${messageId}"]`).animateCss(animationClass, duration, null, null, () => {
+                                                    chatContainer.removeChild(messageToRemove);
+                                                });
+                                            } else {
+                                                chatContainer.removeChild(messageToRemove);
+                                            }
+                                        } else {
+                                            chatContainer.removeChild(messageToRemove);
+                                        }
+                                    }
+                                } catch { }
+                            }
+                            break;
+
+                        case "delete-user-messages":
+                            try {
+                                const messagesToRemove = document.querySelectorAll(`[data-username="${(event.data.messageData as DeleteUserMessagesMessageData).username}"]`);
+                                const chatContainer = document.getElementsByClassName(`chat-${event.data.widgetConfig.id}`)[0];
+                                for (const messageToRemove of messagesToRemove) {
+                                    chatContainer.removeChild(messageToRemove);
+                                }
+                            } catch { }
+                            break;
+                    }
+                    break;
+
+                case "remove":
+                    utils.removeWidget();
+                    break;
+
+                case "state-update":
+                    // If we've set the chat message state to null, we're clearing the widget
+                    if (event.data.widgetConfig.state?.chatMessages == null) {
+                        utils.updateWidgetContent(generateWidgetHtml(event.data.widgetConfig));
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+    }
+};
\ No newline at end of file
diff --git a/src/backend/overlay-widgets/builtin-types/custom/custom-advanced.ts b/src/backend/overlay-widgets/builtin-types/custom/custom-advanced.ts
index 8fc0263e8..4533788a9 100644
--- a/src/backend/overlay-widgets/builtin-types/custom/custom-advanced.ts
+++ b/src/backend/overlay-widgets/builtin-types/custom/custom-advanced.ts
@@ -115,7 +115,8 @@ if (eventName === "show") {
                 overlayWrapperElement: document.body.querySelector(".wrapper"),
                 utils: {
                     ...utils,
-                    sendMessageToFirebot: utils.sendMessageToFirebot.bind(utils)
+                    sendMessageToFirebot: utils.sendMessageToFirebot.bind(utils),
+                    stylesToString: utils.stylesToString.bind(utils)
                 }
             });
         }
diff --git a/src/backend/overlay-widgets/builtin-types/image/image.ts b/src/backend/overlay-widgets/builtin-types/image/image.ts
index 86f696276..f190a0741 100644
--- a/src/backend/overlay-widgets/builtin-types/image/image.ts
+++ b/src/backend/overlay-widgets/builtin-types/image/image.ts
@@ -93,7 +93,7 @@ export const image: OverlayWidgetType<Settings, State> = {
                 if (config.settings?.imageType === "url" && config.settings?.url) {
                     imageSrc = config.settings.url;
                 } else if (config.settings?.imageType === "local" && config.resourceTokens.filepath) {
-                    imageSrc = `http://${window.location.hostname}:7472/resource/${config.resourceTokens.filepath}`;
+                    imageSrc = `//${baseUrl}/resource/${config.resourceTokens.filepath}`;
                 }
 
                 return `
diff --git a/src/backend/overlay-widgets/builtin-types/index.ts b/src/backend/overlay-widgets/builtin-types/index.ts
index f7a5ca4c7..df527a7c2 100644
--- a/src/backend/overlay-widgets/builtin-types/index.ts
+++ b/src/backend/overlay-widgets/builtin-types/index.ts
@@ -7,6 +7,8 @@ import { text } from "./text/text";
 import { currentDateTime } from "./current-date-time/current-date-time";
 import { countdownToDate } from "./countdown-to-date/countdown-to-date";
 import { image } from "./image/image";
+import { chat } from "./chat/chat";
+import { chatAdvanced } from "./chat/chat-advanced";
 
 export default [
     progressbar,
@@ -17,5 +19,7 @@ export default [
     customAdvanced,
     currentDateTime,
     text,
-    image
+    image,
+    chat,
+    chatAdvanced
 ];
\ No newline at end of file
diff --git a/src/backend/power-ups/power-ups-manager.ts b/src/backend/power-ups/power-ups-manager.ts
new file mode 100644
index 000000000..4c1aa923c
--- /dev/null
+++ b/src/backend/power-ups/power-ups-manager.ts
@@ -0,0 +1,232 @@
+import { JsonDB } from "node-json-db";
+
+import { PowerUpRedemptionMetadata, SavedPowerUp } from "../../types/power-ups";
+import { EffectList } from "../../types/effects";
+import { Trigger } from "../../types/triggers";
+import { CustomPowerUp } from "../streaming-platforms/twitch/api/resource/power-ups";
+
+import { AccountAccess } from "../common/account-access";
+import { ActiveUserHandler } from "../chat/active-user-handler";
+import { ProfileManager } from "../common/profile-manager";
+import { TwitchApi } from "../streaming-platforms/twitch/api";
+import effectRunner from "../common/effect-runner";
+import frontendCommunicator from "../common/frontend-communicator";
+import logger from "../logwrapper";
+
+class PowerUpsManager {
+    powerUps: Record<string, SavedPowerUp> = {};
+
+    constructor() {
+        frontendCommunicator.on("power-ups:get-all", () => Object.values(this.powerUps));
+        frontendCommunicator.onAsync("power-ups:get-all", async () => Object.values(this.powerUps));
+
+        frontendCommunicator.onAsync("power-ups:save", async (powerUp: SavedPowerUp) => this.savePowerUp(powerUp));
+
+        frontendCommunicator.onAsync(
+            "power-ups:save-all",
+            async (powerUps: SavedPowerUp[]) => await this.saveAllPowerUps(powerUps)
+        );
+
+        frontendCommunicator.onAsync("power-ups:sync", async (): Promise<SavedPowerUp[]> => {
+            await this.loadPowerUps();
+            return Object.values(this.powerUps);
+        });
+
+        frontendCommunicator.on("power-ups:manually-trigger", (powerUpId: string) => {
+            const savedPowerUp = this.powerUps[powerUpId];
+
+            if (savedPowerUp == null) {
+                return;
+            }
+
+            // Manually triggered by streamer, must pass in userId and userDisplayName can be falsy
+            void this.triggerPowerUp(
+                powerUpId,
+                {
+                    messageText: "Testing power-up",
+                    powerUpId: savedPowerUp.id,
+                    bits: savedPowerUp.twitchData.bits,
+                    powerUpImage: savedPowerUp.twitchData.image
+                        ? savedPowerUp.twitchData.image.url4x
+                        : savedPowerUp.twitchData.defaultImage.url4x,
+                    powerUpName: savedPowerUp.twitchData.title,
+                    username: AccountAccess.getAccounts().streamer.displayName,
+                    userId: "",
+                    userDisplayName: ""
+                },
+                true
+            );
+        });
+    }
+
+    getPowerUpsDb(): JsonDB {
+        return ProfileManager.getJsonDbInProfile("power-ups");
+    }
+
+    async loadPowerUps() {
+        logger.debug(`Attempting to load power-ups...`);
+
+        try {
+            // Load existing power-up data
+            const powerUpsData = (this.getPowerUpsDb().getData("/") || {}) as Record<string, SavedPowerUp>;
+            const savedPowerUps = Object.values(powerUpsData);
+
+            // Get all power-ups from Twitch
+            const twitchPowerUps: CustomPowerUp[] = await TwitchApi.powerUps.getCustomPowerUps();
+            if (twitchPowerUps == null) {
+                logger.error("Twitch power-ups returned null!");
+                this.powerUps = powerUpsData;
+                return;
+            }
+
+            // Determine new power-ups (not previously saved)
+            const newPowerUps: SavedPowerUp[] = twitchPowerUps
+                .filter(np => savedPowerUps.every(p => p.id !== np.id))
+                .map((np) => {
+                    return {
+                        id: np.id,
+                        twitchData: np
+                    };
+                });
+
+            // Sync existing power-up Twitch data, drop those that no longer exist on Twitch, then add new ones
+            const syncedPowerUps: Record<string, SavedPowerUp> = savedPowerUps
+                .map((p) => {
+                    p.twitchData = twitchPowerUps.find(tp => tp.id === p.id);
+                    return p;
+                })
+                .filter(p => p.twitchData != null)
+                .concat(newPowerUps)
+                .reduce((acc, current) => {
+                    acc[current.id] = current;
+                    return acc;
+                }, {});
+
+            this.getPowerUpsDb().push("/", syncedPowerUps);
+
+            this.powerUps = syncedPowerUps;
+
+            logger.debug(`Loaded power-ups.`);
+
+            frontendCommunicator.send("power-ups:updated-all", Object.values(this.powerUps));
+        } catch (err) {
+            logger.warn(`There was an error reading power-ups file.`, err);
+        }
+    }
+
+    async savePowerUp(powerUp: SavedPowerUp, emitUpdateEvent = false): Promise<SavedPowerUp> {
+        if (powerUp == null || powerUp.id == null) {
+            return null;
+        }
+
+        // Power-ups twitchData is read-only from Firebot; never write back to Twitch.
+        // Preserve the latest twitchData from memory if available.
+        const existing = this.powerUps[powerUp.id];
+        if (existing != null) {
+            powerUp.twitchData = existing.twitchData;
+        }
+
+        this.powerUps[powerUp.id] = powerUp;
+
+        try {
+            const db = this.getPowerUpsDb();
+
+            db.push(`/${powerUp.id}`, powerUp);
+
+            logger.debug(`Saved power-up ${powerUp.id} to file.`);
+
+            if (emitUpdateEvent) {
+                frontendCommunicator.send("power-ups:updated", powerUp);
+            }
+
+            return powerUp;
+        } catch (err) {
+            logger.warn(`There was an error saving a power-up.`, err);
+            return null;
+        }
+    }
+
+    async saveAllPowerUps(allPowerUps: SavedPowerUp[]): Promise<void> {
+        const powerUpsObject: Record<string, SavedPowerUp> = allPowerUps.reduce((acc, current) => {
+            acc[current.id] = current;
+            return acc;
+        }, {});
+
+        this.powerUps = powerUpsObject;
+
+        try {
+            const db = this.getPowerUpsDb();
+
+            db.push("/", this.powerUps);
+
+            logger.debug(`Saved all power-ups to file.`);
+        } catch (err) {
+            logger.warn(`There was an error saving all power-ups.`, err);
+        }
+    }
+
+    getPowerUp(powerUpId: string): SavedPowerUp {
+        if (powerUpId == null) {
+            return null;
+        }
+        return this.powerUps[powerUpId];
+    }
+
+    getPowerUpIdByName(powerUpName: string): string {
+        if (powerUpName == null) {
+            return null;
+        }
+        const powerUp = Object.values(this.powerUps)
+            .filter(p => p.twitchData != null)
+            .find(p => p.twitchData.title === powerUpName);
+
+        return powerUp ? powerUp.id : null;
+    }
+
+    private async triggerPowerUpEffects(
+        metadata: PowerUpRedemptionMetadata,
+        effectList?: EffectList,
+        manual = false
+    ): Promise<void> {
+        if (effectList == null || effectList.list == null) {
+            return;
+        }
+
+        const processEffectsRequest = {
+            trigger: {
+                type: manual ? "manual" : "power_up",
+                metadata: metadata
+            } as Trigger,
+            effects: effectList
+        };
+
+        try {
+            await effectRunner.processEffects(processEffectsRequest);
+        } catch (reason) {
+            logger.error(`error when running effects: ${reason}`);
+        }
+    }
+
+    async triggerPowerUp(
+        powerUpId: string,
+        metadata: PowerUpRedemptionMetadata,
+        manual = false
+    ): Promise<boolean | void> {
+        const savedPowerUp = this.powerUps[powerUpId];
+        if (metadata.username && metadata.userId && metadata.userDisplayName) {
+            await ActiveUserHandler.addActiveUser(
+                { userName: metadata.username, userId: metadata.userId, displayName: metadata.userDisplayName },
+                true
+            );
+        }
+        if (savedPowerUp == null || savedPowerUp.effects == null || savedPowerUp.effects.list == null) {
+            return;
+        }
+
+        return this.triggerPowerUpEffects(metadata, savedPowerUp.effects, manual);
+    }
+}
+
+const powerUpsManager = new PowerUpsManager();
+
+export = powerUpsManager;
diff --git a/src/backend/pronouns/pronoun-manager.ts b/src/backend/pronouns/pronoun-manager.ts
new file mode 100644
index 000000000..42186c0a1
--- /dev/null
+++ b/src/backend/pronouns/pronoun-manager.ts
@@ -0,0 +1,124 @@
+import { app } from "electron";
+import NodeCache from "node-cache";
+
+import { Pronoun, UserPronoun } from "../../types";
+
+import frontendCommunicator from "../common/frontend-communicator";
+import logger from "../logwrapper";
+
+const PRONOUN_SERVICE_BASE_URL = "https://api.pronouns.alejo.io/v1/";
+
+type UserPronounResponse = {
+    channel_id: string;
+    channel_login: string;
+    pronoun_id: string;
+    alt_pronoun_id?: string;
+};
+
+class FirebotPronounManager {
+    private _appVersion = app.getVersion();
+    private _pronounCache: Record<string, Pronoun> = { };
+    private _userPronounCache = new NodeCache({
+        stdTTL: 15 * 60
+    });
+    private _userNoPronounCache = new NodeCache({
+        stdTTL: 15 * 60
+    });
+
+    constructor() {
+        frontendCommunicator.onAsync("pronouns:get-user-pronouns", this.getUserPronouns);
+    }
+
+    private async callUrl(url: string): Promise<Response> {
+        return await fetch(url, {
+            headers: {
+                "User-Agent": `Firebot/${this._appVersion}`
+            }
+        });
+    }
+
+    async cachePronouns(): Promise<void> {
+        const url = `${PRONOUN_SERVICE_BASE_URL}pronouns`;
+
+        try {
+            const response = await this.callUrl(url);
+
+            if (response.ok) {
+                this._pronounCache = await response.json() as Record<string, Pronoun>;
+            }
+        } catch (error) {
+            logger.error("Unable to cache pronoun definitions", error);
+        }
+    }
+
+    async getUserPronouns(username: string): Promise<UserPronoun | undefined> {
+        const cachedPronouns = this._userPronounCache.get<UserPronoun>(username);
+
+        if (cachedPronouns) {
+            return cachedPronouns;
+        } else if (this._userNoPronounCache[username] === true) {
+            return;
+        }
+
+        const url = `${PRONOUN_SERVICE_BASE_URL}users/${username}?t=${new Date().getTime()}`;
+
+        try {
+            const response = await this.callUrl(url);
+
+            if (response.ok) {
+                const pronouns = await response.json() as UserPronounResponse;
+                this._userPronounCache.set<UserPronoun>(username, {
+                    primary: pronouns.pronoun_id,
+                    secondary: pronouns.alt_pronoun_id
+                });
+                return this._userPronounCache.get<UserPronoun>(username);
+            } else if (response.status === 404) {
+                logger.debug(`No pronouns set for ${username}`);
+                this._userNoPronounCache.set(username, true);
+                return;
+            }
+        } catch (error) {
+            logger.warn(`Unable to get pronouns for ${username}`, error);
+        }
+
+        return;
+    };
+
+    async getUserFriendlyPronounString(username: string, type: "subject" | "object" | "both" = "both") {
+        const pronouns = await this.getUserPronouns(username);
+
+        if (pronouns) {
+            return this.getFriendlyPronounString(pronouns.primary, pronouns.secondary, type);
+        }
+    }
+
+    getFriendlyPronounString(primary: string, secondary: string | undefined, type: "subject" | "object" | "both" = "both"): string | undefined {
+        const primaryPronoun = this._pronounCache[primary];
+        const secondaryPronoun = secondary?.length
+            ? this._pronounCache[secondary]
+            : undefined;
+
+        if (primaryPronoun) {
+            switch (type) {
+                case "subject":
+                    return primaryPronoun.subject;
+
+                case "object":
+                    return primaryPronoun.object;
+
+                default:
+                    if (primaryPronoun.singular === true && secondaryPronoun == null) {
+                        return primaryPronoun.subject;
+                    }
+
+                    return `${primaryPronoun.subject}/${secondaryPronoun ? secondaryPronoun.subject : primaryPronoun.object}`;
+            }
+        }
+
+        return;
+    }
+}
+
+const pronounManager = new FirebotPronounManager();
+
+export { pronounManager as FirebotPronounManager };
\ No newline at end of file
diff --git a/src/backend/quotes/quote-manager.ts b/src/backend/quotes/quote-manager.ts
index 90cf441f2..b00f76aa6 100644
--- a/src/backend/quotes/quote-manager.ts
+++ b/src/backend/quotes/quote-manager.ts
@@ -97,7 +97,7 @@ class QuoteManager {
         try {
             const result = await this.db.updateAsync(
                 { _id: '__autoid__' },
-                { $inc: { seq: number } },
+                { seq: number },
                 { upsert: true, returnUpdatedDocs: true }
             );
 
diff --git a/src/backend/reconnecting-websocket/events.ts b/src/backend/reconnecting-websocket/events.ts
index 70fb4249a..9717323b7 100644
--- a/src/backend/reconnecting-websocket/events.ts
+++ b/src/backend/reconnecting-websocket/events.ts
@@ -33,11 +33,13 @@ export interface WebSocketEventMap {
     error: ErrorEvent;
     message: MessageEvent;
     open: Event;
+    ping: Event;
 }
 
 export interface WebSocketEventListenerMap {
-    close: (event: CloseEvent) => void | {handleEvent: (event: CloseEvent) => void};
-    error: (event: ErrorEvent) => void | {handleEvent: (event: ErrorEvent) => void};
-    message: (event: MessageEvent) => void | {handleEvent: (event: MessageEvent) => void};
-    open: (event: Event) => void | {handleEvent: (event: Event) => void};
+    close: (event: CloseEvent) => void | { handleEvent: (event: CloseEvent) => void };
+    error: (event: ErrorEvent) => void | { handleEvent: (event: ErrorEvent) => void };
+    message: (event: MessageEvent) => void | { handleEvent: (event: MessageEvent) => void };
+    open: (event: Event) => void | { handleEvent: (event: Event) => void };
+    ping: (event: Event) => void | { handleEvent: (event: Event) => void };
 }
\ No newline at end of file
diff --git a/src/backend/reconnecting-websocket/index.ts b/src/backend/reconnecting-websocket/index.ts
index db4221e34..70269aa76 100644
--- a/src/backend/reconnecting-websocket/index.ts
+++ b/src/backend/reconnecting-websocket/index.ts
@@ -22,7 +22,7 @@ export type Options = {
     maxEnqueuedMessages?: number;
     startClosed?: boolean;
     debug?: boolean;
-    wsOptions?: ClientOptions
+    wsOptions?: ClientOptions;
 };
 
 const DEFAULT = {
@@ -46,6 +46,7 @@ export type ListenersMap = {
     message: Array<Events.WebSocketEventListenerMap['message']>;
     open: Array<Events.WebSocketEventListenerMap['open']>;
     close: Array<Events.WebSocketEventListenerMap['close']>;
+    ping: Array<Events.WebSocketEventListenerMap['ping']>;
 };
 
 export default class ReconnectingWebSocket {
@@ -54,7 +55,8 @@ export default class ReconnectingWebSocket {
         error: [],
         message: [],
         open: [],
-        close: []
+        close: [],
+        ping: []
     };
     private _retryCount = -1;
     private _uptimeTimeout: any;
@@ -243,7 +245,7 @@ export default class ReconnectingWebSocket {
             this._debug('send', data);
             this._ws.send(data as any);
         } else {
-            const {maxEnqueuedMessages = DEFAULT.maxEnqueuedMessages} = this._options;
+            const { maxEnqueuedMessages = DEFAULT.maxEnqueuedMessages } = this._options;
             if (this._messageQueue.length < maxEnqueuedMessages) {
                 this._debug('enqueue', data);
                 this._messageQueue.push(data);
@@ -360,14 +362,14 @@ export default class ReconnectingWebSocket {
         if (!isWebSocket(WebSocket)) {
             throw Error('No valid WebSocket class provided');
         }
-        this._wait()
+        void this._wait()
             .then(() => this._getNextUrl(this._url))
             .then((url) => {
                 // close could be called before creating the ws
                 if (this._closeCalled) {
                     return;
                 }
-                this._debug('connect', {url, protocols: this._protocols});
+                this._debug('connect', { url, protocols: this._protocols });
                 this._ws = new WebSocket(url, this._protocols, wsOptions);
                 this._ws.binaryType = this._binaryType as any;
                 this._connectLock = false;
@@ -416,7 +418,7 @@ export default class ReconnectingWebSocket {
 
     private _handleOpen = (event: Event) => {
         this._debug('open event');
-        const {minUptime = DEFAULT.minUptime} = this._options;
+        const { minUptime = DEFAULT.minUptime } = this._options;
 
         clearTimeout(this._connectTimeout);
         this._uptimeTimeout = setTimeout(() => this._acceptOpen(), minUptime);
@@ -455,6 +457,10 @@ export default class ReconnectingWebSocket {
         this._connect();
     };
 
+    private _handlePing = (event: Event) => {
+        this._listeners.ping.forEach(listener => this._callEventListener(event, listener));
+    };
+
     private _handleClose = (event: Events.CloseEvent) => {
         this._debug('close event');
         this._clearTimeouts();
@@ -479,6 +485,7 @@ export default class ReconnectingWebSocket {
         this._ws.removeEventListener('message', this._handleMessage as any);
         // @ts-ignore
         this._ws.removeEventListener('error', this._handleError);
+        this._ws.removeListener('ping', this._handlePing);
     }
 
     private _addListeners() {
@@ -491,6 +498,7 @@ export default class ReconnectingWebSocket {
         this._ws.addEventListener('message', this._handleMessage as any);
         // @ts-ignore
         this._ws.addEventListener('error', this._handleError);
+        this._ws.addListener('ping', this._handlePing);
     }
 
     private _clearTimeouts() {
diff --git a/src/backend/restrictions/restriction-manager.ts b/src/backend/restrictions/restriction-manager.ts
index 61aaee3af..0b8ff00ec 100644
--- a/src/backend/restrictions/restriction-manager.ts
+++ b/src/backend/restrictions/restriction-manager.ts
@@ -84,7 +84,8 @@ class RestrictionsManager extends TypedEmitter<Events> {
             await restrictionDef.predicate(triggerData, restriction, restrictionsAreInherited);
             restrictionPassed = true;
         } catch (reason) {
-            failedReason = (reason as string)?.toLowerCase();
+            failedReason = (reason instanceof Error ? reason.message : (reason as string))?.toLowerCase()
+                ?? "You don't meet the requirements.";
         }
 
         if (restriction.invertCondition) {
diff --git a/src/backend/streaming-platforms/twitch/api/eventsub/custom-subscriptions/power-up-redemption-add-subscription.ts b/src/backend/streaming-platforms/twitch/api/eventsub/custom-subscriptions/power-up-redemption-add-subscription.ts
new file mode 100644
index 000000000..3e3260204
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/api/eventsub/custom-subscriptions/power-up-redemption-add-subscription.ts
@@ -0,0 +1,69 @@
+import type { HelixEventSubSubscription } from "@twurple/api";
+import { EventSubSubscription, EventSubBase } from "@twurple/eventsub-base";
+import { rtfm } from "@twurple/common";
+
+type EventData = {
+    id: string;
+    broadcaster_user_id: string;
+    broadcaster_user_login: string;
+    broadcaster_user_name: string;
+    user_id: string;
+    user_login: string;
+    user_name: string;
+    user_input: string;
+    status: string;
+    custom_power_up: {
+        id: string;
+        title: string;
+        bits_cost: number;
+        prompt: string;
+    };
+    redeemed_at: string;
+};
+
+@rtfm("eventsub-base", "EventSubSubscription")
+export class EventSubPowerUpRedemptionAddSubscription extends EventSubSubscription<EventData> {
+    readonly _cliName = "power-up-redemption-add";
+
+    constructor(
+        handler: (data: EventData) => void,
+        client: EventSubBase,
+        private readonly _broadcasterId: string
+    ) {
+        // @ts-ignore
+        super(handler, client);
+    }
+
+    get id(): string {
+        return `channel.custom_power_up_redemption.add.${this._broadcasterId}`;
+    }
+
+    get authUserId(): string | null {
+        return this._broadcasterId;
+    }
+
+    protected transformData(data: EventData): EventData {
+        return data;
+    }
+
+    protected async _subscribe(): Promise<HelixEventSubSubscription> {
+        return this._client._config.managed
+            ? await this._client._config.apiClient.asUser(
+                this._broadcasterId,
+                async ctx =>
+                    await ctx.eventSub.createSubscription(
+                        "channel.custom_power_up_redemption.add",
+                        "beta",
+                        {
+                        // eslint-disable-next-line camelcase
+                            broadcaster_user_id: this._broadcasterId
+                        },
+                        await this._getTransportOptions(),
+                        this._broadcasterId,
+                        ["bits:read"],
+                        true
+                    )
+            )
+            : undefined;
+    }
+}
diff --git a/src/backend/streaming-platforms/twitch/api/eventsub/eventsub-chat-helpers.ts b/src/backend/streaming-platforms/twitch/api/eventsub/eventsub-chat-helpers.ts
index 021f21d34..95129f864 100644
--- a/src/backend/streaming-platforms/twitch/api/eventsub/eventsub-chat-helpers.ts
+++ b/src/backend/streaming-platforms/twitch/api/eventsub/eventsub-chat-helpers.ts
@@ -19,6 +19,7 @@ import type {
     EventSubChatMessageMentionPart,
     EventSubChatMessagePart
 } from "../twurple-private-types";
+import tinycolor from "tinycolor2";
 
 import type {
     FirebotChatMessage,
@@ -33,8 +34,11 @@ import type {
 import type { FirebotAccount } from "../../../../../types/accounts";
 
 import { AccountAccess } from "../../../../common/account-access";
+import { FirebotPronounManager } from "../../../../pronouns/pronoun-manager";
 import { SettingsManager } from "../../../../common/settings-manager";
 import { TwitchApi } from "../";
+import rankManager from "../../../../ranks/rank-manager";
+import roleManager from "../../../../roles/custom-roles-manager";
 import viewerDatabase from "../../../../viewers/viewer-database";
 import frontendCommunicator from "../../../../common/frontend-communicator";
 import logger from "../../../../logwrapper";
@@ -45,7 +49,7 @@ import { BTTVEmoteProvider } from "../../../../chat/third-party/bttv";
 import { FFZEmoteProvider } from "../../../../chat/third-party/ffz";
 import { SevenTVEmoteProvider } from "../../../../chat/third-party/7tv";
 
-interface ChatBadge {
+export interface ChatBadge {
     title: string;
     url: string;
 }
@@ -67,6 +71,7 @@ class TwitchEventSubChatHelpers {
     readonly HIGHLIGHT_MESSAGE_REWARD_ID = "highlight-message";
 
     private _badgeCache: HelixChatBadgeSet[] = [];
+    private _colorCache: Record<string, string> = { };
 
     private _getAllTwitchEmotes = false;
     private _twitchEmotes: {
@@ -113,6 +118,22 @@ class TwitchEventSubChatHelpers {
         );
     }
 
+    get badges() {
+        return this._badgeCache;
+    }
+
+    get twitchEmotes() {
+        return this._twitchEmotes;
+    }
+
+    get thirdPartyEmotes() {
+        return this._thirdPartyEmotes;
+    }
+
+    get twitchCheermotes() {
+        return this._twitchCheermotes;
+    }
+
     async cacheBadges(): Promise<void> {
         logger.debug("Caching Twitch badges");
         const streamer = AccountAccess.getAccounts().streamer;
@@ -524,6 +545,16 @@ class TwitchEventSubChatHelpers {
         }
     }
 
+    cacheUserColor(userId: string, color?: string | null): string {
+        if (color?.length) {
+            this._colorCache[userId] = color;
+        } else if (this._colorCache[userId] == null) {
+            this._colorCache[userId] = tinycolor.random().toHexString();
+        }
+
+        return this._colorCache[userId];
+    }
+
     /**
      * Parses out any control characters from a chat message (like ACTION when /me is used)
      * @param rawText Raw message text
@@ -547,7 +578,7 @@ class TwitchEventSubChatHelpers {
             && event.sourceBroadcasterId !== AccountAccess.getAccounts().streamer.userId;
 
         let isAnnouncement = false;
-        let announcementColor = undefined;
+        let announcementColor: string | undefined = undefined;
 
         if (event instanceof EventSubChannelChatAnnouncementNotificationEvent) {
             isAnnouncement = true;
@@ -559,8 +590,9 @@ class TwitchEventSubChatHelpers {
             username: event.chatterName,
             userId: event.chatterId,
             userDisplayName: event.chatterDisplayName,
+            pronouns: await FirebotPronounManager.getUserFriendlyPronounString(event.chatterName),
             rawText: isAction ? this.getChatMessage(event.messageText) : event.messageText,
-            color: event.color,
+            color: this.cacheUserColor(event.chatterId, event.color),
             badges: this.parseChatBadges(event.badges),
             parts: [],
             roles: [],
@@ -570,8 +602,8 @@ class TwitchEventSubChatHelpers {
             tagged: false,
             action: isAction,
             isAnnouncement,
-            // eslint-disable-next-line
-            announcementColor: announcementColor ? announcementColor.toUpperCase() : undefined,
+
+            announcementColor: (announcementColor ? announcementColor.toUpperCase() : undefined) as FirebotChatMessage["announcementColor"],
             isCheer: false,
             isReply: false,
             isHiddenFromChatFeed: false,
@@ -627,6 +659,8 @@ class TwitchEventSubChatHelpers {
             chatMessage.roles.push("vip");
         }
 
+        await this.enrichMessageWithRanksAndRoles(chatMessage);
+
         return chatMessage;
     }
 
@@ -679,6 +713,7 @@ class TwitchEventSubChatHelpers {
             username: message.senderUserName,
             userId: message.senderUserId,
             userDisplayName: message.senderUserDisplayName,
+            pronouns: await FirebotPronounManager.getUserFriendlyPronounString(message.senderUserName),
             rawText: isAction ? this.getChatMessage(message.messageText) : message.messageText,
             badges: [],
             parts: [],
@@ -708,6 +743,8 @@ class TwitchEventSubChatHelpers {
         //const messageParts = this.parseMessageParts(chatMessage, message.messageParts);
         //chatMessage.parts = messageParts;
 
+        await this.enrichMessageWithRanksAndRoles(chatMessage);
+
         return chatMessage;
     }
 
@@ -721,6 +758,7 @@ class TwitchEventSubChatHelpers {
             userDisplayName: event.userDisplayName,
             rawText: event.messageText,
             profilePicUrl: profilePicUrl,
+            pronouns: await FirebotPronounManager.getUserFriendlyPronounString(event.userName),
             whisper: false,
             action: false,
             tagged: false,
@@ -775,10 +813,28 @@ class TwitchEventSubChatHelpers {
 
         chatMessage.parts = parts;
 
+        await this.enrichMessageWithRanksAndRoles(chatMessage);
+
         return chatMessage;
     }
+
+    async enrichMessageWithRanksAndRoles(firebotChatMessage: FirebotChatMessage) {
+        const viewer = await viewerDatabase.getViewerById(firebotChatMessage.userId);
+        firebotChatMessage.viewerRanks = Object.entries(viewer?.ranks || {}).reduce((obj, [ladderId, rankId]) => {
+            const ladder = rankManager.getItem(ladderId);
+            if (ladder && ladder.settings.showBadgeInChat && rankId) {
+                obj[ladder.name] = ladder.ranks.find(r => r.id === rankId)?.name || "Unknown";
+            }
+            return obj;
+        }, {} as Record<string, string>);
+
+        const customRoles = roleManager.getAllCustomRolesForViewer(firebotChatMessage.userId);
+        firebotChatMessage.viewerCustomRoles = customRoles
+            .filter(r => r.showBadgeInChat)
+            .map(r => r.name);
+    }
 }
 
 const chatHelpers = new TwitchEventSubChatHelpers();
 
-export = chatHelpers;
\ No newline at end of file
+export { chatHelpers as TwitchEventSubChatHelpers };
\ No newline at end of file
diff --git a/src/backend/streaming-platforms/twitch/api/eventsub/eventsub-client.ts b/src/backend/streaming-platforms/twitch/api/eventsub/eventsub-client.ts
index 657ee7c5b..bfaade49f 100644
--- a/src/backend/streaming-platforms/twitch/api/eventsub/eventsub-client.ts
+++ b/src/backend/streaming-platforms/twitch/api/eventsub/eventsub-client.ts
@@ -4,8 +4,10 @@ import { EventSubWsListener } from "@twurple/eventsub-ws";
 import type { SavedChannelReward } from "../../../../../types";
 
 import { AccountAccess } from "../../../../common/account-access";
+import { FirebotFrontendChatHelpers } from "../../../../chat/frontend-chat-helpers";
 import { SharedChatCache } from "../../chat/shared-chat-cache";
 import { TwitchEventHandlers } from "../../events";
+import { TwitchEventSubChatHelpers } from "./eventsub-chat-helpers";
 import { TwitchApi } from "..";
 import channelRewardManager from "../../../../channel-rewards/channel-reward-manager";
 import twitchRolesManager from "../../../../roles/twitch-roles-manager";
@@ -13,13 +15,13 @@ import chatHelpers from "../../../../chat/chat-helpers";
 import rewardManager from "../../../../channel-rewards/channel-reward-manager";
 import twitchStreamInfoPoll from "../../stream-info-manager";
 import viewerDatabase from "../../../../viewers/viewer-database";
-import frontendCommunicator from "../../../../common/frontend-communicator";
 import logger from "../../../../logwrapper";
 import {
-    getChannelRewardImageUrl,
+    getChannelRewardOrPowerUpImageUrl,
     mapEventSubRewardToTwitchData,
     mapSharedChatParticipants
 } from "./eventsub-helpers";
+import { EventSubPowerUpRedemptionAddSubscription } from "./custom-subscriptions/power-up-redemption-add-subscription";
 
 class TwitchEventSubClient {
     private _eventSubListener: EventSubWsListener;
@@ -50,11 +52,7 @@ class TwitchEventSubClient {
 
         // Follows
         const followSubscription = this._eventSubListener.onChannelFollow(streamer.userId, streamer.userId, (event) => {
-            TwitchEventHandlers.follow.triggerFollow(
-                event.userName,
-                event.userId,
-                event.userDisplayName
-            );
+            TwitchEventHandlers.follow.triggerFollow(event.userName, event.userId, event.userDisplayName);
         });
         this._subscriptions.push(followSubscription);
 
@@ -62,7 +60,9 @@ class TwitchEventSubClient {
         const bitsSubscription = this._eventSubListener.onChannelBitsUse(streamer.userId, async (event) => {
             switch (event.type) {
                 case "cheer": {
-                    const totalBits = (await TwitchApi.bits.getChannelBitsLeaderboard(1, "all", new Date(), event.userId))[0]?.amount ?? 0;
+                    const totalBits =
+                        (await TwitchApi.bits.getChannelBitsLeaderboard(1, "all", new Date(), event.userId))[0]
+                            ?.amount ?? 0;
                     // Future: We could parse event.messageParts into a FirebotChatMessage
                     // This would allow us to expose cheermotes to the cheer event,
                     // rather than just chat messages which happen to be cheers.
@@ -72,14 +72,15 @@ class TwitchEventSubClient {
                         event.userDisplayName,
                         event.bits,
                         totalBits,
-                        event.messageText ?? ""
+                        event.messageText ?? "",
+                        event.messageParts
                     );
                     break;
                 }
-                case "combo":
-                    break;
                 case "power_up": {
-                    const totalBits = (await TwitchApi.bits.getChannelBitsLeaderboard(1, "all", new Date(), event.userId))[0]?.amount ?? 0;
+                    const totalBits =
+                        (await TwitchApi.bits.getChannelBitsLeaderboard(1, "all", new Date(), event.userId))[0]
+                            ?.amount ?? 0;
                     switch (event.powerUp.type) {
                         case "celebration":
                             TwitchEventHandlers.bits.triggerPowerupCelebration(
@@ -122,79 +123,89 @@ class TwitchEventSubClient {
         this._subscriptions.push(bitsSubscription);
 
         // AutoMod message hold v2
-        const autoModMessageHoldSub = this._eventSubListener.onAutoModMessageHoldV2(streamer.userId, streamer.userId, async (event) => {
-            const firebotChatMessage = await chatHelpers.buildViewerFirebotChatMessageFromAutoModMessage(event);
-            frontendCommunicator.send("twitch:chat:message", firebotChatMessage);
-        });
+        const autoModMessageHoldSub = this._eventSubListener.onAutoModMessageHoldV2(
+            streamer.userId,
+            streamer.userId,
+            async (event) => {
+                const firebotChatMessage = await chatHelpers.buildViewerFirebotChatMessageFromAutoModMessage(event);
+                FirebotFrontendChatHelpers.sendChatMessageToFrontend(firebotChatMessage);
+            }
+        );
         this._subscriptions.push(autoModMessageHoldSub);
 
         // AutoMod message update v2
-        const autoModMessageUpdateSub = this._eventSubListener.onAutoModMessageUpdateV2(streamer.userId, streamer.userId, (event) => {
-            frontendCommunicator.send("twitch:chat:automod-update", {
-                messageId: event.messageId,
-                newStatus: event.status,
-                resolverName: event.moderatorName,
-                resolverId: event.moderatorId,
-                flaggedPhrases: event.reason === "automod"
-                    ? event.autoMod?.boundaries?.map(b => b.text) ?? []
-                    : event.blockedTerms?.map(b => b.text) ?? []
-            });
-        });
+        const autoModMessageUpdateSub = this._eventSubListener.onAutoModMessageUpdateV2(
+            streamer.userId,
+            streamer.userId,
+            (event) => {
+                FirebotFrontendChatHelpers.updateMessageAutomodStatus(
+                    event.messageId,
+                    event.status,
+                    event.moderatorName,
+                    event.moderatorId,
+                    event.reason === "automod"
+                        ? (event.autoMod?.boundaries?.map(b => b.text) ?? [])
+                        : (event.blockedTerms?.map(b => b.text) ?? [])
+                );
+            }
+        );
         this._subscriptions.push(autoModMessageUpdateSub);
 
         // Channel automatic reward
-        const channelAutomaticRewardSubscription = this._eventSubListener.onChannelAutomaticRewardRedemptionAddV2(streamer.userId, (event) => {
-            switch (event.reward.type) {
-                case "single_message_bypass_sub_mode":
-                    TwitchEventHandlers.rewardRedemption.triggerRedemptionSingleMessageBypassSubMode(
-                        event.userName,
-                        event.userId,
-                        event.userDisplayName,
-                        event.reward.channelPoints
-                    );
-                    break;
-                case "send_highlighted_message":
-                    TwitchEventHandlers.rewardRedemption.triggerRedemptionSendHighlightedMessage(
-                        event.userName,
-                        event.userId,
-                        event.userDisplayName,
-                        event.reward.channelPoints,
-                        event.messageText
-                    );
-                    break;
-                case "random_sub_emote_unlock":
-                    TwitchEventHandlers.rewardRedemption.triggerRedemptionRandomSubEmoteUnlock(
-                        event.userName,
-                        event.userId,
-                        event.userDisplayName,
-                        event.reward.channelPoints,
-                        event.reward.emote.name,
-                        `https://static-cdn.jtvnw.net/emoticons/v2/${event.reward.emote.id}/default/dark/3.0`
-                    );
-                    break;
-                case "chosen_sub_emote_unlock":
-                    TwitchEventHandlers.rewardRedemption.triggerRedemptionChosenSubEmoteUnlock(
-                        event.userName,
-                        event.userId,
-                        event.userDisplayName,
-                        event.reward.channelPoints,
-                        event.reward.emote.name,
-                        `https://static-cdn.jtvnw.net/emoticons/v2/${event.reward.emote.id}/default/dark/3.0`
-                    );
-                    break;
-                case "chosen_modified_sub_emote_unlock":
-                    TwitchEventHandlers.rewardRedemption.triggerRedemptionChosenModifiedSubEmoteUnlock(
-                        event.userName,
-                        event.userId,
-                        event.userDisplayName,
-                        event.reward.channelPoints,
-                        event.reward.emote.name,
-                        `https://static-cdn.jtvnw.net/emoticons/v2/${event.reward.emote.id}/default/dark/3.0`
-                    );
-                    break;
-
+        const channelAutomaticRewardSubscription = this._eventSubListener.onChannelAutomaticRewardRedemptionAddV2(
+            streamer.userId,
+            (event) => {
+                switch (event.reward.type) {
+                    case "single_message_bypass_sub_mode":
+                        TwitchEventHandlers.rewardRedemption.triggerRedemptionSingleMessageBypassSubMode(
+                            event.userName,
+                            event.userId,
+                            event.userDisplayName,
+                            event.reward.channelPoints
+                        );
+                        break;
+                    case "send_highlighted_message":
+                        TwitchEventHandlers.rewardRedemption.triggerRedemptionSendHighlightedMessage(
+                            event.userName,
+                            event.userId,
+                            event.userDisplayName,
+                            event.reward.channelPoints,
+                            event.messageText
+                        );
+                        break;
+                    case "random_sub_emote_unlock":
+                        TwitchEventHandlers.rewardRedemption.triggerRedemptionRandomSubEmoteUnlock(
+                            event.userName,
+                            event.userId,
+                            event.userDisplayName,
+                            event.reward.channelPoints,
+                            event.reward.emote.name,
+                            `https://static-cdn.jtvnw.net/emoticons/v2/${event.reward.emote.id}/default/dark/3.0`
+                        );
+                        break;
+                    case "chosen_sub_emote_unlock":
+                        TwitchEventHandlers.rewardRedemption.triggerRedemptionChosenSubEmoteUnlock(
+                            event.userName,
+                            event.userId,
+                            event.userDisplayName,
+                            event.reward.channelPoints,
+                            event.reward.emote.name,
+                            `https://static-cdn.jtvnw.net/emoticons/v2/${event.reward.emote.id}/default/dark/3.0`
+                        );
+                        break;
+                    case "chosen_modified_sub_emote_unlock":
+                        TwitchEventHandlers.rewardRedemption.triggerRedemptionChosenModifiedSubEmoteUnlock(
+                            event.userName,
+                            event.userId,
+                            event.userDisplayName,
+                            event.reward.channelPoints,
+                            event.reward.emote.name,
+                            `https://static-cdn.jtvnw.net/emoticons/v2/${event.reward.emote.id}/default/dark/3.0`
+                        );
+                        break;
+                }
             }
-        });
+        );
         this._subscriptions.push(channelAutomaticRewardSubscription);
 
         // Channel custom reward add
@@ -204,95 +215,156 @@ class TwitchEventSubClient {
         this._subscriptions.push(customRewardAddSubscription);
 
         // Channel custom reward update
-        const customRewardUpdateSubscription = this._eventSubListener.onChannelRewardUpdate(streamer.userId, (event) => {
-            channelRewardManager.saveTwitchDataForChannelReward(mapEventSubRewardToTwitchData(event));
-        });
+        const customRewardUpdateSubscription = this._eventSubListener.onChannelRewardUpdate(
+            streamer.userId,
+            (event) => {
+                channelRewardManager.saveTwitchDataForChannelReward(mapEventSubRewardToTwitchData(event));
+            }
+        );
         this._subscriptions.push(customRewardUpdateSubscription);
 
         // Channel custom reward remove
-        const customRewardRemoveSubscription = this._eventSubListener.onChannelRewardRemove(streamer.userId, async (event) => {
-            const firebotReward: SavedChannelReward | null = channelRewardManager.getChannelReward(event.id);
+        const customRewardRemoveSubscription = this._eventSubListener.onChannelRewardRemove(
+            streamer.userId,
+            async (event) => {
+                const firebotReward: SavedChannelReward | null = channelRewardManager.getChannelReward(event.id);
 
-            if (!firebotReward) {
-                return;
-            }
+                if (!firebotReward) {
+                    return;
+                }
 
-            await channelRewardManager.deleteChannelReward(event.id, false, true);
-        });
+                await channelRewardManager.deleteChannelReward(event.id, false, true);
+            }
+        );
         this._subscriptions.push(customRewardRemoveSubscription);
 
         // Channel custom reward
-        const customRewardRedemptionSubscription = this._eventSubListener.onChannelRedemptionAdd(streamer.userId, (event) => {
-            const reward = channelRewardManager.getChannelReward(event.rewardId);
-            if (!reward) {
-                logger.debug(`Received a reward redemption for a reward that does not exist locally. Reward: ${event.rewardTitle}`, event);
-                return;
-            }
+        const customRewardRedemptionSubscription = this._eventSubListener.onChannelRedemptionAdd(
+            streamer.userId,
+            (event) => {
+                const reward = channelRewardManager.getChannelReward(event.rewardId);
+                if (!reward) {
+                    logger.debug(
+                        `Received a reward redemption for a reward that does not exist locally. Reward: ${event.rewardTitle}`,
+                        event
+                    );
+                    return;
+                }
 
-            const imageUrl = getChannelRewardImageUrl(reward.twitchData);
-
-            TwitchEventHandlers.rewardRedemption.handleRewardRedemption(
-                event.id,
-                event.status,
-                event.input,
-                event.userId,
-                event.userName,
-                event.userDisplayName,
-                event.rewardId,
-                event.rewardTitle,
-                event.rewardPrompt,
-                event.rewardCost,
-                imageUrl
-            );
+                const imageUrl = getChannelRewardOrPowerUpImageUrl(reward.twitchData);
+
+                TwitchEventHandlers.rewardRedemption.handleRewardRedemption(
+                    event.id,
+                    event.status,
+                    event.input,
+                    event.userId,
+                    event.userName,
+                    event.userDisplayName,
+                    event.rewardId,
+                    event.rewardTitle,
+                    event.rewardPrompt,
+                    event.rewardCost,
+                    imageUrl
+                );
 
-            if (!reward.twitchData.shouldRedemptionsSkipRequestQueue && reward.manageable) {
-                rewardManager.addRewardRedemption(event.rewardId, {
-                    id: event.id,
-                    rewardId: event.rewardId,
-                    redemptionDate: event.redemptionDate,
-                    userId: event.userId,
-                    userName: event.userName,
-                    userDisplayName: event.userDisplayName,
-                    rewardMessage: event.input
-                });
+                if (!reward.twitchData.shouldRedemptionsSkipRequestQueue && reward.manageable) {
+                    rewardManager.addRewardRedemption(event.rewardId, {
+                        id: event.id,
+                        rewardId: event.rewardId,
+                        redemptionDate: event.redemptionDate,
+                        userId: event.userId,
+                        userName: event.userName,
+                        userDisplayName: event.userDisplayName,
+                        rewardMessage: event.input
+                    });
+                }
             }
-        });
+        );
         this._subscriptions.push(customRewardRedemptionSubscription);
 
-        const customRewardRedemptionUpdateSubscription = this._eventSubListener.onChannelRedemptionUpdate(streamer.userId, (event) => {
-            const reward = channelRewardManager.getChannelReward(event.rewardId);
-            if (!reward) {
-                logger.debug(`Received a reward redemption update for a reward that does not exist locally. Reward: ${event.rewardTitle}`, event);
-                return;
-            }
+        const customRewardRedemptionUpdateSubscription = this._eventSubListener.onChannelRedemptionUpdate(
+            streamer.userId,
+            (event) => {
+                const reward = channelRewardManager.getChannelReward(event.rewardId);
+                if (!reward) {
+                    logger.debug(
+                        `Received a reward redemption update for a reward that does not exist locally. Reward: ${event.rewardTitle}`,
+                        event
+                    );
+                    return;
+                }
 
-            if (reward.twitchData.shouldRedemptionsSkipRequestQueue) {
-                logger.debug(`Received a reward redemption update for a reward that should skip the request queue. Reward: ${event.rewardTitle}`, event);
-                return;
-            }
+                if (reward.twitchData.shouldRedemptionsSkipRequestQueue) {
+                    logger.debug(
+                        `Received a reward redemption update for a reward that should skip the request queue. Reward: ${event.rewardTitle}`,
+                        event
+                    );
+                    return;
+                }
 
-            const imageUrl = getChannelRewardImageUrl(reward.twitchData);
-
-            TwitchEventHandlers.rewardRedemption.handleRewardUpdated(
-                event.id,
-                event.status,
-                event.input,
-                event.userId,
-                event.userName,
-                event.userDisplayName,
-                event.rewardId,
-                event.rewardTitle,
-                event.rewardPrompt,
-                event.rewardCost,
-                imageUrl
-            );
+                const imageUrl = getChannelRewardOrPowerUpImageUrl(reward.twitchData);
 
-            if (reward.manageable) {
-                rewardManager.removeRewardRedemption(event.rewardId, event.id);
+                TwitchEventHandlers.rewardRedemption.handleRewardUpdated(
+                    event.id,
+                    event.status,
+                    event.input,
+                    event.userId,
+                    event.userName,
+                    event.userDisplayName,
+                    event.rewardId,
+                    event.rewardTitle,
+                    event.rewardPrompt,
+                    event.rewardCost,
+                    imageUrl
+                );
+
+                if (reward.manageable) {
+                    rewardManager.removeRewardRedemption(event.rewardId, event.id);
+                }
             }
-        });
+        );
         this._subscriptions.push(customRewardRedemptionUpdateSubscription);
 
+        // Custom Power-up Redemption Add
+        // @ts-ignore
+        const customPowerUpRedemptionSubscription = this._eventSubListener._genericSubscribe(
+            EventSubPowerUpRedemptionAddSubscription,
+            async (event) => {
+                if (!event.custom_power_up.id) {
+                    return;
+                }
+
+                const powerUp = await TwitchApi.powerUps.getCustomPowerUpById(event.custom_power_up.id);
+
+                if (!powerUp) {
+                    logger.debug(
+                        `Received a custom power-up redemption for an unknown power-up. Power-up ID: ${event.custom_power_up.id}`,
+                        event
+                    );
+                    return;
+                }
+
+                const imageUrl = getChannelRewardOrPowerUpImageUrl(powerUp);
+
+                TwitchEventHandlers.bits.handleCustomPowerUpRedemption(
+                    event.id,
+                    event.status,
+                    event.user_input,
+                    event.user_id,
+                    event.user_login,
+                    event.user_name,
+                    powerUp.id,
+                    powerUp.title,
+                    powerUp.prompt,
+                    powerUp.bits,
+                    imageUrl
+                );
+            },
+            this._eventSubListener,
+            streamer.userId
+        );
+        this._subscriptions.push(customPowerUpRedemptionSubscription);
+
         // Incoming Raid
         const incomingRaidSubscription = this._eventSubListener.onChannelRaidTo(streamer.userId, (event) => {
             TwitchEventHandlers.raid.triggerIncomingRaid(
@@ -322,82 +394,105 @@ class TwitchEventSubClient {
         this._subscriptions.push(outboundRaidSubscription);
 
         // Shared Chat Started
-        const sharedChatStartedSubscription = this._eventSubListener.onChannelSharedChatSessionBegin(streamer.userId, async (event) => {
-            SharedChatCache.enableSharedChat();
-            SharedChatCache.participants = await mapSharedChatParticipants(event.participants);
-            TwitchEventHandlers.chat.triggerSharedChatEnabled();
-        });
+        const sharedChatStartedSubscription = this._eventSubListener.onChannelSharedChatSessionBegin(
+            streamer.userId,
+            async (event) => {
+                SharedChatCache.enableSharedChat();
+                SharedChatCache.participants = await mapSharedChatParticipants(event.participants);
+                TwitchEventHandlers.chat.triggerSharedChatEnabled();
+            }
+        );
         this._subscriptions.push(sharedChatStartedSubscription);
 
         // Shared Chat Updated
-        const sharedChatUpdatedSubscription = this._eventSubListener.onChannelSharedChatSessionUpdate(streamer.userId, async (event) => {
-            SharedChatCache.participants = await mapSharedChatParticipants(event.participants);
-            TwitchEventHandlers.chat.triggerSharedChatUpdated();
-        });
+        const sharedChatUpdatedSubscription = this._eventSubListener.onChannelSharedChatSessionUpdate(
+            streamer.userId,
+            async (event) => {
+                SharedChatCache.participants = await mapSharedChatParticipants(event.participants);
+                TwitchEventHandlers.chat.triggerSharedChatUpdated();
+            }
+        );
         this._subscriptions.push(sharedChatUpdatedSubscription);
 
         // Shared Chat Ended
-        const sharedChatEndedSubscription = this._eventSubListener.onChannelSharedChatSessionEnd(streamer.userId, () => {
-            SharedChatCache.disableSharedChat();
-            TwitchEventHandlers.chat.triggerSharedChatEnded();
-        });
+        const sharedChatEndedSubscription = this._eventSubListener.onChannelSharedChatSessionEnd(
+            streamer.userId,
+            () => {
+                SharedChatCache.disableSharedChat();
+                TwitchEventHandlers.chat.triggerSharedChatEnded();
+            }
+        );
         this._subscriptions.push(sharedChatEndedSubscription);
 
         // Shoutout sent to another channel
-        const shoutoutSentSubscription = this._eventSubListener.onChannelShoutoutCreate(streamer.userId, streamer.userId, (event) => {
-            TwitchEventHandlers.shoutout.triggerShoutoutSent(
-                event.shoutedOutBroadcasterName,
-                event.shoutedOutBroadcasterId,
-                event.shoutedOutBroadcasterDisplayName,
-                event.moderatorName,
-                event.moderatorId,
-                event.moderatorDisplayName,
-                event.viewerCount
-            );
-        });
+        const shoutoutSentSubscription = this._eventSubListener.onChannelShoutoutCreate(
+            streamer.userId,
+            streamer.userId,
+            (event) => {
+                TwitchEventHandlers.shoutout.triggerShoutoutSent(
+                    event.shoutedOutBroadcasterName,
+                    event.shoutedOutBroadcasterId,
+                    event.shoutedOutBroadcasterDisplayName,
+                    event.moderatorName,
+                    event.moderatorId,
+                    event.moderatorDisplayName,
+                    event.viewerCount
+                );
+            }
+        );
         this._subscriptions.push(shoutoutSentSubscription);
 
         // Shoutout received from another channel
-        const shoutoutReceivedSubscription = this._eventSubListener.onChannelShoutoutReceive(streamer.userId, streamer.userId, (event) => {
-            TwitchEventHandlers.shoutout.triggerShoutoutReceived(
-                event.shoutingOutBroadcasterName,
-                event.shoutingOutBroadcasterId,
-                event.shoutingOutBroadcasterDisplayName,
-                event.viewerCount
-            );
-        });
+        const shoutoutReceivedSubscription = this._eventSubListener.onChannelShoutoutReceive(
+            streamer.userId,
+            streamer.userId,
+            (event) => {
+                TwitchEventHandlers.shoutout.triggerShoutoutReceived(
+                    event.shoutingOutBroadcasterName,
+                    event.shoutingOutBroadcasterId,
+                    event.shoutingOutBroadcasterDisplayName,
+                    event.viewerCount
+                );
+            }
+        );
         this._subscriptions.push(shoutoutReceivedSubscription);
 
         // Hype Train start
-        const hypeTrainBeginSubscription = this._eventSubListener.onChannelHypeTrainBeginV2(streamer.userId, (event) => {
-            TwitchEventHandlers.hypeTrain.triggerHypeTrainStart(
-                event.total,
-                event.progress,
-                event.goal,
-                event.level,
-                event.startDate,
-                event.expiryDate,
-                event.topContributors,
-                event.type,
-                event.isSharedTrain
-            );
-        });
+        const hypeTrainBeginSubscription = this._eventSubListener.onChannelHypeTrainBeginV2(
+            streamer.userId,
+            (event) => {
+                TwitchEventHandlers.hypeTrain.triggerHypeTrainStart(
+                    event.total,
+                    event.progress,
+                    event.goal,
+                    event.level,
+                    event.startDate,
+                    event.expiryDate,
+                    event.topContributors,
+                    event.type,
+                    event.isSharedTrain
+                );
+            }
+        );
         this._subscriptions.push(hypeTrainBeginSubscription);
 
         // Hype Train progress
-        const hypeTrainProgressSubscription = this._eventSubListener.onChannelHypeTrainProgressV2(streamer.userId, (event) => {
-            TwitchEventHandlers.hypeTrain.triggerHypeTrainProgress(
-                event.total,
-                event.progress,
-                event.goal,
-                event.level,
-                event.startDate,
-                event.expiryDate,
-                event.topContributors,
-                event.type,
-                event.isSharedTrain
-            );
-        });
+        const hypeTrainProgressSubscription = this._eventSubListener.onChannelHypeTrainProgressV2(
+            streamer.userId,
+            (event) => {
+                TwitchEventHandlers.hypeTrain.triggerHypeTrainProgress(
+                    event.total,
+                    event.progress,
+                    event.goal,
+                    event.level,
+                    event.startDate,
+                    event.expiryDate,
+                    event.topContributors,
+                    event.type,
+                    event.isSharedTrain
+                );
+            }
+        );
         this._subscriptions.push(hypeTrainProgressSubscription);
 
         // Hype Train end
@@ -428,15 +523,18 @@ class TwitchEventSubClient {
         this._subscriptions.push(channelGoalBeginSubscription);
 
         // Channel goal progress
-        const channelGoalProgressSubscription = this._eventSubListener.onChannelGoalProgress(streamer.userId, (event) => {
-            TwitchEventHandlers.goal.triggerChannelGoalProgress(
-                event.description,
-                event.type,
-                event.startDate,
-                event.currentAmount,
-                event.targetAmount
-            );
-        });
+        const channelGoalProgressSubscription = this._eventSubListener.onChannelGoalProgress(
+            streamer.userId,
+            (event) => {
+                TwitchEventHandlers.goal.triggerChannelGoalProgress(
+                    event.description,
+                    event.type,
+                    event.startDate,
+                    event.currentAmount,
+                    event.targetAmount
+                );
+            }
+        );
         this._subscriptions.push(channelGoalProgressSubscription);
 
         // Channel goal end
@@ -496,25 +594,31 @@ class TwitchEventSubClient {
         this._subscriptions.push(pollEndSubscription);
 
         // Channel prediction begin
-        const predictionBeginSubscription = this._eventSubListener.onChannelPredictionBegin(streamer.userId, (event) => {
-            TwitchEventHandlers.prediction.triggerChannelPredictionBegin(
-                event.title,
-                event.outcomes,
-                event.startDate,
-                event.lockDate
-            );
-        });
+        const predictionBeginSubscription = this._eventSubListener.onChannelPredictionBegin(
+            streamer.userId,
+            (event) => {
+                TwitchEventHandlers.prediction.triggerChannelPredictionBegin(
+                    event.title,
+                    event.outcomes,
+                    event.startDate,
+                    event.lockDate
+                );
+            }
+        );
         this._subscriptions.push(predictionBeginSubscription);
 
         // Channel prediction progress
-        const predictionProgressSubscription = this._eventSubListener.onChannelPredictionProgress(streamer.userId, (event) => {
-            TwitchEventHandlers.prediction.triggerChannelPredictionProgress(
-                event.title,
-                event.outcomes,
-                event.startDate,
-                event.lockDate
-            );
-        });
+        const predictionProgressSubscription = this._eventSubListener.onChannelPredictionProgress(
+            streamer.userId,
+            (event) => {
+                TwitchEventHandlers.prediction.triggerChannelPredictionProgress(
+                    event.title,
+                    event.outcomes,
+                    event.startDate,
+                    event.lockDate
+                );
+            }
+        );
         this._subscriptions.push(predictionProgressSubscription);
 
         // Channel prediction lock
@@ -567,69 +671,81 @@ class TwitchEventSubClient {
                 );
             }
 
-            frontendCommunicator.send("twitch:chat:user:delete-messages", event.userName);
+            FirebotFrontendChatHelpers.deleteUserMessagesFromFrontend(event.userName);
         });
         this._subscriptions.push(banSubscription);
 
         // Charity Campaign Start
-        const charityCampaignStartSubscription = this._eventSubListener.onChannelCharityCampaignStart(streamer.userId, (event) => {
-            TwitchEventHandlers.charity.triggerCharityCampaignStart(
-                event.charityName,
-                event.charityDescription,
-                event.charityLogo,
-                event.charityWebsite,
-                event.currentAmount.localizedValue,
-                event.currentAmount.currency,
-                event.targetAmount.localizedValue,
-                event.targetAmount.currency
-            );
-        });
+        const charityCampaignStartSubscription = this._eventSubListener.onChannelCharityCampaignStart(
+            streamer.userId,
+            (event) => {
+                TwitchEventHandlers.charity.triggerCharityCampaignStart(
+                    event.charityName,
+                    event.charityDescription,
+                    event.charityLogo,
+                    event.charityWebsite,
+                    event.currentAmount.localizedValue,
+                    event.currentAmount.currency,
+                    event.targetAmount.localizedValue,
+                    event.targetAmount.currency
+                );
+            }
+        );
         this._subscriptions.push(charityCampaignStartSubscription);
 
         // Charity Donation
-        const charityDonationSubscription = this._eventSubListener.onChannelCharityDonation(streamer.userId, (event) => {
-            TwitchEventHandlers.charity.triggerCharityDonation(
-                event.donorName,
-                event.donorId,
-                event.donorDisplayName,
-                event.charityName,
-                event.charityDescription,
-                event.charityLogo,
-                event.charityWebsite,
-                event.amount.localizedValue,
-                event.amount.currency
-            );
-        });
+        const charityDonationSubscription = this._eventSubListener.onChannelCharityDonation(
+            streamer.userId,
+            (event) => {
+                TwitchEventHandlers.charity.triggerCharityDonation(
+                    event.donorName,
+                    event.donorId,
+                    event.donorDisplayName,
+                    event.charityName,
+                    event.charityDescription,
+                    event.charityLogo,
+                    event.charityWebsite,
+                    event.amount.localizedValue,
+                    event.amount.currency
+                );
+            }
+        );
         this._subscriptions.push(charityDonationSubscription);
 
         // Charity Campaign Progress
-        const charityCampaignProgressSubscription = this._eventSubListener.onChannelCharityCampaignProgress(streamer.userId, (event) => {
-            TwitchEventHandlers.charity.triggerCharityCampaignProgress(
-                event.charityName,
-                event.charityDescription,
-                event.charityLogo,
-                event.charityWebsite,
-                event.currentAmount.localizedValue,
-                event.currentAmount.currency,
-                event.targetAmount.localizedValue,
-                event.targetAmount.currency
-            );
-        });
+        const charityCampaignProgressSubscription = this._eventSubListener.onChannelCharityCampaignProgress(
+            streamer.userId,
+            (event) => {
+                TwitchEventHandlers.charity.triggerCharityCampaignProgress(
+                    event.charityName,
+                    event.charityDescription,
+                    event.charityLogo,
+                    event.charityWebsite,
+                    event.currentAmount.localizedValue,
+                    event.currentAmount.currency,
+                    event.targetAmount.localizedValue,
+                    event.targetAmount.currency
+                );
+            }
+        );
         this._subscriptions.push(charityCampaignProgressSubscription);
 
         // Charity Campaign End
-        const charityCampaignEndSubscription = this._eventSubListener.onChannelCharityCampaignStop(streamer.userId, (event) => {
-            TwitchEventHandlers.charity.triggerCharityCampaignEnd(
-                event.charityName,
-                event.charityDescription,
-                event.charityLogo,
-                event.charityWebsite,
-                event.currentAmount.localizedValue,
-                event.currentAmount.currency,
-                event.targetAmount.localizedValue,
-                event.targetAmount.currency
-            );
-        });
+        const charityCampaignEndSubscription = this._eventSubListener.onChannelCharityCampaignStop(
+            streamer.userId,
+            (event) => {
+                TwitchEventHandlers.charity.triggerCharityCampaignEnd(
+                    event.charityName,
+                    event.charityDescription,
+                    event.charityLogo,
+                    event.charityWebsite,
+                    event.currentAmount.localizedValue,
+                    event.currentAmount.currency,
+                    event.targetAmount.localizedValue,
+                    event.targetAmount.currency
+                );
+            }
+        );
         this._subscriptions.push(charityCampaignEndSubscription);
 
         const channelUpdateSubscription = this._eventSubListener.onChannelUpdate(streamer.userId, (event) => {
@@ -643,234 +759,264 @@ class TwitchEventSubClient {
         this._subscriptions.push(channelUpdateSubscription);
 
         // Ad break start/end
-        const channelAdBreakBeginSubscription = this._eventSubListener.onChannelAdBreakBegin(streamer.userId, (event) => {
-            TwitchEventHandlers.ad.triggerAdBreakStart(
-                event.requesterName,
-                event.requesterId,
-                event.requesterDisplayName,
-                event.startDate,
-                event.durationSeconds,
-                event.isAutomatic
-            );
-
-            const adBreakEndTime = new Date(event.startDate.getTime());
-            adBreakEndTime.setSeconds(event.startDate.getSeconds() + event.durationSeconds);
-
-            setTimeout(() => {
-                TwitchEventHandlers.ad.triggerAdBreakEnd(
+        const channelAdBreakBeginSubscription = this._eventSubListener.onChannelAdBreakBegin(
+            streamer.userId,
+            (event) => {
+                TwitchEventHandlers.ad.triggerAdBreakStart(
                     event.requesterName,
                     event.requesterId,
                     event.requesterDisplayName,
+                    event.startDate,
                     event.durationSeconds,
                     event.isAutomatic
                 );
-            }, adBreakEndTime.getTime() - (new Date()).getTime());
-        });
-        this._subscriptions.push(channelAdBreakBeginSubscription);
-
-        // Channel Moderate
-        const channelModerateSubscription = this._eventSubListener.onChannelModerate(streamer.userId, streamer.userId, (event) => {
-            switch (event.moderationAction) {
-                case "clear":
-                    frontendCommunicator.send("twitch:chat:clear-feed", event.moderatorName);
-                    TwitchEventHandlers.chat.triggerChatCleared(event.moderatorName, event.moderatorId);
-                    break;
-                case "mod":
-                    twitchRolesManager.addModeratorToModeratorsList({
-                        id: event.userId,
-                        username: event.userName,
-                        displayName: event.userDisplayName
-                    });
-                    break;
-                case "unmod":
-                    twitchRolesManager.removeModeratorFromModeratorsList(event.userId);
-                    break;
-                case "vip":
-                    twitchRolesManager.addVipToVipList({
-                        id: event.userId,
-                        username: event.userName,
-                        displayName: event.userDisplayName
-                    });
-                    break;
-                case "unvip":
-                    twitchRolesManager.removeVipFromVipList(event.userId);
-                    break;
 
-                // chat modes
-                case "emoteonly":
-                case "emoteonlyoff":
-                case "subscribers":
-                case "subscribersoff":
-                case "followers":
-                case "followersoff":
-                case "slow":
-                case "slowoff":
-                case "uniquechat":
-                case "uniquechatoff":
-                    TwitchEventHandlers.chatModeChanged.triggerChatModeChanged(
-                        event.moderationAction,
-                        event.moderationAction.includes("off") ? "disabled" : "enabled",
-                        event.moderatorName,
-                        event.moderationAction === "slow" ? event.waitTimeSeconds : null
-                    );
-                    break;
+                const adBreakEndTime = new Date(event.startDate.getTime());
+                adBreakEndTime.setSeconds(event.startDate.getSeconds() + event.durationSeconds);
 
-                // Chat Message Deleted
-                case "delete":
-                    TwitchEventHandlers.chatMessage.triggerChatMessageDeleted(
-                        event.userName,
-                        event.userId,
-                        event.userDisplayName,
-                        event.messageText,
-                        event.messageId
+                setTimeout(() => {
+                    TwitchEventHandlers.ad.triggerAdBreakEnd(
+                        event.requesterName,
+                        event.requesterId,
+                        event.requesterDisplayName,
+                        event.durationSeconds,
+                        event.isAutomatic
                     );
-                    frontendCommunicator.send("twitch:chat:message:deleted", event.messageId);
-                    break;
-
-                // Outbound Raid Starting
-                case "raid":
-                    TwitchEventHandlers.raid.triggerOutgoingRaidStarted(
-                        event.broadcasterName,
-                        event.broadcasterId,
-                        event.broadcasterDisplayName,
-                        event.userName,
-                        event.userId,
-                        event.userDisplayName,
-                        event.moderatorName,
-                        event.moderatorId,
-                        event.moderatorDisplayName,
-                        event.viewerCount
-                    );
-                    break;
-
-                // Outbound Raid Canceled
-                case "unraid":
-                    TwitchEventHandlers.raid.triggerOutgoingRaidCanceled(
-                        event.broadcasterName,
-                        event.broadcasterId,
-                        event.broadcasterDisplayName,
-                        event.userName,
-                        event.userId,
-                        event.userDisplayName,
-                        event.moderatorName,
-                        event.moderatorId,
-                        event.moderatorDisplayName
-                    );
-                    break;
-
-                case "unban":
-                case "untimeout":
-                    TwitchEventHandlers.viewerBanned.triggerUnbanned(
-                        event.userName,
-                        event.userId,
-                        event.userDisplayName,
-                        event.moderatorName,
-                        event.moderatorId,
-                        event.moderatorDisplayName
-                    );
-                    break;
-
-                // Reserving; already handled in bespoke events; less expensive to move those here.
-                case "ban":
-                case "timeout":
-                    break;
+                }, adBreakEndTime.getTime() - new Date().getTime());
+            }
+        );
+        this._subscriptions.push(channelAdBreakBeginSubscription);
 
-                // Available for future use:
-                case "add_blocked_term":
-                case "add_permitted_term":
-                case "approve_unban_request":
-                case "deny_unban_request":
-                case "remove_blocked_term":
-                case "remove_permitted_term":
-                case "warn":
-                default:
-                    break;
+        // Channel Moderate
+        const channelModerateSubscription = this._eventSubListener.onChannelModerate(
+            streamer.userId,
+            streamer.userId,
+            (event) => {
+                switch (event.moderationAction) {
+                    case "clear":
+                        FirebotFrontendChatHelpers.clearChatFeed(event.moderatorName);
+                        TwitchEventHandlers.chat.triggerChatCleared(event.moderatorName, event.moderatorId);
+                        break;
+                    case "mod":
+                        twitchRolesManager.addModeratorToModeratorsList({
+                            id: event.userId,
+                            username: event.userName,
+                            displayName: event.userDisplayName
+                        });
+                        break;
+                    case "unmod":
+                        twitchRolesManager.removeModeratorFromModeratorsList(event.userId);
+                        break;
+                    case "vip":
+                        twitchRolesManager.addVipToVipList({
+                            id: event.userId,
+                            username: event.userName,
+                            displayName: event.userDisplayName
+                        });
+                        break;
+                    case "unvip":
+                        twitchRolesManager.removeVipFromVipList(event.userId);
+                        break;
+
+                    // chat modes
+                    case "emoteonly":
+                    case "emoteonlyoff":
+                    case "subscribers":
+                    case "subscribersoff":
+                    case "followers":
+                    case "followersoff":
+                    case "slow":
+                    case "slowoff":
+                    case "uniquechat":
+                    case "uniquechatoff":
+                        TwitchEventHandlers.chatModeChanged.triggerChatModeChanged(
+                            event.moderationAction,
+                            event.moderationAction.includes("off") ? "disabled" : "enabled",
+                            event.moderatorName,
+                            event.moderationAction === "slow" ? event.waitTimeSeconds : null
+                        );
+                        break;
+
+                    // Chat Message Deleted
+                    case "delete":
+                        TwitchEventHandlers.chatMessage.triggerChatMessageDeleted(
+                            event.userName,
+                            event.userId,
+                            event.userDisplayName,
+                            event.messageText,
+                            event.messageId
+                        );
+                        FirebotFrontendChatHelpers.deleteMessageFromFrontend(event.messageId);
+                        break;
+
+                    // Outbound Raid Starting
+                    case "raid":
+                        TwitchEventHandlers.raid.triggerOutgoingRaidStarted(
+                            event.broadcasterName,
+                            event.broadcasterId,
+                            event.broadcasterDisplayName,
+                            event.userName,
+                            event.userId,
+                            event.userDisplayName,
+                            event.moderatorName,
+                            event.moderatorId,
+                            event.moderatorDisplayName,
+                            event.viewerCount
+                        );
+                        break;
+
+                    // Outbound Raid Canceled
+                    case "unraid":
+                        TwitchEventHandlers.raid.triggerOutgoingRaidCanceled(
+                            event.broadcasterName,
+                            event.broadcasterId,
+                            event.broadcasterDisplayName,
+                            event.userName,
+                            event.userId,
+                            event.userDisplayName,
+                            event.moderatorName,
+                            event.moderatorId,
+                            event.moderatorDisplayName
+                        );
+                        break;
+
+                    case "unban":
+                    case "untimeout":
+                        TwitchEventHandlers.viewerBanned.triggerUnbanned(
+                            event.userName,
+                            event.userId,
+                            event.userDisplayName,
+                            event.moderatorName,
+                            event.moderatorId,
+                            event.moderatorDisplayName
+                        );
+                        break;
+
+                    // Reserving; already handled in bespoke events; less expensive to move those here.
+                    case "ban":
+                    case "timeout":
+                        break;
+
+                    // Available for future use:
+                    case "add_blocked_term":
+                    case "add_permitted_term":
+                    case "approve_unban_request":
+                    case "deny_unban_request":
+                    case "remove_blocked_term":
+                    case "remove_permitted_term":
+                    case "warn":
+                    default:
+                        break;
+                }
             }
-        });
+        );
         this._subscriptions.push(channelModerateSubscription);
 
         // Chat notification
-        const chatNotificationSubscription = this._eventSubListener.onChannelChatNotification(streamer.userId, streamer.userId, async (event) => {
-            switch (event.type) {
-                case "bits_badge_tier":
-                    TwitchEventHandlers.bits.triggerBitsBadgeUnlock(
-                        event.chatterName ?? "ananonymouscheerer",
-                        event.chatterId,
-                        event.chatterDisplayName ?? "An Anonymous Cheerer",
-                        event.messageText ?? "",
-                        event.newTier
-                    );
-                    break;
+        const chatNotificationSubscription = this._eventSubListener.onChannelChatNotification(
+            streamer.userId,
+            streamer.userId,
+            async (event) => {
+                switch (event.type) {
+                    case "bits_badge_tier":
+                        TwitchEventHandlers.bits.triggerBitsBadgeUnlock(
+                            event.chatterName ?? "ananonymouscheerer",
+                            event.chatterId,
+                            event.chatterDisplayName ?? "An Anonymous Cheerer",
+                            event.messageText ?? "",
+                            event.newTier
+                        );
+                        break;
 
-                case "resub":
-                case "sub":
-                    TwitchEventHandlers.sub.triggerSub(
-                        event.chatterName,
-                        event.chatterId,
-                        event.chatterDisplayName,
-                        event.isPrime ? "Prime" : event.tier,
-                        event.type === "resub" ? event.cumulativeMonths : 1,
-                        event.messageText ?? "",
-                        event.type === "resub" ? event.streakMonths : 1,
-                        event.isPrime,
-                        event.type === "resub"
-                    );
-                    break;
+                    case "resub":
+                    case "sub":
+                        TwitchEventHandlers.sub.triggerSub(
+                            event.chatterName,
+                            event.chatterId,
+                            event.chatterDisplayName,
+                            event.isPrime ? "Prime" : event.tier,
+                            event.type === "resub" ? event.cumulativeMonths : 1,
+                            event.messageText ?? "",
+                            event.type === "resub" ? event.streakMonths : 1,
+                            event.isPrime,
+                            event.type === "resub"
+                        );
+                        break;
 
-                case "community_sub_gift":
-                    TwitchEventHandlers.giftSub.triggerCommunitySubGift(
-                        event.chatterDisplayName ?? "An Anonymous Gifter",
-                        event.id,
-                        event.amount
-                    );
-                    break;
+                    case "community_sub_gift":
+                        TwitchEventHandlers.giftSub.triggerCommunitySubGift(
+                            event.chatterDisplayName ?? "An Anonymous Gifter",
+                            event.id,
+                            event.amount
+                        );
+                        break;
 
-                case "sub_gift":
-                    await TwitchEventHandlers.giftSub.triggerSubGift(
-                        event.chatterDisplayName ?? "An Anonymous Gifter",
-                        event.chatterName,
-                        event.chatterId,
-                        event.chatterIsAnonymous,
-                        event.recipientDisplayName,
-                        event.tier,
-                        event.durationMonths,
-                        event.cumulativeAmount,
-                        event.communityGiftId
-                    );
-                    await viewerDatabase.calculateAutoRanks(event.recipientId);
-                    break;
+                    case "sub_gift":
+                        await TwitchEventHandlers.giftSub.triggerSubGift(
+                            event.chatterDisplayName ?? "An Anonymous Gifter",
+                            event.chatterName,
+                            event.chatterId,
+                            event.chatterIsAnonymous,
+                            event.recipientDisplayName,
+                            event.tier,
+                            event.durationMonths,
+                            event.cumulativeAmount,
+                            event.communityGiftId
+                        );
+                        await viewerDatabase.calculateAutoRanks(event.recipientId);
+                        break;
+
+                    case "gift_paid_upgrade":
+                        {
+                            // IRC chat included this in the event payload. EventSub does not.
+                            const upgradeTier = (await (await event.getBroadcaster()).getSubscriber(event.chatterId))
+                                .tier;
+
+                            TwitchEventHandlers.giftSub.triggerSubGiftUpgrade(
+                                event.chatterName,
+                                event.chatterId,
+                                event.chatterDisplayName,
+                                event.gifterDisplayName,
+                                upgradeTier
+                            );
+                        }
+                        await viewerDatabase.calculateAutoRanks(event.chatterId);
+                        break;
 
-                case "gift_paid_upgrade":
-                    {
-                        // IRC chat included this in the event payload. EventSub does not.
-                        const upgradeTier = (await (await event.getBroadcaster()).getSubscriber(event.chatterId)).tier;
+                    case "prime_paid_upgrade":
+                        TwitchEventHandlers.sub.triggerPrimeUpgrade(
+                            event.chatterName,
+                            event.chatterId,
+                            event.chatterDisplayName,
+                            event.tier
+                        );
+                        await viewerDatabase.calculateAutoRanks(event.chatterId);
+                        break;
 
-                        TwitchEventHandlers.giftSub.triggerSubGiftUpgrade(
+                    case "watch_streak":
+                        TwitchEventHandlers.watchStreak.triggerWatchStreak(
                             event.chatterName,
                             event.chatterId,
                             event.chatterDisplayName,
-                            event.gifterDisplayName,
-                            upgradeTier
+                            event.streakCount,
+                            event.channelPointsAwarded,
+                            event.messageText ?? ""
                         );
-                    }
-                    await viewerDatabase.calculateAutoRanks(event.chatterId);
-                    break;
 
-                case "prime_paid_upgrade":
-                    TwitchEventHandlers.sub.triggerPrimeUpgrade(
-                        event.chatterName,
-                        event.chatterId,
-                        event.chatterDisplayName,
-                        event.tier
-                    );
-                    await viewerDatabase.calculateAutoRanks(event.chatterId);
-                    break;
+                        // Pass any message the viewer sent with the streak to the frontend
+                        if (!!event.messageText?.length) {
+                            FirebotFrontendChatHelpers.sendChatMessageToFrontend(
+                                await TwitchEventSubChatHelpers.buildChatMessageFromChatEvent(event)
+                            );
+                        }
+                        break;
 
-                default:
-                    logger.debug(`Unknown EventSub chat notification type: ${event.type}. Metadata:`, event);
-                    break;
+                    default:
+                        logger.debug(`Unknown EventSub chat notification type: ${event.type}. Metadata:`, event);
+                        break;
+                }
             }
-        });
+        );
         this._subscriptions.push(chatNotificationSubscription);
     }
 
@@ -921,4 +1067,4 @@ class TwitchEventSubClient {
 
 const client = new TwitchEventSubClient();
 
-export { client as TwitchEventSubClient };
\ No newline at end of file
+export { client as TwitchEventSubClient };
diff --git a/src/backend/streaming-platforms/twitch/api/eventsub/eventsub-helpers.ts b/src/backend/streaming-platforms/twitch/api/eventsub/eventsub-helpers.ts
index e73bb8a66..24ae347fd 100644
--- a/src/backend/streaming-platforms/twitch/api/eventsub/eventsub-helpers.ts
+++ b/src/backend/streaming-platforms/twitch/api/eventsub/eventsub-helpers.ts
@@ -4,6 +4,7 @@ import type {
 } from "@twurple/eventsub-base";
 import type { SharedChatParticipant } from "../../../../../types";
 import type { CustomReward } from "../resource/channel-rewards";
+import { CustomPowerUp } from "../resource/power-ups";
 
 export function mapEventSubRewardToTwitchData(event: EventSubChannelRewardEvent): CustomReward {
     const image = {
@@ -46,8 +47,8 @@ export function mapEventSubRewardToTwitchData(event: EventSubChannelRewardEvent)
     return customReward;
 }
 
-export function getChannelRewardImageUrl(reward: CustomReward): string {
-    return reward.image?.url4x || reward.image?.url2x || reward.image?.url1x || "";
+export function getChannelRewardOrPowerUpImageUrl(rewardOrPowerUp: CustomReward | CustomPowerUp): string {
+    return rewardOrPowerUp.image?.url4x || rewardOrPowerUp.image?.url2x || rewardOrPowerUp.image?.url1x || "";
 }
 
 export async function mapSharedChatParticipants(
diff --git a/src/backend/streaming-platforms/twitch/api/index.ts b/src/backend/streaming-platforms/twitch/api/index.ts
index 66ed3f8ff..6c5a2f801 100644
--- a/src/backend/streaming-platforms/twitch/api/index.ts
+++ b/src/backend/streaming-platforms/twitch/api/index.ts
@@ -1,8 +1,4 @@
-import {
-    ApiClient,
-    type HelixChannelUpdate,
-    type HelixUser
-} from "@twurple/api";
+import { ApiClient, type HelixChannelUpdate, type HelixUser } from "@twurple/api";
 import type { AuthProvider } from "@twurple/auth";
 
 import type { FirebotAccount } from "../../../../types/accounts";
@@ -32,15 +28,14 @@ import { AccountAccess } from "../../../common/account-access";
 import { SettingsManager } from "../../../common/settings-manager";
 import frontendCommunicator from "../../../common/frontend-communicator";
 import logger from "../../../logwrapper";
+import { TwitchPowerUpsApi } from "./resource/power-ups";
 
 class TwitchApi {
     private _streamerClient: UserContextApiClient;
     private _botClient: UserContextApiClient;
 
     constructor() {
-        frontendCommunicator.onAsync("search-twitch-games", (query: string) =>
-            this.categories.searchCategories(query)
-        );
+        frontendCommunicator.onAsync("search-twitch-games", (query: string) => this.categories.searchCategories(query));
 
         frontendCommunicator.onAsync("search-twitch-channels", async (query: string) => {
             const response = await this._streamerClient.search.searchChannels(query, { limit: 10 });
@@ -52,12 +47,15 @@ class TwitchApi {
             }));
         });
 
-        frontendCommunicator.onAsync("process-automod-message", async ({ messageId, allow }: { messageId: string, allow: boolean }) =>
-            await this.moderation.processHeldAutoModMessage(messageId, allow)
+        frontendCommunicator.onAsync(
+            "process-automod-message",
+            async ({ messageId, allow }: { messageId: string, allow: boolean }) =>
+                await this.moderation.processHeldAutoModMessage(messageId, allow)
         );
 
-        frontendCommunicator.onAsync("get-twitch-game", async (gameId: string) =>
-            await this.categories.getCategoryById(gameId)
+        frontendCommunicator.onAsync(
+            "get-twitch-game",
+            async (gameId: string) => await this.categories.getCategoryById(gameId)
         );
 
         frontendCommunicator.onAsync("get-channel-info", async () => {
@@ -82,16 +80,15 @@ class TwitchApi {
             }
         });
 
-        frontendCommunicator.onAsync("get-channel-rewards", async () => {
-            const rewards = await this.channelRewards.getCustomChannelRewards();
-            return rewards || [];
-        });
+        // frontendCommunicator.onAsync("get-channel-rewards", async () => {
+        //     const rewards = await this.channelRewards.getCustomChannelRewards();
+        //     return rewards || [];
+        // });
     }
 
     private async refreshAccountData(accountType: "streamer" | "bot"): Promise<FirebotAccount> {
-        const account = accountType === "streamer"
-            ? AccountAccess.getAccounts().streamer
-            : AccountAccess.getAccounts().bot;
+        const account =
+            accountType === "streamer" ? AccountAccess.getAccounts().streamer : AccountAccess.getAccounts().bot;
 
         let data: HelixUser;
         try {
@@ -182,100 +179,105 @@ class TwitchApi {
 
     private _auth: TwitchAuthApi;
     get auth() {
-        return this._auth ??= new TwitchAuthApi(this);
+        return (this._auth ??= new TwitchAuthApi(this));
     }
 
     private _bits: TwitchBitsApi;
     get bits() {
-        return this._bits ??= new TwitchBitsApi(this);
+        return (this._bits ??= new TwitchBitsApi(this));
+    }
+
+    private _powerUps: TwitchPowerUpsApi;
+    get powerUps() {
+        return (this._powerUps ??= new TwitchPowerUpsApi(this));
     }
 
     private _categories: TwitchCategoriesApi;
     get categories() {
-        return this._categories ??= new TwitchCategoriesApi(this);
+        return (this._categories ??= new TwitchCategoriesApi(this));
     }
 
     private _channelRewards: TwitchChannelRewardsApi;
     get channelRewards() {
-        return this._channelRewards ??= new TwitchChannelRewardsApi(this);
+        return (this._channelRewards ??= new TwitchChannelRewardsApi(this));
     }
 
     private _channels: TwitchChannelsApi;
     get channels() {
-        return this._channels ??= new TwitchChannelsApi(this);
+        return (this._channels ??= new TwitchChannelsApi(this));
     }
 
     private _charity: TwitchCharityApi;
     get charity() {
-        return this._charity ??= new TwitchCharityApi(this);
+        return (this._charity ??= new TwitchCharityApi(this));
     }
 
     private _chat: TwitchChatApi;
     get chat() {
-        return this._chat ??= new TwitchChatApi(this);
+        return (this._chat ??= new TwitchChatApi(this));
     }
 
     private _clips: TwitchClipsApi;
     get clips() {
-        return this._clips ??= new TwitchClipsApi(this);
+        return (this._clips ??= new TwitchClipsApi(this));
     }
 
     private _goals: TwitchGoalsApi;
     get goals() {
-        return this._goals ??= new TwitchGoalsApi(this);
+        return (this._goals ??= new TwitchGoalsApi(this));
     }
 
     private _hypeTrain: TwitchHypeTrainApi;
     get hypeTrain() {
-        return this._hypeTrain ??= new TwitchHypeTrainApi(this);
+        return (this._hypeTrain ??= new TwitchHypeTrainApi(this));
     }
 
     private _moderation: TwitchModerationApi;
     get moderation() {
-        return this._moderation ??= new TwitchModerationApi(this);
+        return (this._moderation ??= new TwitchModerationApi(this));
     }
 
     private _polls: TwitchPollsApi;
     get polls() {
-        return this._polls ??= new TwitchPollsApi(this);
+        return (this._polls ??= new TwitchPollsApi(this));
     }
 
     private _preditions: TwitchPredictionsApi;
     get predictions() {
-        return this._preditions ??= new TwitchPredictionsApi(this);
+        return (this._preditions ??= new TwitchPredictionsApi(this));
     }
 
     private _streams: TwitchStreamsApi;
     get streams() {
-        return this._streams ??= new TwitchStreamsApi(this);
+        return (this._streams ??= new TwitchStreamsApi(this));
     }
 
     private _subscriptions: TwitchSubscriptionsApi;
     get subscriptions() {
-        return this._subscriptions ??= new TwitchSubscriptionsApi(this);
+        return (this._subscriptions ??= new TwitchSubscriptionsApi(this));
     }
 
     private _teams: TwitchTeamsApi;
     get teams() {
-        return this._teams ??= new TwitchTeamsApi(this);
+        return (this._teams ??= new TwitchTeamsApi(this));
     }
 
     private _users: TwitchUsersApi;
     get users() {
-        return this._users ??= new TwitchUsersApi(this);
+        return (this._users ??= new TwitchUsersApi(this));
     }
 
     private _videos: TwitchVideosApi;
     get videos() {
-        return this._videos ??= new TwitchVideosApi(this);
+        return (this._videos ??= new TwitchVideosApi(this));
     }
 
     private _whispers: TwitchWhispersApi;
     get whispers() {
-        return this._whispers ??= new TwitchWhispersApi(this);
+        return (this._whispers ??= new TwitchWhispersApi(this));
     }
 }
 
 const twitchApi = new TwitchApi();
 
-export { twitchApi as TwitchApi };
\ No newline at end of file
+export { twitchApi as TwitchApi };
diff --git a/src/backend/streaming-platforms/twitch/api/resource/clips.ts b/src/backend/streaming-platforms/twitch/api/resource/clips.ts
index 96db2befc..a75e02b5a 100644
--- a/src/backend/streaming-platforms/twitch/api/resource/clips.ts
+++ b/src/backend/streaming-platforms/twitch/api/resource/clips.ts
@@ -13,13 +13,15 @@ export class TwitchClipsApi extends ApiResourceBase {
      * Creates a clip in the streamer's channel
      * @returns A {@linkcode HelixClip} representing the newly created clip
      */
-    async createClip(): Promise<HelixClip> {
+    async createClip(duration?: number, title?: string): Promise<HelixClip> {
         try {
             const streamerUserId: string = this.accounts.streamer.userId;
 
             // First, we actually create the clip and get the ID
             const clipId = await this.streamerClient.clips.createClip({
-                channel: streamerUserId
+                channel: streamerUserId,
+                duration,
+                title
             });
 
             // Didn't work, so no point in proceeding
diff --git a/src/backend/streaming-platforms/twitch/api/resource/power-ups.ts b/src/backend/streaming-platforms/twitch/api/resource/power-ups.ts
new file mode 100644
index 000000000..318bc6560
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/api/resource/power-ups.ts
@@ -0,0 +1,110 @@
+import type { SnakeCased } from "../../../../../types";
+import type { TwitchApi } from "..";
+import type { CustomReward, ImageSet } from "./channel-rewards";
+import { ApiResourceBase } from "./api-resource-base";
+
+export type CustomPowerUp = Omit<CustomReward, "cost" | "shouldRedemptionsSkipRequestQueue"> & {
+    bits: number;
+};
+
+export class TwitchPowerUpsApi extends ApiResourceBase {
+    constructor(apiBase: typeof TwitchApi) {
+        super(apiBase);
+    }
+
+    /**
+     * Get an array of custom power-ups for the streamer's channel.
+     */
+    async getCustomPowerUps(): Promise<CustomPowerUp[]> {
+        return this.fetchCustomPowerUps();
+    }
+
+    /**
+     * Get a specific custom power-up by its ID.
+     * @param powerUpId The ID of the custom power-up to retrieve.
+     * @returns The custom power-up with the specified ID, or null if not found.
+     */
+    async getCustomPowerUpById(powerUpId: string): Promise<CustomPowerUp | null> {
+        const powerUps = await this.fetchCustomPowerUps(powerUpId);
+        if (powerUps?.length) {
+            return powerUps[0];
+        }
+        return null;
+    }
+
+    private async fetchCustomPowerUps(id?: string): Promise<CustomPowerUp[]> {
+        try {
+            const query: Record<string, string> = {
+                // eslint-disable-next-line camelcase
+                broadcaster_id: this.accounts.streamer.userId
+            };
+
+            if (id) {
+                query.id = id;
+            }
+
+            const response = await this.streamerClient?.callApi<{ data: ApiCustomPowerUp[] }>({
+                type: "helix",
+                method: "GET",
+                url: "bits/custom_power_ups",
+                query
+            });
+
+            if (!response?.data) {
+                return null;
+            }
+
+            return response.data.map(p => this.mapApiCustomPowerUp(p));
+        } catch (err) {
+            this.logger.debug(`Failed to get twitch custom power-ups: ${(err as Error).message}`);
+            return null;
+        }
+    }
+
+    private mapApiCustomPowerUp(apiCustomPowerUp: ApiCustomPowerUp): CustomPowerUp {
+        const getImageUrl = (scale: 1 | 2 | 4): string => {
+            const urlProp = `url_${scale}x` as const;
+            return apiCustomPowerUp.image?.[urlProp] ?? apiCustomPowerUp.default_image[urlProp];
+        };
+
+        const image: ImageSet = {
+            url1x: getImageUrl(1),
+            url2x: getImageUrl(2),
+            url4x: getImageUrl(4)
+        };
+
+        return {
+            broadcasterId: apiCustomPowerUp.broadcaster_id,
+            broadcasterLogin: apiCustomPowerUp.broadcaster_login,
+            broadcasterName: apiCustomPowerUp.broadcaster_name,
+            id: apiCustomPowerUp.id,
+            title: apiCustomPowerUp.title,
+            prompt: apiCustomPowerUp.prompt,
+            bits: apiCustomPowerUp.bits,
+            image: image,
+            defaultImage: image,
+            backgroundColor: apiCustomPowerUp.background_color,
+            isEnabled: apiCustomPowerUp.is_enabled,
+            isUserInputRequired: apiCustomPowerUp.is_user_input_required,
+            maxPerStreamSetting: {
+                isEnabled: apiCustomPowerUp.max_per_stream_setting.is_enabled,
+                maxPerStream: apiCustomPowerUp.max_per_stream_setting.max_per_stream
+            },
+            maxPerUserPerStreamSetting: {
+                isEnabled: apiCustomPowerUp.max_per_user_per_stream_setting.is_enabled,
+                maxPerUserPerStream: apiCustomPowerUp.max_per_user_per_stream_setting.max_per_user_per_stream
+            },
+            globalCooldownSetting: {
+                isEnabled: apiCustomPowerUp.global_cooldown_setting.is_enabled,
+                globalCooldownSeconds: apiCustomPowerUp.global_cooldown_setting.global_cooldown_seconds
+            },
+            isPaused: apiCustomPowerUp.is_paused,
+            isInStock: apiCustomPowerUp.is_in_stock,
+            cooldownExpiresAt: apiCustomPowerUp.cooldown_expires_at
+                ? new Date(apiCustomPowerUp.cooldown_expires_at)
+                : null
+        };
+    }
+}
+
+type ApiCustomPowerUp = SnakeCased<CustomPowerUp>;
\ No newline at end of file
diff --git a/src/backend/streaming-platforms/twitch/api/twurple-private-types.d.ts b/src/backend/streaming-platforms/twitch/api/twurple-private-types.d.ts
index 6f50dbb1e..49e7d909d 100644
--- a/src/backend/streaming-platforms/twitch/api/twurple-private-types.d.ts
+++ b/src/backend/streaming-platforms/twitch/api/twurple-private-types.d.ts
@@ -1,6 +1,6 @@
 // These are private in Twurple, but we need them, so we redeclare them here.
 
-import type { HelixUserType } from "@twurple/api";
+import type { HelixUserType, HelixBroadcasterType } from "@twurple/api";
 
 export interface EventSubChatMessageTextPart {
     type: 'text';
@@ -46,13 +46,13 @@ export interface EventSubChatMessageMentionPart {
 
 export type EventSubChatMessagePart = EventSubChatMessageTextPart | EventSubChatMessageCheermotePart | EventSubChatMessageEmotePart | EventSubChatMessageMentionPart;
 
+export type EventSubChannelBitsUseMessagePart = EventSubChatMessageTextPart | EventSubChatMessageCheermotePart | EventSubChatMessageEmotePart;
+
 export interface EventSubChatMessageData {
     text: string;
     fragments: EventSubChatMessagePart[];
 }
 
-export type HelixBroadcasterType = 'partner' | 'affiliate' | '';
-
 export interface HelixUserData {
     id: string;
     login: string;
diff --git a/src/backend/streaming-platforms/twitch/events/bits.ts b/src/backend/streaming-platforms/twitch/events/bits.ts
index 638d0ec38..f0d25d627 100644
--- a/src/backend/streaming-platforms/twitch/events/bits.ts
+++ b/src/backend/streaming-platforms/twitch/events/bits.ts
@@ -1,4 +1,7 @@
 import { EventManager } from "../../../events/event-manager";
+import powerUpsManager from "../../../power-ups/power-ups-manager";
+import frontendCommunicator from "../../../common/frontend-communicator";
+import { EventSubChannelBitsUseMessagePart } from "../api/twurple-private-types";
 
 export function triggerCheer(
     username: string,
@@ -6,7 +9,8 @@ export function triggerCheer(
     userDisplayName: string,
     bits: number,
     totalBits: number,
-    cheerMessage: string
+    cheerMessage: string,
+    cheerMessageParts: EventSubChannelBitsUseMessagePart[]
 ): void {
     void EventManager.triggerEvent("twitch", "cheer", {
         username,
@@ -15,7 +19,8 @@ export function triggerCheer(
         isAnonymous: false,
         bits,
         totalBits,
-        cheerMessage
+        cheerMessage,
+        cheerMessageParts
     });
 }
 
@@ -92,4 +97,66 @@ export function triggerPowerupGigantifyEmote(
         emoteName,
         emoteUrl
     });
-}
\ No newline at end of file
+}
+
+export function handleCustomPowerUpRedemption(
+    redemptionId: string,
+    status: string,
+    messageText: string,
+    userId: string,
+    username: string,
+    userDisplayName: string,
+    powerUpId: string,
+    powerUpTitle: string,
+    powerUpPrompt: string,
+    powerUpCost: number,
+    powerUpImageUrl: string
+): void {
+    frontendCommunicator.send("twitch:chat:twitch:chat:powerupredemption", {
+        id: redemptionId,
+        status,
+        messageText,
+        user: {
+            id: userId,
+            username,
+            displayName: userDisplayName
+        },
+        powerUp: {
+            id: powerUpId,
+            name: powerUpTitle,
+            bits: powerUpCost,
+            imageUrl:
+                powerUpImageUrl ??
+                "https://static-cdn.jtvnw.net/twilight-static-assets/Default-Power-up-Line-Lightshade-112x112.png"
+        }
+    });
+
+    setTimeout(() => {
+        const redemptionMeta = {
+            username,
+            userId,
+            userDisplayName,
+            messageText,
+            args: (messageText ?? "").split(" "),
+            redemptionId,
+            powerUpId,
+            powerUpImage: powerUpImageUrl,
+            powerUpName: powerUpTitle,
+            powerUpDescription: powerUpPrompt,
+            powerUpCost
+        };
+
+        void void EventManager.triggerEvent("twitch", "power-up-redemption", redemptionMeta);
+
+        void powerUpsManager.triggerPowerUp(powerUpId, {
+            username,
+            userId,
+            userDisplayName,
+            messageText,
+            powerUpId,
+            powerUpImage: powerUpImageUrl,
+            powerUpName: powerUpTitle,
+            bits: powerUpCost
+        });
+    }, 100);
+}
diff --git a/src/backend/streaming-platforms/twitch/events/index.ts b/src/backend/streaming-platforms/twitch/events/index.ts
index 3080205ac..13e363368 100644
--- a/src/backend/streaming-platforms/twitch/events/index.ts
+++ b/src/backend/streaming-platforms/twitch/events/index.ts
@@ -25,6 +25,7 @@ import * as sub from "./sub";
 import * as viewerArrived from "./viewer-arrived";
 import * as viewerBanned from "./viewer-banned";
 import * as viewerTimeout from "./viewer-timeout";
+import * as watchStreak from "./watch-streak";
 import * as whisper from "./whisper";
 
 export const TwitchEventHandlers = {
@@ -49,6 +50,7 @@ export const TwitchEventHandlers = {
     viewerArrived,
     viewerBanned,
     viewerTimeout,
+    watchStreak,
     whisper
 };
 
@@ -265,9 +267,7 @@ export const TwitchEventSource: EventSource = {
                 getMessage: (eventData) => {
                     return `**${eventData.isAnonymous ? "An Anonymous Gifter" : eventData.gifterUsername}** gifted a ${
                         eventData.giftDuration > 1 ? ` **${eventData.giftDuration} month** ` : ""
-                    } **Tier ${eventData.subPlan.replace("000", "")}** sub to **${
-                        eventData.gifteeUsername
-                    }**`;
+                    } **Tier ${eventData.subPlan.replace("000", "")}** sub to **${eventData.gifteeUsername}**`;
                 }
             }
         },
@@ -427,7 +427,7 @@ export const TwitchEventSource: EventSource = {
         {
             id: "bits-powerup-message-effect",
             name: "Power-up: Message Effects",
-            description: "When a viewer uses the \"Message Effects\" Power-up in your channel.",
+            description: 'When a viewer uses the "Message Effects" Power-up in your channel.',
             cached: false,
             manualMetadata: {
                 username: "firebot",
@@ -441,7 +441,8 @@ export const TwitchEventSource: EventSource = {
                 icon: "fad fa-diamond",
                 getMessage: (eventData) => {
                     const showUserIdName = eventData.username.toLowerCase() !== eventData.userDisplayName.toLowerCase();
-                    return `**${eventData.userDisplayName}${showUserIdName ? ` (${eventData.username})` : ""
+                    return `**${eventData.userDisplayName}${
+                        showUserIdName ? ` (${eventData.username})` : ""
                     }** used a Message Effects Power-up for **${eventData.bits}** bits`;
                 }
             }
@@ -449,7 +450,7 @@ export const TwitchEventSource: EventSource = {
         {
             id: "bits-powerup-celebration",
             name: "Power-up: On-Screen Celebration",
-            description: "When a viewer uses the \"On-Screen Celebration\" Power-up in your channel.",
+            description: 'When a viewer uses the "On-Screen Celebration" Power-up in your channel.',
             cached: false,
             manualMetadata: {
                 username: "firebot",
@@ -462,7 +463,8 @@ export const TwitchEventSource: EventSource = {
                 icon: "fad fa-diamond",
                 getMessage: (eventData) => {
                     const showUserIdName = eventData.username.toLowerCase() !== eventData.userDisplayName.toLowerCase();
-                    return `**${eventData.userDisplayName}${showUserIdName ? ` (${eventData.username})` : ""
+                    return `**${eventData.userDisplayName}${
+                        showUserIdName ? ` (${eventData.username})` : ""
                     }** used a Celebration Power-up for **${eventData.bits}** bits`;
                 }
             }
@@ -470,7 +472,7 @@ export const TwitchEventSource: EventSource = {
         {
             id: "bits-powerup-gigantified-emote",
             name: "Power-up: Gigantify an Emote",
-            description: "When a viewer uses the \"Gigantify an Emote\" Power-up in your channel.",
+            description: 'When a viewer uses the "Gigantify an Emote" Power-up in your channel.',
             cached: false,
             manualMetadata: {
                 username: "firebot",
@@ -486,7 +488,8 @@ export const TwitchEventSource: EventSource = {
                 icon: "fad fa-diamond",
                 getMessage: (eventData) => {
                     const showUserIdName = eventData.username.toLowerCase() !== eventData.userDisplayName.toLowerCase();
-                    return `**${eventData.userDisplayName}${showUserIdName ? ` (${eventData.username})` : ""
+                    return `**${eventData.userDisplayName}${
+                        showUserIdName ? ` (${eventData.username})` : ""
                     }** gigantified the **${eventData.emoteName}** emote for **${eventData.bits}** bits`;
                 }
             }
@@ -633,7 +636,7 @@ export const TwitchEventSource: EventSource = {
             manualMetadata: {
                 username: "alca",
                 userDisplayName: "Alca",
-                userId: "",
+                userId: "7676884",
                 timeoutDuration: "1",
                 moderator: "Firebot",
                 modReason: "They were naughty"
@@ -653,6 +656,38 @@ export const TwitchEventSource: EventSource = {
                 }
             }
         },
+        {
+            id: "power-up-redemption",
+            name: "Power-up Redemption",
+            description: "When someone redeems a custom power-up",
+            cached: true,
+            cacheMetaKey: "username",
+            cacheTtlInSecs: 1,
+            manualMetadata: {
+                username: "firebot",
+                userDisplayName: "Firebot",
+                userId: "",
+                powerUpName: "Test Power-up",
+                powerUpDescription: "Example Power-up Description",
+                powerUpImage: "https://static-cdn.jtvnw.net/custom-reward-images/default-4.png",
+                powerUpCost: 100,
+                messageText: "Test message"
+            },
+            activityFeed: {
+                icon: "fad fa-circle",
+                getMessage: (eventData) => {
+                    const showUserIdName = eventData.username.toLowerCase() !== eventData.userDisplayName.toLowerCase();
+                    return `**${eventData.userDisplayName}${
+                        showUserIdName ? ` (${eventData.username})` : ""
+                    }** redeemed **${eventData.powerUpName}**${
+                        eventData.messageText && !!eventData.messageText.length
+                            ? `: *${escape(eventData.messageText)}*`
+                            : ""
+                    }`;
+                },
+                excludeFromChatFeed: true
+            }
+        },
         {
             id: "channel-reward-redemption",
             name: "Channel Reward Redemption",
@@ -676,7 +711,9 @@ export const TwitchEventSource: EventSource = {
                     return `**${eventData.userDisplayName}${
                         showUserIdName ? ` (${eventData.username})` : ""
                     }** redeemed **${eventData.rewardName}**${
-                        eventData.messageText && !!eventData.messageText.length ? `: *${escape(eventData.messageText)}*` : ""
+                        eventData.messageText && !!eventData.messageText.length
+                            ? `: *${escape(eventData.messageText)}*`
+                            : ""
                     }`;
                 },
                 excludeFromChatFeed: true
@@ -705,7 +742,9 @@ export const TwitchEventSource: EventSource = {
                     return `**${eventData.userDisplayName}${
                         showUserIdName ? ` (${eventData.username})` : ""
                     }**'s redemption of **${eventData.rewardName}** was approved. ${
-                        eventData.messageText && !!eventData.messageText.length ? `*${escape(eventData.messageText)}*` : ""
+                        eventData.messageText && !!eventData.messageText.length
+                            ? `*${escape(eventData.messageText)}*`
+                            : ""
                     }`;
                 }
             }
@@ -733,7 +772,9 @@ export const TwitchEventSource: EventSource = {
                     return `**${eventData.userDisplayName}${
                         showUserIdName ? ` (${eventData.username})` : ""
                     }**'s redemption of **${eventData.rewardName}** was rejected. ${
-                        eventData.messageText && !!eventData.messageText.length ? `*${escape(eventData.messageText)}*` : ""
+                        eventData.messageText && !!eventData.messageText.length
+                            ? `*${escape(eventData.messageText)}*`
+                            : ""
                     }`;
                 }
             }
@@ -741,7 +782,7 @@ export const TwitchEventSource: EventSource = {
         {
             id: "channel-reward-redemption-single-message-bypass-sub-mode",
             name: "Channel Reward Redemption: Send a Message in Sub-Only Mode",
-            description: "When someone redeems \"Send a Message in Sub-Only Mode\" to post a message in your channel",
+            description: 'When someone redeems "Send a Message in Sub-Only Mode" to post a message in your channel',
             cached: false,
             manualMetadata: {
                 username: "firebot",
@@ -765,7 +806,7 @@ export const TwitchEventSource: EventSource = {
         {
             id: "channel-reward-redemption-send-highlighted-message",
             name: "Channel Reward Redemption: Highlight My Message",
-            description: "When someone redeems \"Highlight My Message\" in your channel",
+            description: 'When someone redeems "Highlight My Message" in your channel',
             cached: false,
             manualMetadata: {
                 username: "firebot",
@@ -790,7 +831,7 @@ export const TwitchEventSource: EventSource = {
         {
             id: "channel-reward-redemption-random-sub-emote-unlock",
             name: "Channel Reward Redemption: Unlock a Random Sub Emote",
-            description: "When someone redeems \"Unlock a Random Sub Emote\" to unlock an emote in your channel",
+            description: 'When someone redeems "Unlock a Random Sub Emote" to unlock an emote in your channel',
             cached: false,
             manualMetadata: {
                 username: "firebot",
@@ -815,7 +856,7 @@ export const TwitchEventSource: EventSource = {
         {
             id: "channel-reward-redemption-chosen-sub-emote-unlock",
             name: "Channel Reward Redemption: Choose an Emote to Unlock",
-            description: "When someone redeems \"Choose an Emote to Unlock\" to unlock an emote in your channel",
+            description: 'When someone redeems "Choose an Emote to Unlock" to unlock an emote in your channel',
             cached: false,
             manualMetadata: {
                 username: "firebot",
@@ -840,7 +881,7 @@ export const TwitchEventSource: EventSource = {
         {
             id: "channel-reward-redemption-chosen-modified-sub-emote-unlock",
             name: "Channel Reward Redemption: Modify a Single Emote",
-            description: "When someone redeems \"Modify a Single Emote\" to modify and unlock an emote in your channel",
+            description: 'When someone redeems "Modify a Single Emote" to modify and unlock an emote in your channel',
             cached: false,
             manualMetadata: {
                 username: "firebot",
@@ -939,7 +980,8 @@ export const TwitchEventSource: EventSource = {
                         { id: "c0113c14-144e-475c-9647-a65f9177665d", title: "Test Choice 1" },
                         { id: "6d86797a-d88a-4fc2-b4f6-1895afdc503e", title: "Test Choice 2" },
                         { id: "791bc06c-c4d5-4c74-b950-8596c04dbb0d", title: "Test Choice 3" }
-                    ] },
+                    ]
+                },
                 title: "Test Poll Name"
             },
             activityFeed: {
@@ -958,10 +1000,26 @@ export const TwitchEventSource: EventSource = {
                 choices: {
                     type: "poll-choice-list",
                     value: [
-                        { id: "c0113c14-144e-475c-9647-a65f9177665d", title: "Test Choice 1", totalVotes: 120, channelPointsVotes: 60 },
-                        { id: "6d86797a-d88a-4fc2-b4f6-1895afdc503e", title: "Test Choice 2", totalVotes: 140, channelPointsVotes: 40 },
-                        { id: "791bc06c-c4d5-4c74-b950-8596c04dbb0d", title: "Test Choice 3", totalVotes: 80, channelPointsVotes: 70 }
-                    ] },
+                        {
+                            id: "c0113c14-144e-475c-9647-a65f9177665d",
+                            title: "Test Choice 1",
+                            totalVotes: 120,
+                            channelPointsVotes: 60
+                        },
+                        {
+                            id: "6d86797a-d88a-4fc2-b4f6-1895afdc503e",
+                            title: "Test Choice 2",
+                            totalVotes: 140,
+                            channelPointsVotes: 40
+                        },
+                        {
+                            id: "791bc06c-c4d5-4c74-b950-8596c04dbb0d",
+                            title: "Test Choice 3",
+                            totalVotes: 80,
+                            channelPointsVotes: 70
+                        }
+                    ]
+                },
                 title: "Test Poll Name",
                 winningChoiceName: "Test Choice 2",
                 winningChoiceVotes: 140
@@ -982,10 +1040,26 @@ export const TwitchEventSource: EventSource = {
                 choices: {
                     type: "poll-choice-list",
                     value: [
-                        { id: "c0113c14-144e-475c-9647-a65f9177665d", title: "Test Choice 1", totalVotes: 125, channelPointsVotes: 62 },
-                        { id: "6d86797a-d88a-4fc2-b4f6-1895afdc503e", title: "Test Choice 2", totalVotes: 145, channelPointsVotes: 42 },
-                        { id: "791bc06c-c4d5-4c74-b950-8596c04dbb0d", title: "Test Choice 3", totalVotes: 85, channelPointsVotes: 72 }
-                    ] },
+                        {
+                            id: "c0113c14-144e-475c-9647-a65f9177665d",
+                            title: "Test Choice 1",
+                            totalVotes: 125,
+                            channelPointsVotes: 62
+                        },
+                        {
+                            id: "6d86797a-d88a-4fc2-b4f6-1895afdc503e",
+                            title: "Test Choice 2",
+                            totalVotes: 145,
+                            channelPointsVotes: 42
+                        },
+                        {
+                            id: "791bc06c-c4d5-4c74-b950-8596c04dbb0d",
+                            title: "Test Choice 3",
+                            totalVotes: 85,
+                            channelPointsVotes: 72
+                        }
+                    ]
+                },
                 title: "Test Poll Name",
                 winningChoiceName: "Test Choice 2",
                 winningChoiceVotes: 145
@@ -1488,6 +1562,26 @@ export const TwitchEventSource: EventSource = {
                     }** ad break ended`;
                 }
             }
+        },
+        {
+            id: "watch-streak",
+            name: "Watch Streak",
+            description: "When a viewer hits a milestone for consecutive number of your streams watched.",
+            cached: false,
+            manualMetadata: {
+                username: "firebot",
+                userId: "",
+                userDisplayName: "Firebot",
+                streakCount: 5,
+                channelPointsAwarded: 450,
+                streakMessage: "I've been here the whole time!"
+            },
+            activityFeed: {
+                icon: "fad fa-fire",
+                getMessage: (eventData) => {
+                    return `**${eventData.userDisplayName}** reached a **${eventData.streakCount}-stream streak**`;
+                }
+            }
         }
     ]
-};
\ No newline at end of file
+};
diff --git a/src/backend/streaming-platforms/twitch/events/watch-streak.ts b/src/backend/streaming-platforms/twitch/events/watch-streak.ts
new file mode 100644
index 000000000..f63e968e5
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/events/watch-streak.ts
@@ -0,0 +1,19 @@
+import { EventManager } from "../../../events/event-manager";
+
+export function triggerWatchStreak(
+    username: string,
+    userId: string,
+    userDisplayName: string,
+    streakCount: number,
+    channelPointsAwarded: number,
+    streakMessage: string
+): void {
+    void EventManager.triggerEvent("twitch", "watch-streak", {
+        username,
+        userId,
+        userDisplayName,
+        streakCount,
+        channelPointsAwarded,
+        streakMessage
+    });
+}
\ No newline at end of file
diff --git a/src/backend/streaming-platforms/twitch/variables/bits/cheer-message.ts b/src/backend/streaming-platforms/twitch/variables/bits/cheer-message.ts
index 263a55668..ac54fcb04 100644
--- a/src/backend/streaming-platforms/twitch/variables/bits/cheer-message.ts
+++ b/src/backend/streaming-platforms/twitch/variables/bits/cheer-message.ts
@@ -1,4 +1,5 @@
 import type { ReplaceVariable, Trigger, TriggersObject } from "../../../../../types/variables";
+import { EventSubChannelBitsUseMessagePart } from "../../api/twurple-private-types";
 
 const triggers: TriggersObject = {};
 triggers["event"] = ["twitch:cheer", "twitch:bits-powerup-message-effect", "twitch:bits-powerup-gigantified-emote"];
@@ -13,10 +14,24 @@ const model : ReplaceVariable = {
         possibleDataOutput: ["text"]
     },
     evaluator: (trigger: Trigger) => {
-        const cheerMessage = <string>(trigger.metadata.eventData.cheerMessage || "");
-        return cheerMessage
-            .replace(/[a-zA-Z]+\d+( |\b)/g, "")
-            .trim();
+        if (trigger.metadata.eventData.cheerMessageParts == null) {
+            const cheerMessage = (trigger.metadata.eventData.cheerMessage || "") as string;
+            return cheerMessage
+                .replace(/[a-zA-Z]+\d+( |\b)/g, "")
+                .trim();
+        }
+
+        const cheerMessageParts: string[] = [];
+
+        for (const part of (trigger.metadata.eventData.cheerMessageParts as EventSubChannelBitsUseMessagePart[])) {
+            if (part.type === "cheermote") {
+                continue;
+            }
+
+            cheerMessageParts.push(part.text.trim());
+        }
+
+        return cheerMessageParts.join(" ");
     }
 };
 
diff --git a/src/backend/streaming-platforms/twitch/variables/chat/index.ts b/src/backend/streaming-platforms/twitch/variables/chat/index.ts
index 46ed85e03..2d12ab3a2 100644
--- a/src/backend/streaming-platforms/twitch/variables/chat/index.ts
+++ b/src/backend/streaming-platforms/twitch/variables/chat/index.ts
@@ -2,10 +2,12 @@ import chatMessageVariables from './message';
 import chatModeVariables from './mode';
 import moderationVariables from './moderation';
 import sharedChatVariables from './shared-chat';
+import watchStreakVariables from './watch-streak';
 
 export default [
     ...chatMessageVariables,
     ...chatModeVariables,
     ...moderationVariables,
-    ...sharedChatVariables
+    ...sharedChatVariables,
+    ...watchStreakVariables
 ];
\ No newline at end of file
diff --git a/src/backend/streaming-platforms/twitch/variables/chat/message/chat-message-html.ts b/src/backend/streaming-platforms/twitch/variables/chat/message/chat-message-html.ts
new file mode 100644
index 000000000..f1446410f
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/chat/message/chat-message-html.ts
@@ -0,0 +1,60 @@
+import escapeHTML from "escape-html";
+import type {
+    ReplaceVariable,
+    TriggersObject,
+    FirebotChatMessagePart
+} from "../../../../../../types";
+
+const triggers: TriggersObject = {};
+triggers["manual"] = true;
+triggers["command"] = true;
+triggers["event"] = [
+    "twitch:chat-message",
+    "twitch:first-time-chat",
+    "firebot:highlight-message",
+    "twitch:viewer-arrived"
+];
+
+const model : ReplaceVariable = {
+    definition: {
+        handle: "chatMessageHtml",
+        description: "Outputs the chat message from the associated command or event formatted as HTML.",
+        triggers: triggers,
+        categories: ["advanced", "trigger based"],
+        possibleDataOutput: ["text"]
+    },
+    evaluator: (trigger) => {
+        let messageParts = [];
+        if (trigger.type === "command") {
+            messageParts = trigger.metadata.chatMessage.parts;
+        } else if (trigger.type === "event") {
+            messageParts = trigger.metadata.eventData.chatMessage.parts;
+        }
+
+        const formattedChatMessageParts = [];
+
+        for (const part of messageParts as FirebotChatMessagePart[]) {
+            switch (part.type) {
+                case "emote":
+                case "third-party-emote":
+                    formattedChatMessageParts.push(`<img src="${part.animatedUrl ?? part.url}">`);
+                    break;
+
+                case "cheermote":
+                    formattedChatMessageParts.push(`<img src="${part.animatedUrl ?? part.url}"><strong style="color: ${part.color}">${part.amount}</strong>`);
+                    break;
+
+                case "link":
+                    formattedChatMessageParts.push(`<a href="${part.url}">${escapeHTML(part.url)}</a>`);
+                    break;
+
+                default:
+                    formattedChatMessageParts.push(escapeHTML(part.text));
+            }
+        }
+
+        return formattedChatMessageParts.join(" ");
+    }
+};
+
+export default model;
\ No newline at end of file
diff --git a/src/backend/streaming-platforms/twitch/variables/chat/message/index.ts b/src/backend/streaming-platforms/twitch/variables/chat/message/index.ts
index 8be944a6a..d460db315 100644
--- a/src/backend/streaming-platforms/twitch/variables/chat/message/index.ts
+++ b/src/backend/streaming-platforms/twitch/variables/chat/message/index.ts
@@ -1,6 +1,7 @@
 import chatMessageAnimatedEmoteUrls from './chat-message-animated-emote-urls';
 import chatMessageEmoteNames from './chat-message-emote-names';
 import chatMessageEmoteUrls from './chat-message-emote-urls';
+import chatMessageHtml from './chat-message-html';
 import chatMessageId from './chat-message-id';
 import chatMessageTextOnly from './chat-message-text-only';
 import chatMessage from './chat-message';
@@ -15,6 +16,7 @@ export default [
     chatMessageAnimatedEmoteUrls,
     chatMessageEmoteNames,
     chatMessageEmoteUrls,
+    chatMessageHtml,
     chatMessageId,
     chatMessageTextOnly,
     chatMessage,
diff --git a/src/backend/streaming-platforms/twitch/variables/chat/moderation/timeout-duration.ts b/src/backend/streaming-platforms/twitch/variables/chat/moderation/timeout-duration.ts
index dc51cb2ec..3c2d9b051 100644
--- a/src/backend/streaming-platforms/twitch/variables/chat/moderation/timeout-duration.ts
+++ b/src/backend/streaming-platforms/twitch/variables/chat/moderation/timeout-duration.ts
@@ -8,7 +8,7 @@ triggers["event"] = ["twitch:timeout"];
 const model : ReplaceVariable = {
     definition: {
         handle: "timeoutDuration",
-        description: "How long the user is timed out for in minus",
+        description: "How long the user is timed out for in seconds",
         triggers: triggers,
         categories: ["common", "trigger based"],
         possibleDataOutput: ["number"]
diff --git a/src/backend/streaming-platforms/twitch/variables/chat/watch-streak/channel-points-awarded.ts b/src/backend/streaming-platforms/twitch/variables/chat/watch-streak/channel-points-awarded.ts
new file mode 100644
index 000000000..1872a8a88
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/chat/watch-streak/channel-points-awarded.ts
@@ -0,0 +1,20 @@
+import type { ReplaceVariable, TriggersObject } from "../../../../../../types";
+
+const triggers: TriggersObject = {};
+triggers["event"] = ["twitch:watch-streak"];
+triggers["manual"] = true;
+
+const model : ReplaceVariable = {
+    definition: {
+        handle: "channelPointsAwarded",
+        description: "The number of channel points awarded to the viewer",
+        triggers: triggers,
+        categories: ["common", "trigger based"],
+        possibleDataOutput: ["number"]
+    },
+    evaluator: (trigger) => {
+        return trigger.metadata.eventData.channelPointsAwarded || 0;
+    }
+};
+
+export default model;
\ No newline at end of file
diff --git a/src/backend/streaming-platforms/twitch/variables/chat/watch-streak/index.ts b/src/backend/streaming-platforms/twitch/variables/chat/watch-streak/index.ts
new file mode 100644
index 000000000..360a1570a
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/chat/watch-streak/index.ts
@@ -0,0 +1,9 @@
+import channelPointsAwarded from "./channel-points-awarded";
+import streakCount from "./streak-count";
+import streakMessage from "./streak-message";
+
+export default [
+    channelPointsAwarded,
+    streakCount,
+    streakMessage
+];
\ No newline at end of file
diff --git a/src/backend/streaming-platforms/twitch/variables/chat/watch-streak/streak-count.ts b/src/backend/streaming-platforms/twitch/variables/chat/watch-streak/streak-count.ts
new file mode 100644
index 000000000..55d06c028
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/chat/watch-streak/streak-count.ts
@@ -0,0 +1,20 @@
+import type { ReplaceVariable, TriggersObject } from "../../../../../../types";
+
+const triggers: TriggersObject = {};
+triggers["event"] = ["twitch:watch-streak"];
+triggers["manual"] = true;
+
+const model : ReplaceVariable = {
+    definition: {
+        handle: "streakCount",
+        description: "The number of consecutive streams watched in the current streak",
+        triggers: triggers,
+        categories: ["common", "trigger based"],
+        possibleDataOutput: ["number"]
+    },
+    evaluator: (trigger) => {
+        return trigger.metadata.eventData.streakCount || 0;
+    }
+};
+
+export default model;
\ No newline at end of file
diff --git a/src/backend/streaming-platforms/twitch/variables/chat/watch-streak/streak-message.ts b/src/backend/streaming-platforms/twitch/variables/chat/watch-streak/streak-message.ts
new file mode 100644
index 000000000..a8cd8b6e8
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/chat/watch-streak/streak-message.ts
@@ -0,0 +1,20 @@
+import type { ReplaceVariable, TriggersObject } from "../../../../../../types";
+
+const triggers: TriggersObject = {};
+triggers["event"] = ["twitch:watch-streak"];
+triggers["manual"] = true;
+
+const model : ReplaceVariable = {
+    definition: {
+        handle: "streakMessage",
+        description: "The chat message sent with a watch streak",
+        triggers: triggers,
+        categories: ["common", "trigger based"],
+        possibleDataOutput: ["text"]
+    },
+    evaluator: (trigger) => {
+        return trigger.metadata.eventData.streakMessage || "";
+    }
+};
+
+export default model;
\ No newline at end of file
diff --git a/src/backend/streaming-platforms/twitch/variables/index.ts b/src/backend/streaming-platforms/twitch/variables/index.ts
index 21972a9c1..296a42b28 100644
--- a/src/backend/streaming-platforms/twitch/variables/index.ts
+++ b/src/backend/streaming-platforms/twitch/variables/index.ts
@@ -1,26 +1,27 @@
-import adVariables from './ads';
-import bitsVariables from './bits';
-import chatVariables from './chat';
-import channelGoalVariables from './channel-goal';
-import charityVariables from './charity';
-import cheermoteVariables from './cheermote';
+import adVariables from "./ads";
+import bitsVariables from "./bits";
+import chatVariables from "./chat";
+import channelGoalVariables from "./channel-goal";
+import charityVariables from "./charity";
+import cheermoteVariables from "./cheermote";
 import clipVariables from "./clips";
-import hypetrainVariables from './hype-train';
-import pollVariables from './polls';
-import raidVariables from './raid';
-import rewardVariables from './reward';
-import streamVariables from './stream';
-import subVariables from './subs';
+import hypetrainVariables from "./hype-train";
+import pollVariables from "./polls";
+import powerUpVariables from "./power-ups";
+import raidVariables from "./raid";
+import rewardVariables from "./reward";
+import streamVariables from "./stream";
+import subVariables from "./subs";
 
-import accountCreationDate from './account-creation-date';
-import followAge from './follow-age';
-import followCount from './follow-count';
-import latestFollower from './latest-follower';
-import predictionWinningOutcomeName from './prediction-winning-outcome-name';
-import twitchChannelUrl from './twitch-channel-url';
-import twitchVodUrl from './twitch-vod-url';
-import viewerCount from './viewer-count';
-import vip from './vip';
+import accountCreationDate from "./account-creation-date";
+import followAge from "./follow-age";
+import followCount from "./follow-count";
+import latestFollower from "./latest-follower";
+import predictionWinningOutcomeName from "./prediction-winning-outcome-name";
+import twitchChannelUrl from "./twitch-channel-url";
+import twitchVodUrl from "./twitch-vod-url";
+import viewerCount from "./viewer-count";
+import vip from "./vip";
 
 export default [
     ...adVariables,
@@ -32,6 +33,7 @@ export default [
     ...clipVariables,
     ...hypetrainVariables,
     ...pollVariables,
+    ...powerUpVariables,
     ...raidVariables,
     ...rewardVariables,
     ...streamVariables,
diff --git a/src/backend/streaming-platforms/twitch/variables/power-ups/index.ts b/src/backend/streaming-platforms/twitch/variables/power-ups/index.ts
new file mode 100644
index 000000000..45f2aa803
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/power-ups/index.ts
@@ -0,0 +1,17 @@
+import powerUpCost from "./power-up-cost";
+import powerUpDescription from "./power-up-description";
+import powerUpId from "./power-up-id";
+import powerUpImageUrl from "./power-up-image-url";
+import powerUpMessage from "./power-up-message";
+import powerUpName from "./power-up-name";
+import powerUpRedemptionId from "./power-up-redemption-id";
+
+export default [
+    powerUpCost,
+    powerUpDescription,
+    powerUpId,
+    powerUpImageUrl,
+    powerUpMessage,
+    powerUpName,
+    powerUpRedemptionId
+];
diff --git a/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-cost.ts b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-cost.ts
new file mode 100644
index 000000000..543641696
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-cost.ts
@@ -0,0 +1,41 @@
+import type { ReplaceVariable } from "../../../../../types/variables";
+import powerUpsManager from "../../../../power-ups/power-ups-manager";
+import { TwitchApi } from "../../api";
+
+const model: ReplaceVariable = {
+    definition: {
+        handle: "powerUpCost",
+        description: "The bit cost of the power-up",
+        examples: [
+            {
+                usage: "powerUpCost[powerUpName]",
+                description: "The bit cost of the given power-up. Name must be exact!"
+            }
+        ],
+        categories: ["common"],
+        possibleDataOutput: ["number"]
+    },
+    evaluator: async (trigger, powerUpName: string) => {
+        if (!powerUpName) {
+            const data = trigger.metadata.eventData ? trigger.metadata.eventData : trigger.metadata;
+            const bits =
+                (data as { powerUpCost?: number, bits?: number }).powerUpCost ??
+                (data as { powerUpCost?: number, bits?: number }).bits;
+            return bits ?? -1;
+        }
+
+        const powerUpId = powerUpsManager.getPowerUpIdByName(powerUpName);
+        if (powerUpId == null) {
+            return -1;
+        }
+
+        const powerUp = await TwitchApi.powerUps.getCustomPowerUpById(powerUpId);
+        if (powerUp == null) {
+            return -1;
+        }
+
+        return powerUp.bits;
+    }
+};
+
+export default model;
diff --git a/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-description.ts b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-description.ts
new file mode 100644
index 000000000..3a61ed9f9
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-description.ts
@@ -0,0 +1,47 @@
+import type { ReplaceVariable } from "../../../../../types/variables";
+import powerUpsManager from "../../../../power-ups/power-ups-manager";
+import { TwitchApi } from "../../api";
+
+const model: ReplaceVariable = {
+    definition: {
+        handle: "powerUpDescription",
+        description: "The description of the power-up",
+        examples: [
+            {
+                usage: "powerUpDescription[powerUpName]",
+                description: "The description of the given power-up. Name must be exact!"
+            }
+        ],
+        categories: ["common"],
+        possibleDataOutput: ["text"]
+    },
+    evaluator: async (trigger, powerUpName: string) => {
+        if (!powerUpName) {
+            const data = trigger.metadata.eventData ? trigger.metadata.eventData : trigger.metadata;
+            const description = (data as { powerUpDescription?: string }).powerUpDescription;
+            if (description != null) {
+                return description;
+            }
+            const powerUpId = (data as { powerUpId?: string }).powerUpId;
+            if (!powerUpId) {
+                return "";
+            }
+            const powerUp = await TwitchApi.powerUps.getCustomPowerUpById(powerUpId);
+            return powerUp?.prompt ?? "";
+        }
+
+        const powerUpId = powerUpsManager.getPowerUpIdByName(powerUpName);
+        if (powerUpId == null) {
+            return "[Can't find power-up by name]";
+        }
+
+        const powerUp = await TwitchApi.powerUps.getCustomPowerUpById(powerUpId);
+        if (powerUp == null) {
+            return "[No power-up found]";
+        }
+
+        return powerUp.prompt;
+    }
+};
+
+export default model;
diff --git a/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-id.ts b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-id.ts
new file mode 100644
index 000000000..a7d8695f3
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-id.ts
@@ -0,0 +1,22 @@
+import type { ReplaceVariable, TriggersObject } from "../../../../../types/variables";
+
+const triggers: TriggersObject = {};
+triggers["event"] = ["twitch:power-up-redemption"];
+triggers["power_up"] = true;
+triggers["preset"] = true;
+triggers["manual"] = true;
+
+const model: ReplaceVariable = {
+    definition: {
+        handle: "powerUpId",
+        description: "The ID of the power-up",
+        triggers: triggers,
+        categories: ["common", "trigger based"],
+        possibleDataOutput: ["text"]
+    },
+    evaluator: (trigger) => {
+        return trigger.metadata.eventData ? trigger.metadata.eventData.powerUpId : trigger.metadata.powerUpId;
+    }
+};
+
+export default model;
diff --git a/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-image-url.ts b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-image-url.ts
new file mode 100644
index 000000000..e317fa227
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-image-url.ts
@@ -0,0 +1,38 @@
+import type { ReplaceVariable } from "../../../../../types/variables";
+import powerUpsManager from "../../../../power-ups/power-ups-manager";
+import { TwitchApi } from "../../api";
+
+const model: ReplaceVariable = {
+    definition: {
+        handle: "powerUpImageUrl",
+        description: "The image URL of the power-up",
+        examples: [
+            {
+                usage: "powerUpImageUrl[powerUpName]",
+                description: "The image URL of the given power-up. Name must be exact!"
+            }
+        ],
+        categories: ["common"],
+        possibleDataOutput: ["text"]
+    },
+    evaluator: async (trigger, powerUpName: string) => {
+        if (!powerUpName) {
+            const data = trigger.metadata.eventData ? trigger.metadata.eventData : trigger.metadata;
+            return (data as { powerUpImage?: string }).powerUpImage ?? "";
+        }
+
+        const powerUpId = powerUpsManager.getPowerUpIdByName(powerUpName);
+        if (powerUpId == null) {
+            return "[Can't find power-up by name]";
+        }
+
+        const powerUp = await TwitchApi.powerUps.getCustomPowerUpById(powerUpId);
+        if (powerUp == null) {
+            return "[No power-up found]";
+        }
+
+        return powerUp.image?.url4x ?? powerUp.defaultImage.url4x;
+    }
+};
+
+export default model;
diff --git a/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-message.ts b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-message.ts
new file mode 100644
index 000000000..7b4f23387
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-message.ts
@@ -0,0 +1,24 @@
+import type { ReplaceVariable, TriggersObject } from "../../../../../types/variables";
+
+const triggers: TriggersObject = {};
+triggers["event"] = ["twitch:power-up-redemption"];
+triggers["power_up"] = true;
+triggers["preset"] = true;
+triggers["manual"] = true;
+
+const model: ReplaceVariable = {
+    definition: {
+        handle: "powerUpMessage",
+        description: "The message text entered by the viewer for the power-up",
+        triggers: triggers,
+        categories: ["common", "trigger based"],
+        possibleDataOutput: ["text"]
+    },
+    evaluator: (trigger) => {
+        return (
+            (trigger.metadata.eventData ? trigger.metadata.eventData.messageText : trigger.metadata.messageText) || ""
+        );
+    }
+};
+
+export default model;
diff --git a/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-name.ts b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-name.ts
new file mode 100644
index 000000000..804d11e05
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-name.ts
@@ -0,0 +1,22 @@
+import type { ReplaceVariable, TriggersObject } from "../../../../../types/variables";
+
+const triggers: TriggersObject = {};
+triggers["event"] = ["twitch:power-up-redemption"];
+triggers["power_up"] = true;
+triggers["preset"] = true;
+triggers["manual"] = true;
+
+const model: ReplaceVariable = {
+    definition: {
+        handle: "powerUpName",
+        description: "The name of the power-up",
+        triggers: triggers,
+        categories: ["common", "trigger based"],
+        possibleDataOutput: ["text"]
+    },
+    evaluator: (trigger) => {
+        return trigger.metadata.eventData ? trigger.metadata.eventData.powerUpName : trigger.metadata.powerUpName;
+    }
+};
+
+export default model;
diff --git a/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-redemption-id.ts b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-redemption-id.ts
new file mode 100644
index 000000000..a6204dc20
--- /dev/null
+++ b/src/backend/streaming-platforms/twitch/variables/power-ups/power-up-redemption-id.ts
@@ -0,0 +1,22 @@
+import type { ReplaceVariable, TriggersObject } from "../../../../../types/variables";
+
+const triggers: TriggersObject = {};
+triggers["event"] = ["twitch:power-up-redemption"];
+triggers["power_up"] = true;
+triggers["preset"] = true;
+triggers["manual"] = true;
+
+const model: ReplaceVariable = {
+    definition: {
+        handle: "powerUpRedemptionId",
+        description: "The ID of the power-up redemption",
+        triggers: triggers,
+        categories: ["common", "trigger based"],
+        possibleDataOutput: ["text"]
+    },
+    evaluator: (trigger) => {
+        return trigger.metadata.eventData ? trigger.metadata.eventData.redemptionId : trigger.metadata.redemptionId;
+    }
+};
+
+export default model;
diff --git a/src/backend/variables/builtin/metadata/user.ts b/src/backend/variables/builtin/metadata/user.ts
index 90d2c281d..8c682bcad 100644
--- a/src/backend/variables/builtin/metadata/user.ts
+++ b/src/backend/variables/builtin/metadata/user.ts
@@ -7,6 +7,7 @@ triggers["manual"] = true;
 triggers["custom_script"] = true;
 triggers["preset"] = true;
 triggers["channel_reward"] = true;
+triggers["power_up"] = true;
 
 const model : ReplaceVariable = {
     definition: {
diff --git a/src/backend/variables/builtin/user/pronouns.ts b/src/backend/variables/builtin/user/pronouns.ts
index be61d1178..ba0f007e3 100644
--- a/src/backend/variables/builtin/user/pronouns.ts
+++ b/src/backend/variables/builtin/user/pronouns.ts
@@ -1,31 +1,11 @@
-import { app } from "electron";
-
-import type { ReplaceVariable } from "../../../../types/variables";
-
+import type { ReplaceVariable } from "../../../../types";
+import { FirebotPronounManager } from "../../../pronouns/pronoun-manager";
 import logger from "../../../logwrapper";
 
-const callUrl = async (url: string): Promise<Response> => {
-    try {
-        const appVersion = app.getVersion();
-        const response = await fetch(url, {
-            headers: {
-                "User-Agent": `Firebot/${appVersion}`
-            }
-        });
-
-        if (response) {
-            return response;
-        }
-    } catch (error) {
-        logger.warn(`error calling readApi url: ${url}`, (error as Error).message);
-        return null;
-    }
-};
-
 const model : ReplaceVariable = {
     definition: {
         handle: "pronouns",
-        description: "Returns the pronouns of the given user. It uses https://pronouns.alejo.io/ to get the pronouns.",
+        description: "Returns the pronouns of the given user. It uses https://pr.alejo.io/ to get the pronouns.",
         examples: [
             {
                 usage: 'pronouns[username, 0, they/them]',
@@ -47,52 +27,41 @@ const model : ReplaceVariable = {
         trigger,
         username: string,
         pronounNumber: number | string = 0,
-
         fallback : string = "they/them"
     ) => {
-
         if (typeof pronounNumber === 'string' || <unknown>pronounNumber instanceof String) {
             pronounNumber = Number(`${pronounNumber}`);
         }
 
         if (!Number.isFinite(pronounNumber)) {
-            logger.warn(`Pronoun index not a number using ${fallback}`);
+            logger.warn(`Pronoun index not a number. Using "${fallback}"`);
             return fallback;
         }
-        try {
-            const pronouns = await (await callUrl('https://pronouns.alejo.io/api/pronouns')).json();
-            let userPronounData = (await (await callUrl(`https://pronouns.alejo.io/api/users/${username}`)).json())[0];
 
-            let pronounArray = [];
-            if (userPronounData == null || userPronounData === undefined) {
-                userPronounData = { "pronoun_id": `${fallback}`.replace("/", "") };
-            }
+        const fallbackParts = (fallback ?? "").split("/");
+        let type: "subject" | "object" | "both";
 
-            let pronoun = pronouns.find(p => p.name === userPronounData.pronoun_id);
-            if (pronoun != null) {
-                pronounArray = pronoun.display.split('/');
-            } else {
-                pronoun = { "display": `${fallback}` };
-                pronounArray = fallback.split('/');
-            }
+        switch (pronounNumber) {
+            case 1:
+                type = "subject";
+                fallback = fallbackParts[0];
+                break;
 
-            if (pronounNumber === 0) {
-                return pronoun.display;
-            }
+            case 2:
+                type = "object";
+                fallback = fallbackParts[1] ?? fallbackParts[0];
+                break;
 
-            if (pronounArray.length === 1) {
-                return pronounArray[0];
-            }
+            default:
+                type = "both";
+                break;
+        }
 
-            if (pronounArray.length >= pronounNumber) {
-                return pronounArray[pronounNumber - 1];
-            }
+        const pronoun = await FirebotPronounManager.getUserFriendlyPronounString(username, type);
 
-        } catch (err) {
-            logger.warn("error when parsing pronoun api", err);
-            return fallback;
-        }
-        return fallback;
+        return !!pronoun?.length
+            ? pronoun
+            : fallback;
     }
 };
 export default model;
\ No newline at end of file
diff --git a/src/backend/variables/replace-variable-manager.ts b/src/backend/variables/replace-variable-manager.ts
index baea5b294..2cecc7e50 100644
--- a/src/backend/variables/replace-variable-manager.ts
+++ b/src/backend/variables/replace-variable-manager.ts
@@ -223,21 +223,26 @@ class ReplaceVariableManager extends EventEmitter {
         }, new Map<string, RegisteredVariable>());
     }
 
-    async populateStringWithTriggerData(string = "", trigger: Trigger) {
+    async populateStringWithTriggerData(
+        string = "",
+        trigger: Trigger,
+        postProcessVariable: (value: string) => string = undefined
+    ) {
         if (trigger == null || string === "") {
             return string;
         }
 
         const triggerId = getEventIdFromTriggerData(trigger);
 
-        return await this.evaluateText(string, trigger, { type: trigger.type, id: triggerId });
+        return await this.evaluateText(string, trigger, { type: trigger.type, id: triggerId }, undefined, postProcessVariable);
     };
 
     async evaluateText(
         input: string,
         metadata: Record<string, unknown>,
         trigger: TriggerWithId,
-        onlyValidate = false
+        onlyValidate = false,
+        postProcessVariable: (value: string) => string = undefined
     ): Promise<string> {
         if (input.toString().includes("$")) {
             // eslint-disable-next-line
@@ -251,7 +256,8 @@ class ReplaceVariableManager extends EventEmitter {
                     variable: EvaluatedRegisteredVariable
                 ) => this.preeval(options, variable),
                 lookups: this.registeredLookupHandlers,
-                onlyValidate: !!onlyValidate
+                onlyValidate: !!onlyValidate,
+                postProcessVariable
             }) as string;
         }
         return input;
diff --git a/src/backend/viewers/viewer-export-manager.ts b/src/backend/viewers/viewer-export-manager.ts
index 3410762fd..b1d61edd8 100644
--- a/src/backend/viewers/viewer-export-manager.ts
+++ b/src/backend/viewers/viewer-export-manager.ts
@@ -20,7 +20,7 @@ class ViewerExportManager {
 
     setupListeners () {
         frontendCommunicator.onAsync("export-viewers", async (data: { folderpath: string, exportOptions: ViewerExportOptions }) => {
-            return await this.exportViewersToFile(data.folderpath, data.exportOptions)
+            return await this.exportViewersToFile(data.folderpath, data.exportOptions);
         });
     }
 
@@ -53,8 +53,8 @@ class ViewerExportManager {
             const headers = [
                 "ID",
                 "Username",
-                "Last Seen",
                 "Join Date",
+                "Last Seen",
                 "Minutes in Channel",
                 "Chat Messages"
             ];
@@ -74,7 +74,7 @@ class ViewerExportManager {
                 fileLines.push(viewerData.join(","));
             }
 
-            await fsp.writeFile(folderpath + "/viewers.csv", fileLines.join("\n"), { encoding: "utf8" });
+            await fsp.writeFile(`${folderpath}/viewers.csv`, fileLines.join("\n"), { encoding: "utf8" });
             return true;
         } catch (error) {
             logger.error("Error exporting viewers to file", error);
@@ -115,7 +115,7 @@ class ViewerExportManager {
                 fileLines.push(viewerData.join(","));
             }
 
-            await fsp.writeFile(folderpath + "/currencies.csv", fileLines.join("\n"), { encoding: "utf8" });
+            await fsp.writeFile(`${folderpath}/currencies.csv`, fileLines.join("\n"), { encoding: "utf8" });
             return true;
         } catch (error) {
             logger.error("Error exporting currencies to file", error);
@@ -164,7 +164,7 @@ class ViewerExportManager {
                 fileLines.push(viewerData.join(","));
             }
 
-            await fsp.writeFile(folderpath + "/ranks.csv", fileLines.join("\n"), { encoding: "utf8" });
+            await fsp.writeFile(`${folderpath}/ranks.csv`, fileLines.join("\n"), { encoding: "utf8" });
             return true;
         } catch (error) {
             logger.error("Error exporting ranks to file", error);
diff --git a/src/backend/viewers/viewer-online-status-manager.ts b/src/backend/viewers/viewer-online-status-manager.ts
index abca848d3..aee9765d1 100644
--- a/src/backend/viewers/viewer-online-status-manager.ts
+++ b/src/backend/viewers/viewer-online-status-manager.ts
@@ -41,6 +41,10 @@ class ViewerOnlineStatusManager {
         ActiveUserHandler.on("user:online", (user) => {
             void this.setChatViewerOnline(user);
         });
+
+        ActiveUserHandler.on("user:offline", (userId) => {
+            void this.setChatViewerOffline(userId);
+        });
     }
 
     async getOnlineViewers(): Promise<FirebotViewer[]> {
diff --git a/src/gui/app/app-main.js b/src/gui/app/app-main.js
index 4717656d5..d82737004 100644
--- a/src/gui/app/app-main.js
+++ b/src/gui/app/app-main.js
@@ -256,6 +256,7 @@
         dynamicParameterRegistry.register("codemirror", { tag: "fb-param-code-mirror" });
         dynamicParameterRegistry.register("counter-select", { tag: "fb-param-counter-select" });
         dynamicParameterRegistry.register("sort-tag-select", { tag: "fb-param-sort-tag-select" });
+        dynamicParameterRegistry.register("animation-select", { tag: "fb-param-animation-select" });
 
         uiExtensionsService.setAsReady();
     });
diff --git a/src/gui/app/controllers/commands.controller.js b/src/gui/app/controllers/commands.controller.js
index 05aed4ecc..5f6d3d4ef 100644
--- a/src/gui/app/controllers/commands.controller.js
+++ b/src/gui/app/controllers/commands.controller.js
@@ -191,8 +191,9 @@
                             tooltip-append-to-body="true"
                         >{{data.trigger}}</span>
                         <tooltip
-                            ng-if="data.triggerIsRegex"
-                            text="'Description: ' + data.regexDescription"
+                            ng-if="showTooltip(data)"
+                            type="info"
+                            text="getTooltip(data)"
                         ></tooltip>
                         <span
                             class="muted ml-2"
@@ -203,7 +204,27 @@
                         >
                             <i class="fas fa-eye-slash"></i>
                         </span>
-                    `
+                    `,
+                    cellController: ($scope) => {
+                        $scope.showTooltip = (command) => {
+                            return !!command.description?.length
+                                || (command.triggerIsRegex && !!command.regexDescription?.length);
+                        };
+
+                        $scope.getTooltip = (command) => {
+                            const tooltipParts = [];
+
+                            if (!!command.description?.length) {
+                                tooltipParts.push(command.description);
+                            }
+
+                            if (command.triggerIsRegex && !!command.regexDescription?.length) {
+                                tooltipParts.push(`RegEx Description: ${command.regexDescription}`);
+                            }
+
+                            return tooltipParts.join("<br/><br/>");
+                        };
+                    }
                 },
                 {
                     name: "COOLDOWNS",
diff --git a/src/gui/app/controllers/channel-rewards.controller.js b/src/gui/app/controllers/power-ups-and-rewards.controller.js
similarity index 70%
rename from src/gui/app/controllers/channel-rewards.controller.js
rename to src/gui/app/controllers/power-ups-and-rewards.controller.js
index f0b346545..832bbcc3b 100644
--- a/src/gui/app/controllers/channel-rewards.controller.js
+++ b/src/gui/app/controllers/power-ups-and-rewards.controller.js
@@ -2,19 +2,23 @@
 (function () {
     angular
         .module("firebotApp")
-        .controller("channelRewardsController", function (
+        .controller("powerUpsAndRewardsController", function (
             $scope,
+            $rootScope,
             channelRewardsService,
+            powerUpsService,
             utilityService,
             accountAccess
         ) {
             $scope.channelRewardsService = channelRewardsService;
+            $scope.powerUpsService = powerUpsService;
 
             $scope.canUseChannelRewards = () => accountAccess.accounts["streamer"].loggedIn
-                && channelRewardsService.userIsEligible;
+                && (channelRewardsService.userIsEligible);
 
-            // triggering twitch sync
+            // triggering twitch sync for both features
             channelRewardsService.syncChannelRewards();
+            powerUpsService.syncPowerUps();
 
             $scope.saveChannelReward = (reward) => {
                 channelRewardsService.saveChannelReward(reward);
@@ -24,6 +28,15 @@
                 channelRewardsService.saveAllRewards(items);
             };
 
+            $scope.onPowerUpsUpdated = (items) => {
+                powerUpsService.saveAllPowerUps(items);
+            };
+
+            $scope.openTwitchPowerUpsPage = () => {
+                const username = accountAccess.accounts["streamer"].username;
+                $rootScope.openLinkExternally(`https://dashboard.twitch.tv/u/${username}/viewer-rewards/channel-points/rewards`);
+            };
+
             $scope.rewardHeaders = [
                 {
                     headerStyles: {
@@ -61,6 +74,39 @@
                 }
             ];
 
+            $scope.powerUpHeaders = [
+                {
+                    headerStyles: {
+                        'width': '50px'
+                    },
+                    cellTemplate: `
+                        <div style="width: 30px; height: 30px; border-radius: 5px; padding: 5px; background-color: {{data.twitchData.backgroundColor}};">
+                            <img ng-src="{{data.twitchData.image ? data.twitchData.image.url1x : data.twitchData.defaultImage.url1x}}"  style="width: 100%;filter: drop-shadow(1px 1px 1px rgba(0,0,0,0.50));"/>
+                        </div>
+                    `,
+                    cellController: () => { }
+                },
+                {
+                    name: "NAME",
+                    icon: "fa-user",
+                    headerStyles: {
+                        'min-width': '125px'
+                    },
+                    dataField: "twitchData.title",
+                    sortable: true,
+                    cellTemplate: `{{data.twitchData.title}}`,
+                    cellController: () => { }
+                },
+                {
+                    name: "BITS",
+                    icon: "fa-bolt",
+                    dataField: "twitchData.bits",
+                    sortable: true,
+                    cellTemplate: `{{data.twitchData.bits}}`,
+                    cellController: () => { }
+                }
+            ];
+
 
             $scope.rewardMenuOptions = (item) => {
                 const options = [
@@ -119,5 +165,16 @@
 
                 return options;
             };
+
+            $scope.powerUpMenuOptions = (item) => {
+                return [
+                    {
+                        html: `<a href ><i class="far fa-pen" style="margin-right: 10px;"></i> Edit Effects</a>`,
+                        click: function () {
+                            powerUpsService.showEditPowerUpModal(item);
+                        }
+                    }
+                ];
+            };
         });
-}());
\ No newline at end of file
+}());
diff --git a/src/gui/app/directives/chat/feed items/chat-message.js b/src/gui/app/directives/chat/feed items/chat-message.js
index 31f1f9fa3..5437708a0 100644
--- a/src/gui/app/directives/chat/feed items/chat-message.js	
+++ b/src/gui/app/directives/chat/feed items/chat-message.js	
@@ -72,6 +72,10 @@
                         <img ng-src="{{$ctrl.message.reward.imageUrl}}" />
                         <b>{{$ctrl.message.userDisplayName}}{{($ctrl.message.userDisplayName.toLowerCase() !== $ctrl.message.username.toLowerCase() ? " (" + $ctrl.message.username + ")" : "")}}</b> <span>redeemed</span> <b>{{$ctrl.message.reward.name}}</b>
                     </div>
+                    <div ng-if="$ctrl.message.powerUp" class="power-up-redemption" ng-class="{ isHighlight: $ctrl.message.powerUp.id === 'highlight-message' }">
+                        <img ng-src="{{$ctrl.message.powerUp.imageUrl}}" />
+                        <b>{{$ctrl.message.userDisplayName}}{{($ctrl.message.userDisplayName.toLowerCase() !== $ctrl.message.username.toLowerCase() ? " (" + $ctrl.message.username + ")" : "")}}</b> <span>redeemed</span> <b>{{$ctrl.message.powerUp.name}}</b>
+                    </div>
                     <div
                         ng-if="$ctrl.message.sharedChatRoomDisplayName && !$ctrl.compactDisplay"
                         ng-show="$ctrl.showSharedChatInfo"
@@ -148,9 +152,9 @@
                                     class="pronoun"
                                     uib-tooltip="Pronouns"
                                     tooltip-append-to-body="true"
-                                    ng-click="$root.openLinkExternally('https://pronouns.alejo.io/')"
-                                    ng-show="$ctrl.showPronoun && $ctrl.pronouns.pronounCache[$ctrl.message.username] != null"
-                                >{{$ctrl.pronouns.pronounCache[$ctrl.message.username]}}</span>
+                                    ng-click="$root.openLinkExternally('https://pr.alejo.io/')"
+                                    ng-show="$ctrl.showPronoun && $ctrl.message.pronouns != null"
+                                >{{ $ctrl.message.pronouns }}</span>
 
                                 <span
                                     class="rank-role-badge"
@@ -273,14 +277,11 @@
                 viewerRolesService,
                 utilityService,
                 connectionService,
-                pronounsService,
                 backendCommunicator
             ) {
 
                 const $ctrl = this;
 
-                $ctrl.pronouns = pronounsService;
-
                 $ctrl.respondedToAutoMod = false;
 
                 $ctrl.allowAutoModMessage = () => {
diff --git a/src/gui/app/directives/chat/feed items/power-up-redemption.js b/src/gui/app/directives/chat/feed items/power-up-redemption.js
new file mode 100644
index 000000000..987f53772
--- /dev/null
+++ b/src/gui/app/directives/chat/feed items/power-up-redemption.js	
@@ -0,0 +1,27 @@
+"use strict";
+(function() {
+    angular
+        .module('firebotApp')
+        .component("powerUpRedemption", {
+            bindings: {
+                redemption: "<"
+            },
+            template: `
+                <div class="power-up-redemption">
+                    <img ng-src="{{$ctrl.powerUpImageUrl}}" />
+                    <b>{{$ctrl.redemption.user.displayName}}{{($ctrl.redemption.user.displayName.toLowerCase() !== $ctrl.redemption.user.username.toLowerCase() ? " (" + $ctrl.redemption.user.username + ")" : "")}}</b> <span>redeemed</span> <b>{{$ctrl.redemption.powerUp.name}}</b>
+                </div>
+            `,
+            controller: function() {
+                const $ctrl = this;
+
+                $ctrl.powerUpImageUrl = "https://static-cdn.jtvnw.net/twilight-static-assets/Default-Power-up-Line-Lightshade-112x112.png";
+
+                $ctrl.$onInit = () => {
+                    if ($ctrl.redemption.powerUp.imageUrl) {
+                        $ctrl.powerUpImageUrl = $ctrl.redemption.powerUp.imageUrl;
+                    }
+                };
+            }
+        });
+}());
diff --git a/src/gui/app/directives/controls/dynamic-params/builtin/animation-select.js b/src/gui/app/directives/controls/dynamic-params/builtin/animation-select.js
new file mode 100644
index 000000000..5f6758baf
--- /dev/null
+++ b/src/gui/app/directives/controls/dynamic-params/builtin/animation-select.js
@@ -0,0 +1,33 @@
+"use strict";
+(function() {
+    angular.module("firebotApp").component("fbParamAnimationSelect", {
+        bindings: {
+            schema: '<',
+            value: '<',
+            onInput: '&',
+            onTouched: '&'
+        },
+        template: `
+          <div>
+            <animation-select
+                ng-model="$ctrl.local"
+                type="{{$ctrl.schema.animationType}}"
+            />
+          </div>
+        `,
+        controller: function($scope) {
+            const $ctrl = this;
+            $ctrl.$onInit = function() {
+                $ctrl.local = $ctrl.value;
+            };
+            $ctrl.$onChanges = function(chg) {
+                if (chg.value != null && chg.value.currentValue !== $ctrl.local) {
+                    $ctrl.local = chg.value.currentValue;
+                }
+            };
+            $scope.$watch('$ctrl.local', (newValue) => {
+                $ctrl.onInput({ value: newValue });
+            });
+        }
+    });
+}());
\ No newline at end of file
diff --git a/src/gui/app/directives/controls/dynamic-params/builtin/font-options.js b/src/gui/app/directives/controls/dynamic-params/builtin/font-options.js
index fc1b80274..48ff918f1 100644
--- a/src/gui/app/directives/controls/dynamic-params/builtin/font-options.js
+++ b/src/gui/app/directives/controls/dynamic-params/builtin/font-options.js
@@ -14,7 +14,7 @@
                 ng-model="$ctrl.local.family"
                 ng-click="$ctrl.onTouched()"
             />
-            <div class="pt-2">
+            <div class="pt-2" ng-if="$ctrl.schema.hideColor !== true">
                 <color-picker-input
                     model="$ctrl.local.color"
                     on-blur="$ctrl.onTouched()"
diff --git a/src/gui/app/directives/controls/effect-list/effect-list.ts b/src/gui/app/directives/controls/effect-list/effect-list.ts
index 3460e6984..407f83283 100644
--- a/src/gui/app/directives/controls/effect-list/effect-list.ts
+++ b/src/gui/app/directives/controls/effect-list/effect-list.ts
@@ -173,6 +173,15 @@ type ContextMenuItemScope = {
                                         >
                                             <div>ASYNC</div>
                                         </div>
+                                        <div
+                                            ng-if="$ctrl.isEffectDeprecated(effect.type)"
+                                            uib-tooltip="This effect has been deprecated and may be removed from a future version of Firebot."
+                                            tooltip-append-to-body="true"
+                                            class="effect-deprecated-badge mr-5"
+                                            aria-label="Deprecated Effect"
+                                        >
+                                            <div>DEPRECATED</div>
+                                        </div>
                                         <button
                                             ng-if="effect.abortTimeout && effect.abortTimeout > 0"
                                             uib-tooltip="Abort Timeout"
@@ -391,6 +400,14 @@ type ContextMenuItemScope = {
                 return effectTypes.find(e => e.definition.id === id)?.definition?.name ?? `Unknown Effect: ${id}`;
             };
 
+            $ctrl.isEffectDeprecated = (id: string) => {
+                if (!effectTypes || effectTypes.length < 1) {
+                    return false;
+                }
+
+                return effectTypes.find(e => e.definition.id === id)?.definition?.deprecated === true;
+            }
+
             $ctrl.getEffectDefinitionById = (id: string) => {
                 if (!effectTypes || effectTypes.length < 1) {
                     return undefined;
diff --git a/src/gui/app/directives/misc/firebot-item-table/firebot-item-table.html b/src/gui/app/directives/misc/firebot-item-table/firebot-item-table.html
index 5907d8867..f2f0f6503 100644
--- a/src/gui/app/directives/misc/firebot-item-table/firebot-item-table.html
+++ b/src/gui/app/directives/misc/firebot-item-table/firebot-item-table.html
@@ -6,8 +6,9 @@
                 ng-click="$ctrl.onAddNewClicked()"
                 class="btn btn-primary mr-4"
                 ng-disabled="$ctrl.addNewButtonDisabled"
+                ng-hide="$ctrl.addNewButtonHidden"
             >
-                <i class="fas fa-plus-circle mr-2"></i>
+                <i class="fas mr-2" ng-class="$ctrl.addNewButtonIcon ? $ctrl.addNewButtonIcon : 'fa-plus-circle'"></i>
                 {{$ctrl.addNewButtonText}}
             </button>
             <div ng-transclude="toolbar"></div>
diff --git a/src/gui/app/directives/misc/firebot-item-table/firebot-item-table.js b/src/gui/app/directives/misc/firebot-item-table/firebot-item-table.js
index 5130ba335..0c9ea6651 100644
--- a/src/gui/app/directives/misc/firebot-item-table/firebot-item-table.js
+++ b/src/gui/app/directives/misc/firebot-item-table/firebot-item-table.js
@@ -11,7 +11,9 @@
                 sortTagContext: "@?",
                 orderable: "<",
                 addNewButtonDisabled: "<?",
+                addNewButtonHidden: "<?",
                 addNewButtonText: "@",
+                addNewButtonIcon: "@?",
                 onAddNewClicked: "&",
                 contextMenuOptions: "&",
                 noDataMessage: "@",
diff --git a/src/gui/app/directives/modals/power-ups/edit-power-up.js b/src/gui/app/directives/modals/power-ups/edit-power-up.js
new file mode 100644
index 000000000..a669cdfaf
--- /dev/null
+++ b/src/gui/app/directives/modals/power-ups/edit-power-up.js
@@ -0,0 +1,92 @@
+"use strict";
+
+(function() {
+    angular.module("firebotApp")
+        .component("editPowerUp", {
+            template: `
+                <scroll-sentinel element-class="edit-power-up-header"></scroll-sentinel>
+                <div class="modal-header sticky-header edit-power-up-header">
+                    <button type="button" class="close" ng-click="$ctrl.dismiss()"><span>&times;</span></button>
+                    <h4 class="modal-title">Edit Power-up</h4>
+                </div>
+                <div class="modal-body" style="padding-top: 15px;">
+                    <div style="display: flex; flex-direction: column; padding-left: 15px; padding-right: 15px;">
+                        <div style="font-size:30px;margin: 0 auto;">{{$ctrl.powerUp.twitchData.title}}</div>
+
+                        <div style="margin: 10px auto; padding: 12.5px; border-radius: 6px; display: inline-flex; flex-direction: column; align-items: center; justify-content: center;" ng-style="{background: $ctrl.powerUp.twitchData.backgroundColor}">
+                            <img
+                                ng-src="{{$ctrl.powerUp.twitchData.image ? $ctrl.powerUp.twitchData.image.url4x : $ctrl.powerUp.twitchData.defaultImage.url4x}}"
+                                style="width: 75px; height: 75px; display: block;"
+                            />
+                        </div>
+
+                        <div style="text-align: center; margin-bottom: 5px;">
+                            <span class="muted" style="font-size: 14px;">Cost:</span>
+                            <strong style="font-size: 18px; margin-left: 5px;">{{$ctrl.powerUp.twitchData.bits}} Bits</strong>
+                        </div>
+
+                        <p class="help-block" style="text-align: center; color: #b1adad;" ng-if="$ctrl.powerUp.twitchData.prompt">
+                            {{$ctrl.powerUp.twitchData.prompt}}
+                        </p>
+
+                        <div class="alert alert-info" style="margin-top: 10px;">
+                            <i class="fas fa-info-circle" style="margin-right: 6px;"></i>
+                            Power-ups are created on Twitch and cannot be edited from Firebot. You can however set up effects to run when this Power-up is redeemed.
+                        </div>
+                    </div>
+
+                    <div style="padding-left: 15px; padding-right: 15px;">
+                        <effect-list
+                            effects="$ctrl.powerUp.effects"
+                            trigger="power_up"
+                            trigger-meta="{ rootEffects: $ctrl.powerUp.effects }"
+                            update="$ctrl.effectListUpdated(effects)"
+                        ></effect-list>
+                    </div>
+
+                </div>
+                <div class="modal-footer sticky-footer edit-power-up-footer">
+                    <button type="button" class="btn btn-default" ng-click="$ctrl.dismiss()">Cancel</button>
+                    <button type="button" class="btn btn-primary" ng-click="$ctrl.save()">Save</button>
+                </div>
+                <scroll-sentinel element-class="edit-power-up-footer"></scroll-sentinel>
+            `,
+            bindings: {
+                resolve: "<",
+                close: "&",
+                dismiss: "&"
+            },
+            controller: function(ngToast, powerUpsService) {
+                const $ctrl = this;
+
+                /**
+                 * @type {import('../../../../../types/power-ups').SavedPowerUp}
+                 */
+                $ctrl.powerUp = null;
+
+                $ctrl.effectListUpdated = function(effects) {
+                    $ctrl.powerUp.effects = effects;
+                };
+
+                $ctrl.$onInit = () => {
+                    if ($ctrl.resolve.powerUp != null) {
+                        $ctrl.powerUp = JSON.parse(angular.toJson($ctrl.resolve.powerUp));
+                    }
+                };
+
+                $ctrl.save = () => {
+                    if ($ctrl.powerUp == null) {
+                        return;
+                    }
+
+                    powerUpsService.savePowerUp($ctrl.powerUp).then((successful) => {
+                        if (successful) {
+                            $ctrl.dismiss();
+                        } else {
+                            ngToast.create("Failed to save power-up. Please try again or view logs for details.");
+                        }
+                    });
+                };
+            }
+        });
+}());
diff --git a/src/gui/app/directives/sidebar/sidebar.js b/src/gui/app/directives/sidebar/sidebar.js
index 43202439c..4153fe8cb 100644
--- a/src/gui/app/directives/sidebar/sidebar.js
+++ b/src/gui/app/directives/sidebar/sidebar.js
@@ -21,7 +21,7 @@
                             <nav-link page="Commands" name="{{'SIDEBAR.CHAT.COMMANDS' | translate }}" icon="fa-exclamation"></nav-link>
                             <nav-link page="Events" name="{{'SIDEBAR.OTHER.EVENTS' | translate }}" icon="fa-list"></nav-link>
                             <nav-link page="Timers" name="{{'SIDEBAR.OTHER.TIME_BASED' | translate }}" icon="fa-stopwatch"></nav-link>
-                            <nav-link page="Channel Rewards" name="{{'SIDEBAR.OTHER.CHANNELREWARDS' | translate }}" icon="fa-gifts"></nav-link>
+                            <nav-link page="Power-ups And Rewards" name="{{'SIDEBAR.OTHER.POWERUPSANDREWARDS' | translate }}" icon="fa-gifts"></nav-link>
                             <nav-link page="Preset Effect Lists" name="{{ 'SIDEBAR.OTHER.PRESET_EFFECT_LISTS' | translate }}" icon="fa-magic"></nav-link>
                             <nav-link page="Hotkeys" name="{{'SIDEBAR.OTHER.HOTKEYS' | translate }}" icon="fa-keyboard"></nav-link>
                             <nav-link page="Counters" name="{{'SIDEBAR.OTHER.COUNTERS' | translate }}" icon="fa-tally"></nav-link>
diff --git a/src/gui/app/index.html b/src/gui/app/index.html
index dc94fd997..962b8d723 100644
--- a/src/gui/app/index.html
+++ b/src/gui/app/index.html
@@ -91,7 +91,7 @@
         <script src="./app-main.js"></script>
 
         <!-- include: "type": "js", "files": "controllers/**/*.js" -->
-        <script type="text/javascript" src="./controllers/channel-rewards.controller.js"></script>
+        <script type="text/javascript" src="./controllers/power-ups-and-rewards.controller.js"></script>
         <script type="text/javascript" src="./controllers/chat-messages.controller.js"></script>
         <script type="text/javascript" src="./controllers/commands.controller.js"></script>
         <script type="text/javascript" src="./controllers/counters.controller.js"></script>
@@ -141,7 +141,6 @@
         <script type="text/javascript" src="./services/overlay-url-helper.service.js"></script>
         <script type="text/javascript" src="./services/preset-effect-lists.service.js"></script>
         <script type="text/javascript" src="./services/profile-manager.service.js"></script>
-        <script type="text/javascript" src="./services/pronouns.service.js"></script>
         <script type="text/javascript" src="./services/quick-actions.service.js"></script>
         <script type="text/javascript" src="./services/quotes.service.js"></script>
         <script type="text/javascript" src="./services/scheduled-task.service.js"></script>
diff --git a/src/gui/app/lang/locale-en.json b/src/gui/app/lang/locale-en.json
index e617f943c..d9050b522 100644
--- a/src/gui/app/lang/locale-en.json
+++ b/src/gui/app/lang/locale-en.json
@@ -1,82 +1,82 @@
 {
-  "MAIN": {
-    "MANAGE_LOGINS": "Manage Logins",
-    "LOADING": "Loading..."
-  },
-  "SIDEBAR": {
-    "CHAT": {
-      "CHAT": "Chat",
-      "COMMANDS": "Commands",
-      "CHAT_FEED": "Dashboard"
+    "MAIN": {
+        "MANAGE_LOGINS": "Manage Logins",
+        "LOADING": "Loading..."
     },
-    "OTHER": {
-      "OTHER": "Other",
-      "EVENTS": "Events",
-      "PRESET_EFFECT_LISTS": "Preset Effect Lists",
-      "EFFECT_QUEUES": "Effect Queues",
-      "TIME_BASED": "Time-Based",
-      "HOTKEYS": "Hotkeys",
-      "CHANNELREWARDS": "Channel Rewards",
-      "COUNTERS": "Counters"
+    "SIDEBAR": {
+        "CHAT": {
+            "CHAT": "Chat",
+            "COMMANDS": "Commands",
+            "CHAT_FEED": "Dashboard"
+        },
+        "OTHER": {
+            "OTHER": "Other",
+            "EVENTS": "Events",
+            "PRESET_EFFECT_LISTS": "Preset Effect Lists",
+            "EFFECT_QUEUES": "Effect Queues",
+            "TIME_BASED": "Time-Based",
+            "HOTKEYS": "Hotkeys",
+            "POWERUPSANDREWARDS": "Power-ups & Rewards",
+            "COUNTERS": "Counters"
+        },
+        "MANAGEMENT": {
+            "MANAGEMENT": "Management",
+            "VIEWER_GROUPS": "Viewer Groups",
+            "VIEWER_ROLES": "Roles & Ranks",
+            "MODERATION": "Moderation",
+            "VIEWERS": "Viewers",
+            "SETTINGS": "Settings",
+            "UPDATES": "Updates",
+            "CURRENCY": "Currency",
+            "QUOTES": "Quotes"
+        },
+        "CONNECTIONS": {
+            "CONNECTIONS": "Connections",
+            "TOGGLE": "Click to toggle connections",
+            "OPEN_CONNECTION_PANNEL": "Open Connection Panel"
+        },
+        "ABOUT": "About"
     },
-    "MANAGEMENT": {
-      "MANAGEMENT": "Management",
-      "VIEWER_GROUPS": "Viewer Groups",
-      "VIEWER_ROLES": "Roles & Ranks",
-      "MODERATION": "Moderation",
-      "VIEWERS": "Viewers",
-      "SETTINGS": "Settings",
-      "UPDATES": "Updates",
-      "CURRENCY": "Currency",
-      "QUOTES": "Quotes"
+    "BUTTONS": {
+        "BUTTONS": "Buttons",
+        "CHANGE_BOARD": {
+            "CHANGE_BOARD": "Change Board",
+            "ADD_NEW_BOARD": "Add New Board",
+            "DELETE_BOARD": "Delete Board",
+            "RESYNC_BOARD": "Resync Board"
+        },
+        "MIXER_STUDIO": "Mixer Studio",
+        "SCENES": "Scenes",
+        "EDIT": "Edit",
+        "SEARCH_CONTROLS": "Search controls",
+        "LOADING_BOARDS": "Loading boards...",
+        "ADD_FIRST_BOARD": "Add First Board",
+        "COULD_NOT_AUTOSELECT": "We couldn't auto select a board but don't worry, you have boards saved! Click the dropdown above and select a board.",
+        "ID": "ID",
+        "NAME": "Name",
+        "COST": "Cost"
     },
-    "CONNECTIONS": {
-      "CONNECTIONS": "Connections",
-      "TOGGLE": "Click to toggle connections",
-      "OPEN_CONNECTION_PANNEL": "Open Connection Panel"
+    "LIVE_EVENTS": {
+        "EVENTS": "Events",
+        "EVENT_GROUPS": "Event Groups",
+        "CHANGE_GROUP": "Change Group",
+        "CHANGE_EVENT_GROUP": {
+            "CHANGE_BOARD": "Change Event Group",
+            "ADD_NEW_EVENT_GROUP": "Add New Event Group",
+            "EDIT_EVENT_GROUP": "Edit Event Group",
+            "DELETE_EVENT_GROUP": "Delete Event Group"
+        },
+        "EDIT": "Edit",
+        "SEARCH_EVENTS": "Search events",
+        "ADD_NEW_EVENT": "Add New Event",
+        "ADD_FIRST_EVENT_GROUP": "Add First Event Group",
+        "COULD_NOT_AUTOSELECT": "We could not auto select a live event group. Click the dropdown and select one!",
+        "ID": "ID",
+        "NAME": "Name",
+        "TYPE": "Type"
     },
-    "ABOUT": "About"
-  },
-  "BUTTONS": {
-    "BUTTONS": "Buttons",
-    "CHANGE_BOARD": {
-      "CHANGE_BOARD": "Change Board",
-      "ADD_NEW_BOARD": "Add New Board",
-      "DELETE_BOARD": "Delete Board",
-      "RESYNC_BOARD": "Resync Board"
-    },
-    "MIXER_STUDIO": "Mixer Studio",
-    "SCENES": "Scenes",
-    "EDIT": "Edit",
-    "SEARCH_CONTROLS": "Search controls",
-    "LOADING_BOARDS": "Loading boards...",
-    "ADD_FIRST_BOARD": "Add First Board",
-    "COULD_NOT_AUTOSELECT": "We couldn't auto select a board but don't worry, you have boards saved! Click the dropdown above and select a board.",
-    "ID": "ID",
-    "NAME": "Name",
-    "COST": "Cost"
-  },
-  "LIVE_EVENTS": {
-    "EVENTS": "Events",
-    "EVENT_GROUPS": "Event Groups",
-    "CHANGE_GROUP": "Change Group",
-    "CHANGE_EVENT_GROUP": {
-      "CHANGE_BOARD": "Change Event Group",
-      "ADD_NEW_EVENT_GROUP": "Add New Event Group",
-      "EDIT_EVENT_GROUP": "Edit Event Group",
-      "DELETE_EVENT_GROUP": "Delete Event Group"
-    },
-    "EDIT": "Edit",
-    "SEARCH_EVENTS": "Search events",
-    "ADD_NEW_EVENT": "Add New Event",
-    "ADD_FIRST_EVENT_GROUP": "Add First Event Group",
-    "COULD_NOT_AUTOSELECT": "We could not auto select a live event group. Click the dropdown and select one!",
-    "ID": "ID",
-    "NAME": "Name",
-    "TYPE": "Type"
-  },
-  "NEW": "New",
-  "CONNECTED": "Connected",
-  "DISCONNECTED": "Disconnected",
-  "RUNNING_NOT_CONNECTED": "Ready, but nothing is connected at this time."
+    "NEW": "New",
+    "CONNECTED": "Connected",
+    "DISCONNECTED": "Disconnected",
+    "RUNNING_NOT_CONNECTED": "Ready, but nothing is connected at this time."
 }
diff --git a/src/gui/app/services/channel-rewards.service.js b/src/gui/app/services/channel-rewards.service.js
index c3ef57df7..ca3152aa2 100644
--- a/src/gui/app/services/channel-rewards.service.js
+++ b/src/gui/app/services/channel-rewards.service.js
@@ -56,6 +56,7 @@
 
             service.showAddOrEditRewardModal = (reward) => {
                 utilityService.showModal({
+                    breadcrumbName: reward ? "Edit Channel Reward" : "Add Channel Reward",
                     component: "addOrEditChannelReward",
                     windowClass: "no-padding-modal",
                     resolveObj: {
diff --git a/src/gui/app/services/chat-messages.service.js b/src/gui/app/services/chat-messages.service.js
index 1fdfc4f61..c15be20cf 100644
--- a/src/gui/app/services/chat-messages.service.js
+++ b/src/gui/app/services/chat-messages.service.js
@@ -7,7 +7,7 @@
     angular
         .module('firebotApp')
         .factory('chatMessagesService', function (logger, settingsService,
-            soundService, backendCommunicator, pronounsService, accountAccess, ngToast) {
+            soundService, backendCommunicator, accountAccess, ngToast) {
             const service = {};
 
             // Chat Message Queue
@@ -323,7 +323,29 @@
 
                 service.chatQueue.push({
                     id: randomUUID(),
-                    type: "redemption",
+                    type: "reward-redemption",
+                    data: redemption
+                });
+            });
+
+            backendCommunicator.on("twitch:chat:powerupredemption", (redemption) => {
+                if (service.chatQueue && service.chatQueue.length > 0) {
+                    const lastQueueItem = service.chatQueue[service.chatQueue.length - 1];
+                    if (!lastQueueItem.powerUpMatched &&
+                            lastQueueItem.type === "message" &&
+                            // not sure if customRewardId is the right field to be checking against here until we have access to the feature
+                            lastQueueItem.data.customRewardId != null &&
+                            lastQueueItem.data.customRewardId === redemption.powerUp.id &&
+                            lastQueueItem.data.userId === redemption.user.id) {
+                        lastQueueItem.powerUpMatched = true;
+                        lastQueueItem.data.powerUp = redemption.powerUp;
+                        return;
+                    }
+                }
+
+                service.chatQueue.push({
+                    id: randomUUID(),
+                    type: "power-up-redemption",
                     data: redemption
                 });
             });
@@ -414,8 +436,6 @@
                     }, 5 * 60 * 1000);
                 }
 
-                pronounsService.getUserPronoun(chatMessage.username);
-
                 const now = moment();
                 chatMessage.timestamp = now;
                 chatMessage.timestampDisplay = now.format('h:mm A');
diff --git a/src/gui/app/services/power-ups.service.js b/src/gui/app/services/power-ups.service.js
new file mode 100644
index 000000000..f8bd767fe
--- /dev/null
+++ b/src/gui/app/services/power-ups.service.js
@@ -0,0 +1,89 @@
+"use strict";
+
+(function () {
+
+    angular
+        .module("firebotApp")
+        .factory("powerUpsService", function ($q,
+            backendCommunicator, utilityService) {
+            const service = {};
+
+            service.powerUps = [];
+
+            service.selectedSortTag = null;
+
+            service.searchQuery = "";
+
+            function updatePowerUp(powerUp) {
+                const index = service.powerUps.findIndex(p => p.id === powerUp.id);
+                if (index > -1) {
+                    service.powerUps[index] = powerUp;
+                } else {
+                    service.powerUps.push(powerUp);
+                }
+            }
+
+            service.loadPowerUps = () => {
+                service.powerUps = backendCommunicator.fireEventSync("power-ups:get-all");
+            };
+
+            service.savePowerUp = (powerUp) => {
+                return $q.when(backendCommunicator.fireEventAsync("power-ups:save", powerUp))
+                    .then((savedPowerUp) => {
+                        if (savedPowerUp) {
+                            updatePowerUp(savedPowerUp);
+                            return true;
+                        }
+                        return false;
+                    });
+            };
+
+            service.saveAllPowerUps = (powerUps) => {
+                service.powerUps = powerUps;
+                backendCommunicator.fireEvent("power-ups:save-all", powerUps);
+            };
+
+            service.showEditPowerUpModal = (powerUp) => {
+                utilityService.showModal({
+                    component: "editPowerUp",
+                    breadcrumbName: "Edit Power-Up",
+                    windowClass: "no-padding-modal",
+                    resolveObj: {
+                        powerUp: () => powerUp
+                    },
+                    closeCallback: () => { }
+                });
+            };
+
+            service.manuallyTriggerPowerUp = (itemId) => {
+                backendCommunicator.fireEvent("power-ups:manually-trigger", itemId);
+            };
+
+            let currentlySyncing = false;
+            service.syncPowerUps = () => {
+                if (currentlySyncing) {
+                    return;
+                }
+
+                currentlySyncing = true;
+
+                $q.when(backendCommunicator.fireEventAsync("power-ups:sync"))
+                    .then((powerUps) => {
+                        if (powerUps) {
+                            service.powerUps = powerUps;
+                        }
+                        currentlySyncing = false;
+                    });
+            };
+
+            backendCommunicator.on("power-ups:updated-all", (powerUps) => {
+                service.powerUps = powerUps;
+            });
+
+            backendCommunicator.on("power-ups:updated", (powerUp) => {
+                updatePowerUp(powerUp);
+            });
+
+            return service;
+        });
+}());
diff --git a/src/gui/app/services/pronouns.service.js b/src/gui/app/services/pronouns.service.js
deleted file mode 100644
index a55a40f2a..000000000
--- a/src/gui/app/services/pronouns.service.js
+++ /dev/null
@@ -1,78 +0,0 @@
-"use strict";
-(function() {
-
-    angular
-        .module("firebotApp")
-        .factory("pronounsService", function(logger, $rootScope, $http) {
-            const service = {};
-
-            /**
-             * @typedef Pronoun
-             * @property {string} name
-             * @property {string} display
-             */
-
-            /** @type {Pronoun[]} */
-            let pronouns = [];
-
-            service.pronounCache = {};
-
-            service.userHasPronoun = username => service.pronounCache[username] != null;
-
-            service.getUserPronoun = (username) => {
-                if (username == null) {
-                    return null;
-                }
-
-                if (service.pronounCache[username]) {
-                    return service.pronounCache[username];
-                }
-
-                $http.get(`https://pronouns.alejo.io/api/users/${username}`)
-                    .then((resp) => {
-                        if (resp.status === 200) {
-                            const userPronounData = resp.data[0];
-                            if (userPronounData == null) {
-                                return;
-                            }
-
-                            const pronoun = pronouns.find(p => p.name
-                                === userPronounData.pronoun_id);
-                            if (pronoun != null) {
-                                service.pronounCache[username] = pronoun.display;
-                            }
-                        } else {
-                            logger.error(`Failed to get pronoun for ${username}`);
-                        }
-                    }, (error) => {
-                        logger.error(`Failed to get retrieve pronoun for ${username}`, error.message);
-                    });
-
-                return null;
-            };
-
-            service.retrieveAllPronouns = () => {
-                service.pronounCache = {};
-
-                $http.get('https://pronouns.alejo.io/api/pronouns')
-                    .then((resp) => {
-                        if (resp.status === 200) {
-                            pronouns = resp.data;
-                        } else {
-                            logger.error("Failed to get pronouns list", resp);
-                        }
-                    }, (error) => {
-                        logger.error("Failed to get pronouns:", error.message);
-                    });
-            };
-
-            $rootScope.$on("connection:update", (_, { type, status }) => {
-                if (type === "chat" && status === "connected") {
-                    service.retrieveAllPronouns();
-                }
-            });
-
-
-            return service;
-        });
-}());
diff --git a/src/gui/app/services/sidebar-manager.service.js b/src/gui/app/services/sidebar-manager.service.js
index 3c34d07ba..22cdc044b 100644
--- a/src/gui/app/services/sidebar-manager.service.js
+++ b/src/gui/app/services/sidebar-manager.service.js
@@ -51,7 +51,7 @@
                     "effect queues",
                     "events",
                     "timers",
-                    "channel rewards",
+                    "power-ups and rewards",
                     "roles and ranks",
                     "moderation",
                     "buttons",
@@ -78,7 +78,7 @@
                     "commands",
                     "events",
                     "timers",
-                    "channel rewards",
+                    "power-ups and rewards",
                     "roles and ranks",
                     "preset effect lists",
                     "variable macros",
@@ -119,10 +119,10 @@
                         });
                         break;
 
-                    case "channel-rewards":
-                        $translate("SIDEBAR.OTHER.CHANNELREWARDS").then((tabName) => {
-                            service.setTab("channel rewards", tabName);
-                            $location.path("/channel-rewards");
+                    case "power-ups-and-rewards":
+                        $translate("SIDEBAR.OTHER.POWERUPSANDREWARDS").then((tabName) => {
+                            service.setTab("power-ups & rewards", tabName);
+                            $location.path("/power-ups-and-rewards");
                         });
                         break;
 
@@ -192,9 +192,9 @@
                     controller: "effectQueuesController"
                 })
 
-                .when("/channel-rewards", {
-                    templateUrl: "./templates/_channel-rewards.html",
-                    controller: "channelRewardsController"
+                .when("/power-ups-and-rewards", {
+                    templateUrl: "./templates/_power-ups-and-rewards.html",
+                    controller: "powerUpsAndRewardsController"
                 })
 
                 .when("/moderation", {
diff --git a/src/gui/app/templates/_channel-rewards.html b/src/gui/app/templates/_power-ups-and-rewards.html
similarity index 54%
rename from src/gui/app/templates/_channel-rewards.html
rename to src/gui/app/templates/_power-ups-and-rewards.html
index 8c6fb0c3d..076d1e973 100644
--- a/src/gui/app/templates/_channel-rewards.html
+++ b/src/gui/app/templates/_power-ups-and-rewards.html
@@ -1,10 +1,59 @@
 <firebot-tabs
   ng-if="canUseChannelRewards()"
-  ng-init="$ctrl.activeTab = 'rewards'"
+  ng-init="$ctrl.activeTab = 'powerups'"
   active="$ctrl.activeTab"
   type="underlined"
   page-tabs="true"
 >
+  <firebot-tab name="powerups" label="Power-ups">
+    <firebot-item-table
+      items="powerUpsService.powerUps"
+      on-items-update="onPowerUpsUpdated(items)"
+      headers="powerUpHeaders"
+      sort-tag-context="power ups"
+      orderable="true"
+      add-new-button-text="Manage Power-ups"
+      add-new-button-icon="fas fa-external-link"
+      on-add-new-clicked="openTwitchPowerUpsPage()"
+      context-menu-options="powerUpMenuOptions(item)"
+      no-data-message="No power-ups found. Power-ups must be created on Twitch."
+      none-found-message="No power-ups found."
+      search-placeholder="Search power-ups"
+      test-button="true"
+      on-test-button-clicked="powerUpsService.manuallyTriggerPowerUp(itemId)"
+      status-field="twitchData.isEnabled"
+    >
+      <fb-item-table-toolbar>
+        <button class="btn btn-default" uib-tooltip="Twitch Sync" tooltip-append-to-body="true" ng-click="powerUpsService.syncPowerUps()">
+          <i class="fas fa-sync"></i>
+        </button>
+      </fb-item-table-toolbar>
+      <fb-item-table-footer>
+        <div class="p-6" style="display: flex; align-items: center">
+          <div style="flex-shrink: 0; display: flex; align-items: center">
+            <span>Power-up Limit
+              <tooltip text="'Twitch limits channels to 50 total power-ups.'" />
+            </span>
+            <span class="my-0 mx-4" style="font-size: 20px;">
+              {{powerUpsService.powerUps.length}} / 50
+            </span>
+          </div>
+          <div style="width: 100%">
+            <div style="
+                width: 100%;
+                background: #24262a;
+                height: 8px;
+                border-radius: 8px;
+                overflow: hidden;
+              ">
+              <div style="height: 100%; background: #2aa2c0"
+                ng-style="{ width: ((powerUpsService.powerUps.length / 50) * 100) + '%' }"></div>
+            </div>
+          </div>
+        </div>
+      </fb-item-table-footer>
+    </firebot-item-table>
+  </firebot-tab>
   <firebot-tab name="rewards" label="Channel Rewards">
     <firebot-item-table
       items="channelRewardsService.channelRewards"
@@ -64,5 +113,5 @@
   ng-if="!canUseChannelRewards()"
   style="height: 100%; display: flex; align-items: center; justify-content: center; text-align: center; padding: 0 80px;"
 >
-  <div>In order to use Channel Rewards, please login with an eligible account.</div>
+  <div>In order to use Power-ups &amp; Channel Rewards, please login with an eligible account.</div>
 </div>
\ No newline at end of file
diff --git a/src/gui/app/templates/chat/_chat-messages.html b/src/gui/app/templates/chat/_chat-messages.html
index 427e1bebe..1017d7f69 100644
--- a/src/gui/app/templates/chat/_chat-messages.html
+++ b/src/gui/app/templates/chat/_chat-messages.html
@@ -80,7 +80,11 @@
             font-family-style="{{customFontFamilyStyle}}"
           />
           <reward-redemption
-            ng-if="chatItem.type === 'redemption'"
+            ng-if="chatItem.type === 'reward-redemption'"
+            redemption="chatItem.data"
+          />
+          <power-up-redemption
+            ng-if="chatItem.type === 'power-up-redemption'"
             redemption="chatItem.data"
           />
           <chat-alert
diff --git a/src/gui/scss/core/_chat.scss b/src/gui/scss/core/_chat.scss
index 36401d35a..cac0bd4c6 100644
--- a/src/gui/scss/core/_chat.scss
+++ b/src/gui/scss/core/_chat.scss
@@ -23,6 +23,7 @@
         background: $chat-message-alternate-bg;
     }
 }
+.power-up-redemption,
 .reward-redemption {
     img {
         width: 25px;
@@ -63,16 +64,16 @@
             background: rgb(31, 105, 255);
         }
         &.BLUE {
-            background: linear-gradient(#00d6d6,#9146ff);
+            background: linear-gradient(#00d6d6, #9146ff);
         }
         &.GREEN {
-            background: linear-gradient(#00db84,#57bee6);
+            background: linear-gradient(#00db84, #57bee6);
         }
         &.ORANGE {
-            background: linear-gradient(#ffb31a,#e0e000);
+            background: linear-gradient(#ffb31a, #e0e000);
         }
         &.PURPLE {
-            background: linear-gradient(#9146ff,#ff75e6);
+            background: linear-gradient(#9146ff, #ff75e6);
         }
     }
 
@@ -95,9 +96,10 @@
             color: #00db84;
         }
         .pending {
-            color: #ffb31a
+            color: #ffb31a;
         }
-        .denied, .expired {
+        .denied,
+        .expired {
             color: #ff4662;
         }
     }
@@ -248,7 +250,7 @@
     }
 }
 
-.gigantify :last-child>.chatEmoticon {
+.gigantify :last-child > .chatEmoticon {
     display: block !important;
     height: 8rem !important;
 }
@@ -482,7 +484,7 @@
         align-items: center;
         justify-content: space-between;
         padding: 0 10px;
-        flex-shrink: 0
+        flex-shrink: 0;
     }
     .thread-close-btn {
         background: none;
@@ -722,7 +724,7 @@
         border-radius: 7px;
         margin: 0 5px 3px;
         &.acknowledged {
-            color: rgba($content-text-color, .15);
+            color: rgba($content-text-color, 0.15);
         }
     }
 }
@@ -991,4 +993,4 @@
 
 .dashboard-settings-button-container i {
     margin: 0 !important;
-}
\ No newline at end of file
+}
diff --git a/src/gui/scss/core/_effects.scss b/src/gui/scss/core/_effects.scss
index 527debbbd..448840dec 100644
--- a/src/gui/scss/core/_effects.scss
+++ b/src/gui/scss/core/_effects.scss
@@ -107,6 +107,20 @@
             font-weight: 700;
         }
 
+        .effect-deprecated-badge {
+            display: inline-flex;
+            background: $bad-color;
+            color: #fff;
+            font-size: 12px;
+            padding: 4px 10px;
+            height: 26px;
+            border-radius: 21px;
+            gap: 4px;
+            justify-content: center;
+            align-items: center;
+            font-weight: 700;
+        }
+
         .effect-timeout-btn {
             display: inline-flex;
             background: $effect-button-bg;
diff --git a/src/gui/scss/core/_global.scss b/src/gui/scss/core/_global.scss
index d6d0c14db..fe5c42612 100644
--- a/src/gui/scss/core/_global.scss
+++ b/src/gui/scss/core/_global.scss
@@ -248,7 +248,7 @@ body {
 .fb-nav {
     position: relative;
     height: 100%;
-    width: 223px;
+    width: 240px;
     display: flex;
     flex-shrink: 0;
     flex-grow: 0;
@@ -428,7 +428,7 @@ body {
     font-family: "LEMONMILK-Bold", "Inter", sans-serif;
     -webkit-background-clip: text;
     background-clip: text;
-    background-image: linear-gradient(to right, #ebb11f, #FFCA05);
+    background-image: linear-gradient(to right, #ebb11f, #ffca05);
 }
 
 .nav-header-title.contracted {
diff --git a/src/resources/overlay/index.ejs b/src/resources/overlay/index.ejs
index 4447561de..8230901ed 100644
--- a/src/resources/overlay/index.ejs
+++ b/src/resources/overlay/index.ejs
@@ -45,7 +45,11 @@
     <script src="https://www.youtube.com/iframe_api"></script>
 
     <% for(let jsDep of dependencies.js) { %>
-        <script src="<%-jsDep%>"></script>
+        <% if (jsDep.module) { %>
+            <script type="module" src="<%-jsDep.url%>"></script>
+        <% } else { %>
+            <script src="<%-jsDep.url%>"></script>
+        <% } %>
     <% } %>
 
     <script>
diff --git a/src/resources/overlay/js/overlay-widgets.ts b/src/resources/overlay/js/overlay-widgets.ts
index cbc322681..977ccbae2 100644
--- a/src/resources/overlay/js/overlay-widgets.ts
+++ b/src/resources/overlay/js/overlay-widgets.ts
@@ -91,6 +91,7 @@ class OverlayWidgetEventUtils implements IOverlayWidgetEventUtils {
             width: position.width !== null ? `${position.width}px` : undefined,
             height: position.height !== null ? `${position.height}px` : undefined,
             'z-index': zIndex != null ? zIndex : undefined,
+            "overflow": "hidden"
         };
 
         return Object.entries(styles).reduce((acc, [key, value]) => {
diff --git a/src/server/http-server-manager.ts b/src/server/http-server-manager.ts
index f66ab1baa..d91f430c0 100644
--- a/src/server/http-server-manager.ts
+++ b/src/server/http-server-manager.ts
@@ -130,10 +130,20 @@ class HttpServerManager extends EventEmitter {
             const combinedJsDeps = [...new Set([
                 ...effectDefs
                     .filter(ed => ed.dependencies?.js?.length)
-                    .map(ed => ed.dependencies.js),
+                    .map(ed => ed.dependencies.js.map((jsDep) => {
+                        if (typeof jsDep === "string") {
+                            return { module: false, url: jsDep };
+                        }
+                        return jsDep;
+                    })),
                 ...widgetExtensions
                     .filter(we => we.dependencies?.js?.length)
-                    .map(we => we.dependencies.js)
+                    .map(we => we.dependencies.js.map((jsDep) => {
+                        if (typeof jsDep === "string") {
+                            return { module: false, url: jsDep };
+                        }
+                        return jsDep;
+                    }))
             ].flat())];
 
             const combinedGlobalStyles = [
diff --git a/src/shared/effect-constants.js b/src/shared/effect-constants.js
index 02b0a3053..88a581b5e 100644
--- a/src/shared/effect-constants.js
+++ b/src/shared/effect-constants.js
@@ -35,6 +35,7 @@ const EffectTrigger = Object.freeze({
     COUNTER: "counter",
     PRESET_LIST: "preset",
     CHANNEL_REWARD: "channel_reward",
+    POWER_UP: "power_up",
     MANUAL: "manual",
     QUICK_ACTION: "quick_action",
     OVERLAY_WIDGET: "overlay_widget",
diff --git a/src/types/chat.d.ts b/src/types/chat.d.ts
index 367ba9b8e..6f7de603f 100644
--- a/src/types/chat.d.ts
+++ b/src/types/chat.d.ts
@@ -70,10 +70,12 @@ export type FirebotParsedMessagePart = {
 
 export type FirebotChatMessage = {
     id: string;
+    timestamp?: number;
     username: string;
     userId: string;
     userDisplayName?: string;
     profilePicUrl?: string;
+    pronouns?: string;
     isExtension?: boolean;
     roles: string[];
     badges: Array<{
diff --git a/src/types/effects.d.ts b/src/types/effects.d.ts
index 7f3d451af..a401c9c7f 100644
--- a/src/types/effects.d.ts
+++ b/src/types/effects.d.ts
@@ -48,7 +48,7 @@ export type OverlayExtension<OverlayData = unknown> = {
     dependencies?: {
         globalStyles?: string;
         css?: string[];
-        js?: string[];
+        js?: Array<string | { module: boolean, url: string }>;
     };
     event: {
         name: string;
@@ -69,6 +69,7 @@ export type OverlayPosition = {
         left: number;
         right: number;
     };
+    zIndex?: number;
 };
 
 export type OverlayRotation = {
@@ -100,6 +101,7 @@ export type EffectDefinition<EffectModel = unknown> = {
     icon: string;
     categories: EffectCategory[];
     hidden?: boolean | Func<boolean>;
+    deprecated?: boolean;
     triggers?: TriggerType[] | TriggersObject;
     dependencies?: EffectDependencies | Array<"chat">;
     showWhenDependenciesNotMet?: boolean;
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 7a70a87da..94be5dec9 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -18,6 +18,7 @@ export * from "./moderation";
 export * from "./modules";
 export * from "./overlay-widgets";
 export * from "./parameters";
+export * from "./pronouns";
 export * from "./quick-actions";
 export * from "./quotes";
 export * from "./ranks";
diff --git a/src/types/overlay-widgets.d.ts b/src/types/overlay-widgets.d.ts
index 057aa2fa8..f621d2cb0 100644
--- a/src/types/overlay-widgets.d.ts
+++ b/src/types/overlay-widgets.d.ts
@@ -154,7 +154,7 @@ export type OverlayWidgetType<
     overlayExtension: {
         dependencies?: {
             css?: string[];
-            js?: string[];
+            js?: Array<string | { module: boolean, url: string }>;
             globalStyles?: string;
         };
 
diff --git a/src/types/parameters.d.ts b/src/types/parameters.d.ts
index 83f1d5144..5c71f22ee 100644
--- a/src/types/parameters.d.ts
+++ b/src/types/parameters.d.ts
@@ -1,4 +1,5 @@
 import type { EffectList } from "./effects";
+import type { Animation } from "./overlay-widgets";
 
 export type BaseParameter = {
     /**
@@ -215,13 +216,14 @@ export type FontOptions = {
     size: number;
     weight: 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;
     italic: boolean;
-    color: string;
+    color?: string;
 };
 
 export type FontOptionsParameter = BaseParameter & {
     type: "font-options";
     default: FontOptions;
     allowAlpha?: boolean;
+    hideColor?: boolean;
 };
 
 export type RadioCardsParameter<V = string> = BaseParameter & {
@@ -261,6 +263,12 @@ export type SortTagSelectParameter = BaseParameter & {
     default?: never;
 };
 
+export type AnimationSelectParameter = BaseParameter & {
+    type: "animation-select";
+    animationType: "enter" | "exit" | "inbetween";
+    default?: Animation;
+};
+
 export type UnknownParameter = BaseParameter & {
     [key: string]: unknown;
 };
@@ -288,7 +296,8 @@ type FirebotParameter =
     | RadioCardsParameter
     | CodeMirrorParameter
     | CounterSelectParameter
-    | SortTagSelectParameter;
+    | SortTagSelectParameter
+    | AnimationSelectParameter;
 
 export type ParametersConfig<P> = {
     [K in keyof P]: (P[K] extends string
@@ -323,7 +332,9 @@ export type ParametersConfig<P> = {
                                     : P[K] extends EffectList
                                         ? EffectListParameter
                                         : P[K] extends FontOptions
-                                            ? FontOptionsParameter : FirebotParameter) & { value?: P[K] };
+                                            ? FontOptionsParameter
+                                            : P[K] extends Animation
+                                                ? AnimationSelectParameter : FirebotParameter) & { value?: P[K] };
 };
 
 export type ParametersWithNameConfig<P> = {
@@ -359,7 +370,9 @@ export type ParametersWithNameConfig<P> = {
                                     : P[K] extends EffectList
                                         ? EffectListParameter
                                         : P[K] extends FontOptions
-                                            ? FontOptionsParameter : FirebotParameter) & { name: K, showIf?: { [K2 in keyof P]?: P[K2] | Array<P[K2]> } };
+                                            ? FontOptionsParameter
+                                            : P[K] extends Animation
+                                                ? AnimationSelectParameter : FirebotParameter) & { name: K, showIf?: { [K2 in keyof P]?: P[K2] | Array<P[K2]> } };
 };
 
 type FirebotParamCategory<ParamConfig extends Record<string, unknown>> = {
diff --git a/src/types/power-ups.d.ts b/src/types/power-ups.d.ts
new file mode 100644
index 000000000..d8908cecd
--- /dev/null
+++ b/src/types/power-ups.d.ts
@@ -0,0 +1,20 @@
+import type { CustomPowerUp } from "../backend/streaming-platforms/twitch/api/resource/power-ups";
+import type { EffectList } from "./effects";
+
+export type SavedPowerUp = {
+    id: string;
+    twitchData: CustomPowerUp;
+    effects?: EffectList;
+    sortTags?: string[];
+};
+
+export type PowerUpRedemptionMetadata = {
+    username: string;
+    userId: string;
+    userDisplayName: string;
+    messageText: string;
+    powerUpId: string;
+    powerUpImage: string;
+    powerUpName: string;
+    bits: number;
+};
diff --git a/src/types/pronouns.d.ts b/src/types/pronouns.d.ts
new file mode 100644
index 000000000..dc91ed257
--- /dev/null
+++ b/src/types/pronouns.d.ts
@@ -0,0 +1,11 @@
+export type Pronoun = {
+    name: string;
+    subject: string;
+    object: string;
+    singular: boolean;
+};
+
+export type UserPronoun = {
+    primary: string;
+    secondary?: string;
+};
\ No newline at end of file
diff --git a/src/types/triggers.d.ts b/src/types/triggers.d.ts
index 33944ae17..82499fb7f 100644
--- a/src/types/triggers.d.ts
+++ b/src/types/triggers.d.ts
@@ -15,6 +15,7 @@ export type TriggerType =
     | "quick_action"
     | "manual"
     | "channel_reward"
+    | "power_up"
     | "overlay_widget";
 
 export type TriggerMeta = {
@@ -57,4 +58,4 @@ export type Trigger = {
 
 export type TriggersObject = {
     [T in TriggerType]?: T extends "event" ? string[] | boolean : boolean;
-};
\ No newline at end of file
+};
diff --git a/src/types/util-types.d.ts b/src/types/util-types.d.ts
index 3f0b751a4..a3681960a 100644
--- a/src/types/util-types.d.ts
+++ b/src/types/util-types.d.ts
@@ -12,4 +12,24 @@ export type KeyValuePair<K = string, V = string> = {
 export type FileFilter = {
     name: string;
     extensions: string[];
-};
\ No newline at end of file
+};
+
+/**
+ * Converts a camelCase string type into its snake_case equivalent.
+ * Uppercase letters and digits are prefixed with an underscore.
+ */
+type CamelToSnake<S extends string, Acc extends string = ""> = S extends `${infer H}${infer T}`
+    ? H extends Uppercase<H>
+        ? H extends Lowercase<H>
+            ? CamelToSnake<T, `${Acc}_${H}`>
+            : CamelToSnake<T, `${Acc}_${Lowercase<H>}`>
+        : CamelToSnake<T, `${Acc}${H}`>
+    : Acc;
+
+export type SnakeCased<T> = T extends Date
+    ? string
+    : T extends Array<infer U>
+        ? Array<SnakeCased<U>>
+        : T extends object
+            ? { [K in keyof T as K extends string ? CamelToSnake<K> : K]: SnakeCased<T[K]> }
+            : T;
\ No newline at end of file